From 0fb313c3c5704cd8f30dabb5ace7220d1e266fbe Mon Sep 17 00:00:00 2001 From: mvllow Date: Sun, 28 May 2023 17:19:01 +0200 Subject: [PATCH] fix: reset palette when switching colorschemes --- colors/rose-pine-dawn.lua | 3 ++- colors/rose-pine-main.lua | 3 ++- colors/rose-pine-moon.lua | 3 ++- colors/rose-pine.lua | 1 - lua/rose-pine.lua | 16 +++++++--------- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/colors/rose-pine-dawn.lua b/colors/rose-pine-dawn.lua index b4482c0..3ce1680 100644 --- a/colors/rose-pine-dawn.lua +++ b/colors/rose-pine-dawn.lua @@ -1 +1,2 @@ -require('rose-pine').colorscheme({ variant = 'dawn' }) +package.loaded['rose-pine.palette'] = nil +require('rose-pine').colorscheme('dawn') diff --git a/colors/rose-pine-main.lua b/colors/rose-pine-main.lua index 6951634..e09c69d 100644 --- a/colors/rose-pine-main.lua +++ b/colors/rose-pine-main.lua @@ -1 +1,2 @@ -require('rose-pine').colorscheme({ variant = 'main' }) +package.loaded['rose-pine.palette'] = nil +require('rose-pine').colorscheme('main') diff --git a/colors/rose-pine-moon.lua b/colors/rose-pine-moon.lua index 57e6a68..7196100 100644 --- a/colors/rose-pine-moon.lua +++ b/colors/rose-pine-moon.lua @@ -1 +1,2 @@ -require('rose-pine').colorscheme({ variant = 'moon' }) +package.loaded['rose-pine.palette'] = nil +require('rose-pine').colorscheme('moon') diff --git a/colors/rose-pine.lua b/colors/rose-pine.lua index fd735a8..71f155f 100644 --- a/colors/rose-pine.lua +++ b/colors/rose-pine.lua @@ -1,3 +1,2 @@ package.loaded['rose-pine.palette'] = nil - require('rose-pine').colorscheme() diff --git a/lua/rose-pine.lua b/lua/rose-pine.lua index bbfadb1..b843fde 100644 --- a/lua/rose-pine.lua +++ b/lua/rose-pine.lua @@ -1,17 +1,15 @@ local config = require('rose-pine.config') local M = {} ----@param options Config|nil -function M.colorscheme(options) - if options then - config.extend(options) - end - - if vim.g.colors_name then - vim.cmd('hi clear') - end +---@param variant Variant|nil +function M.colorscheme(variant) + config.extend({ variant = variant }) vim.opt.termguicolors = true + if vim.g.colors_name then + vim.cmd('hi clear') + vim.cmd('syntax reset') + end vim.g.colors_name = 'rose-pine' require('rose-pine.theme')._load(config.options)