Merge pull request #296 from tmillr/fix-incorrect-highlights

fix(syntax-hl): set `nocombine` on Comment
projekt0n · Sep 9, 2023 · 8ffe6b8 · 8ffe6b8
2 parents 58d3d58 + ac071e0
commit 8ffe6b8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/lua/github-theme/group/syntax.lua b/lua/github-theme/group/syntax.lua
@@ -32,7 +32,7 @@ function M.get(spec, config)
   -- (1) add Commented style settings in config module
   -- stylua: ignore
   return {
-    Comment        = { fg = syn.comment, style = stl.comments }, -- any comment
+    Comment        = { fg = syn.comment, style = stl.comments, nocombine = true }, -- any comment
     Constant       = { fg = syn.const, style = stl.constants }, -- (preferred) any constant
     String         = { fg = syn.string, style = stl.strings }, -- a string constant: 'this is a string'
     Character      = { link = 'String' }, -- a character constant: 'c', '\n'

diff --git a/lua/github-theme/lib/compiler.lua b/lua/github-theme/lib/compiler.lua
@@ -60,6 +60,9 @@ vim.o.background = "%s"
       op.fg = values.fg
       op.sp = values.sp
       op.blend = values.blend
+      if op.nocombine == nil then
+        op.nocombine = values.nocombine
+      end
       table.insert(lines, fmt([[h(0, "%s", %s)]], name, inspect(op)))
     end
   end