github/neovim-rose-pine
1
0
Fork 0
mirror of https://github.com/rose-pine/neovim.git synced 2025-10-15 12:38:53 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix: regression in options (#221)

Browse source 
* fix: headings not migrating to flat options

* fix: invalid key when using inherit
This commit is contained in:
not 2024-01-26 21:43:53 -06:00 • committed by GitHub
commit 14b371fb78
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 10 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lua/rose-pine.lua
View file

@ -780,10 +780,10 @@ local function set_highlights()
end end
if (highlight.inherit == nil or highlight.inherit) and existing ~= nil then if (highlight.inherit == nil or highlight.inherit) and existing ~= nil then
highlight.inherit = nil parsed.inherit = nil
highlights[group] = vim.tbl_extend("force", existing, parsed) highlights[group] = vim.tbl_extend("force", existing, parsed)
else else
highlight.inherit = nil parsed.inherit = nil
highlights[group] = parsed highlights[group] = parsed
end end
end end

18
lua/rose-pine/config.lua
View file

@ -141,16 +141,13 @@ local function migrate(options)
-- Set h1 through h6 to the same color if only one is specified -- Set h1 through h6 to the same color if only one is specified
if type(options.groups.headings) == "string" then if type(options.groups.headings) == "string" then
options.groups.headings = { options.groups.h1 = options.groups.headings
h1 = options.groups.headings, options.groups.h2 = options.groups.headings
h2 = options.groups.headings, options.groups.h3 = options.groups.headings
h3 = options.groups.headings, options.groups.h4 = options.groups.headings
h4 = options.groups.headings, options.groups.h5 = options.groups.headings
h5 = options.groups.headings, options.groups.h6 = options.groups.headings
h6 = options.groups.headings, elseif options.groups.headings == "table" then
}
end
if type(options.groups.headings) == "table" then
options.groups.h1 = options.groups.headings.h1 or options.groups.h1 options.groups.h1 = options.groups.headings.h1 or options.groups.h1
options.groups.h2 = options.groups.headings.h2 or options.groups.h2 options.groups.h2 = options.groups.headings.h2 or options.groups.h2
options.groups.h3 = options.groups.headings.h3 or options.groups.h3 options.groups.h3 = options.groups.headings.h3 or options.groups.h3
@ -158,6 +155,7 @@ local function migrate(options)
options.groups.h5 = options.groups.headings.h5 or options.groups.h5 options.groups.h5 = options.groups.headings.h5 or options.groups.h5
options.groups.h6 = options.groups.headings.h6 or options.groups.h6 options.groups.h6 = options.groups.headings.h6 or options.groups.h6
end end
options.groups.headings = nil
return options return options
end end