Skip to content

Commit e62a611

Browse files
authored
fix: regression in options (#221)
* fix: headings not migrating to flat options * fix: invalid key when using inherit
1 parent 7ed74e3 commit e62a611

File tree

2 files changed

+10
-12
lines changed

2 files changed

+10
-12
lines changed

lua/rose-pine.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -780,10 +780,10 @@ local function set_highlights()
780780
end
781781

782782
if (highlight.inherit == nil or highlight.inherit) and existing ~= nil then
783-
highlight.inherit = nil
783+
parsed.inherit = nil
784784
highlights[group] = vim.tbl_extend("force", existing, parsed)
785785
else
786-
highlight.inherit = nil
786+
parsed.inherit = nil
787787
highlights[group] = parsed
788788
end
789789
end

lua/rose-pine/config.lua

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -141,23 +141,21 @@ local function migrate(options)
141141

142142
-- Set h1 through h6 to the same color if only one is specified
143143
if type(options.groups.headings) == "string" then
144-
options.groups.headings = {
145-
h1 = options.groups.headings,
146-
h2 = options.groups.headings,
147-
h3 = options.groups.headings,
148-
h4 = options.groups.headings,
149-
h5 = options.groups.headings,
150-
h6 = options.groups.headings,
151-
}
152-
end
153-
if type(options.groups.headings) == "table" then
144+
options.groups.h1 = options.groups.headings
145+
options.groups.h2 = options.groups.headings
146+
options.groups.h3 = options.groups.headings
147+
options.groups.h4 = options.groups.headings
148+
options.groups.h5 = options.groups.headings
149+
options.groups.h6 = options.groups.headings
150+
elseif options.groups.headings == "table" then
154151
options.groups.h1 = options.groups.headings.h1 or options.groups.h1
155152
options.groups.h2 = options.groups.headings.h2 or options.groups.h2
156153
options.groups.h3 = options.groups.headings.h3 or options.groups.h3
157154
options.groups.h4 = options.groups.headings.h4 or options.groups.h4
158155
options.groups.h5 = options.groups.headings.h5 or options.groups.h5
159156
options.groups.h6 = options.groups.headings.h6 or options.groups.h6
160157
end
158+
options.groups.headings = nil
161159

162160
return options
163161
end

0 commit comments

Comments
 (0)