Merge pull request #323 from projekt0n/dev

Redefine Treesitter capture groups
projekt0n · May 8, 2024 · d832925 · d832925
2 parents 66dcec1 + 8d8ab7c
commit d832925
Show file tree

Hide file tree

Showing 6 changed files with 170 additions and 122 deletions.
diff --git a/lua/github-theme/group/modules/cmp.lua b/lua/github-theme/group/modules/cmp.lua
@@ -38,12 +38,12 @@ function M.get(spec, config, opts)
     CmpItemKindClass         = { link = 'Type' },
     CmpItemKindStruct        = { link = 'Type' },
 
-    CmpItemKindModule        = { link = has_ts and '@namespace'  or 'Identifier' },
+    CmpItemKindModule        = { link = has_ts and '@module'  or 'Identifier' },
 
     CmpItemKindProperty      = { link = has_ts and '@property' or  'Identifier' },
-    CmpItemKindField         = { link = has_ts and '@field' or 'Identifier' },
-    CmpItemKindTypeParameter = { link = has_ts and '@field' or 'Identifier' },
-    CmpItemKindEnumMember    = { link = has_ts and '@field' or 'Identifier' },
+    CmpItemKindField         = { link = has_ts and '@variable.member' or 'Identifier' },
+    CmpItemKindTypeParameter = { link = has_ts and '@variable.member' or 'Identifier' },
+    CmpItemKindEnumMember    = { link = has_ts and '@variable.member' or 'Identifier' },
     CmpItemKindOperator      = { link = 'Operator' },
     CmpItemKindSnippet       = { fg = spec.fg2 },
   }

diff --git a/lua/github-theme/group/modules/lsp_semantic_tokens.lua b/lua/github-theme/group/modules/lsp_semantic_tokens.lua
@@ -9,7 +9,7 @@ function M.get(spec, config, opts)
     ['@lsp.type.keyword'] = { link = '@keyword' },
     ['@lsp.type.interface'] = { link = '@interface' },
     ['@lsp.type.namespace'] = { link = '@namespace' },
-    ['@lsp.type.parameter'] = { link = '@parameter' },
+    ['@lsp.type.parameter'] = { link = '@variable.parameter' },
     ['@lsp.type.class'] = { link = '@function' },
     ['@lsp.type.property'] = {}, -- use treesitter styles for regular properties
     ['@lsp.type.variable'] = {}, -- use treesitter styles for regular variables