fix: Improve lsp semantic token and treesitter support

lua/astrotheme/groups/base.lua

@@ -2,37 +2,7 @@ local function callback()
   return {
     Normal = { fg = C.text, bg = C.base },
     NormalNC = { fg = C.text, bg = C.mantle },
-    Comment = { fg = C.subtext1, bg = C.none },
-    Constant = { fg = C.yellow, bg = C.none },
-    String = { fg = C.green, bg = C.none },
-    Character = { fg = C.green, bg = C.none },
-    Number = { fg = C.orange, bg = C.none },
-    Boolean = { fg = C.blue, bg = C.none },
-    Float = { fg = C.yellow, bg = C.none },
-    Identifier = { fg = C.blue, bg = C.none },
-    Function = { fg = C.yellow, bg = C.none },
-    Statement = { fg = C.purple, bg = C.none },
-    Conditional = { fg = C.light_purple, bg = C.none },
-    Repeat = { fg = C.purple, bg = C.none },
-    Label = { fg = C.blue, bg = C.none },
-    Operator = { fg = C.purple, bg = C.none },
-    Keyword = { fg = C.purple, bg = C.none },
-    Exception = { fg = C.purple, bg = C.none },
-    Preproc = { fg = C.yellow, bg = C.none },
-    Include = { fg = C.purple, bg = C.none },
-    Define = { fg = C.purple, bg = C.none },
     Title = { fg = C.cyan, bg = C.none },
-    Macro = { fg = C.purple, bg = C.none },
-    PreCondit = { fg = C.blue, bg = C.none },
-    Type = { fg = C.blue, bg = C.none },
-    StorageClass = { fg = C.blue, bg = C.none },
-    Structure = { fg = C.yellow, bg = C.none },
-    Typedef = { fg = C.yellow, bg = C.none },
-    Special = { fg = C.blue, bg = C.none },
-    SpecialComment = { fg = C.grey, bg = C.none },
-    Error = { fg = C.red, bg = C.none },
-    Todo = { fg = C.purple, bg = C.none },
-    Underlined = { fg = C.cyan, bg = C.none },
     Cursor = { fg = C.none, bg = C.none },
     ColorColumn = { fg = C.none, bg = C.overlay1 },
     CursorLineNr = { fg = C.text, bg = C.none },

lua/astrotheme/groups/lsp.lua

@@ -22,24 +22,20 @@ local function callback()
     LspReferenceText = { fg = C.none, bg = C.surface1 },
     LspReferenceWrite = { fg = C.none, bg = C.surface1 },
     ProviderTruncateLine = { fg = C.overlay0 },
-    ["@lsp.type.enum"] = { link = "@type" },
-    ["@lsp.type.keyword"] = { link = "@keyword" },
-    ["@lsp.type.interface"] = { link = "@interface" },
-    ["@lsp.type.method"] = { link = "@function" },
-    ["@lsp.type.namespace"] = { link = "@namespace" },
-    ["@lsp.type.parameter"] = { link = "@parameter" },
-    ["@lsp.type.property"] = { link = "@property" },
-    ["@lsp.type.class"] = { link = "@namespace" },
-    ["@lsp.type.decorator"] = { link = "@method" },
-    ["@lsp.type.enumMember"] = { link = "@constant" },
-    ["@lsp.type.function"] = { link = "@function" },
-    ["@lsp.type.macro"] = { link = "@function.macro" },
-    ["@lsp.type.type"] = { link = "@type" },
-    ["@lsp.type.typeParameter"] = { link = "@parameter" },
-    ["@lsp.type.variable"] = {}, -- use treesitter styles for regular variables
-    ["@lsp.typemod.method.defaultLibrary"] = { link = "@function.builtin" },
-    ["@lsp.typemod.function.defaultLibrary"] = { link = "@function.builtin" },
-    ["@lsp.typemod.variable.defaultLibrary"] = { link = "@variable.builtin" },
+    -- LSP Semantic Tokens
+    -- Ref: :help lsp-semantic-highlight
+    ["@lsp.type.builtinType"] = { fg = C.yellow, bg = C.none },
+    ["@lsp.type.keyword"] = { link = "Keyword" },
+    ["@lsp.type.operator"] = { link = "Operator" },
+    ["@lsp.typemod.enumMember.defaultLibrary"] = { fg = C.cyan, bg = C.none },
+    ["@lsp.typemod.function.defaultLibrary"] = { fg = C.cyan, bg = C.none },
+    ["@lsp.typemod.function.global"] = { fg = C.cyan, bg = C.none },
+    ["@lsp.typemod.method.defaultLibrary"] = { fg = C.cyan, bg = C.none },
+    ["@lsp.typemod.method.reference"] = { link = "Function" },
+    ["@lsp.typemod.method.trait"] = { link = "Function" },
+    ["@lsp.typemod.selfKeyword.defaultLibrary"] = { link = "Keyword" },
+    ["@lsp.typemod.variable.defaultLibrary"] = { fg = C.yellow, bg = C.none },
+    ["@lsp.typemod.variable.readonly"] = { link = "Constant" },
   }
 end
 

lua/astrotheme/groups/plugins/nvim-treesitter.lua

@@ -19,18 +19,17 @@ local function callback()
     ["@function.macro"] = { fg = C.yellow },
     ["@function.macro.rust"] = { fg = C.orange },
     ["@include"] = { fg = C.purple },
-    ["@keyword"] = { fg = C.purple },
-    ["@keyword.function"] = { fg = C.purple },
+    ["@keyword"] = { link = "Keyword" },
+    ["@keyword.function"] = { link = "Keyword" },
     ["@keyword.function.rust"] = { fg = C.orange },
-    ["@keyword.operator"] = { fg = C.purple },
+    ["@keyword.operator"] = { link = "Keyword" },
     ["@label"] = { fg = C.blue },
     ["@literal.markdown"] = { fg = C.green },
     ["@method"] = { fg = C.blue },
-    ["@namespace"] = { fg = C.purple },
+    ["@namespace"] = { link = "Keyword" },
     ["@namespace.rust"] = { fg = C.yellow },
     ["@none.markdown"] = { fg = C.text },
     ["@number"] = { fg = C.orange },
-    ["@operator"] = { fg = C.cyan },
     ["@parameter"] = { fg = C.red },
     ["@parameter.reference"] = { fg = C.cyan },
     ["@property"] = { fg = C.yellow },
@@ -56,6 +55,7 @@ local function callback()
     ["@title.markdown"] = { fg = C.red },
     ["@type"] = { fg = C.blue },
     ["@type.builtin"] = { fg = C.blue },
+    ["@type.qualifier.typescript"] = { link = "Keyword" },
     ["@type.rust"] = { fg = C.yellow },
     ["@variable"] = { fg = C.red },
     ["@variable.builtin"] = { fg = C.yellow },

lua/astrotheme/groups/syntax.lua

@@ -0,0 +1,60 @@
+-- Subgroups inherit highlights from their primary groups by default.
+-- While unnecessary, we define all subgroups and their highlights
+-- for completeness.
+--
+-- Syntax group hierachry (e.g.):
+--   - Constant (Primary group)
+--       - String (Subgroup)
+--       - Character (Subgroup)
+--
+-- Ref: :help group-name
+local syntax_groups = {
+  -- Comment
+  Comment = { fg = C.subtext1, bg = C.none }, -- any comment
+  -- Constant
+  Constant = { fg = C.yellow, bg = C.none }, -- any constant
+  String = { fg = C.green, bg = C.none }, -- a string constant: "this is a string"
+  Character = { fg = C.green, bg = C.none }, -- a character constant: 'c', '\n'
+  Number = { fg = C.orange, bg = C.none }, -- a number constant: 234, 0xff
+  Boolean = { fg = C.blue, bg = C.none }, -- a boolean constant: TRUE, false
+  Float = { fg = C.yellow, bg = C.none }, -- a floating point constant: 2.3e10
+  -- Identifier
+  Identifier = { fg = C.red, bg = C.none }, -- any variable name
+  Function = { fg = C.blue, bg = C.none }, -- function name (also: methods for classes)
+  -- Statement
+  Statement = { fg = C.purple, bg = C.none }, -- any statement
+  Conditional = { fg = C.light_purple, bg = C.none }, -- if, then, else, endif, switch, etc.
+  Repeat = { fg = C.purple, bg = C.none }, -- for, do, while, etc.
+  Label = { fg = C.blue, bg = C.none }, -- case, default, etc.
+  Operator = { fg = C.white, bg = C.none }, -- "sizeof", "+", "*", etc.
+  Keyword = { fg = C.purple, bg = C.none }, -- any other keyword
+  Exception = { fg = C.purple, bg = C.none }, -- try, catch, throw
+  -- Preproc
+  PreProc = { fg = C.yellow, bg = C.none }, -- generic Preprocessor
+  Include = { fg = C.purple, bg = C.none }, -- preprocessor #include
+  Define = { fg = C.purple, bg = C.none }, -- preprocessor #define
+  Macro = { fg = C.orange, bg = C.none }, -- same as Define
+  PreCondit = { fg = C.blue, bg = C.none }, -- preprocessor #if, #else, #endif, etc.
+  -- Type
+  Type = { fg = C.blue, bg = C.none }, -- int, long, char, etc.
+  StorageClass = { fg = C.blue, bg = C.none }, -- static, register, volatile, etc.
+  Structure = { fg = C.yellow, bg = C.none }, -- struct, union, enum, etc.
+  Typedef = { fg = C.yellow, bg = C.none }, -- A typedef
+  -- Special
+  Special = { fg = C.blue, bg = C.none }, -- any special symbol
+  SpecialChar = { fg = C.blue, bg = C.none }, -- special character in a constant
+  Tag = { fg = C.blue, bg = C.none }, -- you can use CTRL-] on this
+  Delimiter = { fg = C.blue, bg = C.none }, -- character that needs attention
+  SpecialComment = { fg = C.grey, bg = C.none }, -- special things inside a comment
+  Debug = { fg = C.blue, bg = C.none }, -- debugging statements
+  -- Underlined
+  Underlined = { fg = C.cyan, bg = C.none }, -- text that stands out, HTML links
+  -- Ignore
+  Ignore = { fg = C.none, bg = C.none }, -- left blank, hidden  |hl-Ignore|
+  -- Error
+  Error = { fg = C.red, bg = C.none }, -- any erroneous construct
+  -- Todo
+  Todo = { fg = C.purple, bg = C.none }, -- anything that needs extra attention; mostly the keywords TODO FIXME and XXX
+}
+
+return syntax_groups

lua/astrotheme/init.lua

@@ -13,6 +13,7 @@ function M.load(theme)
   local highlights = {}
   highlights = util.get_hl_modules(highlights, "astrotheme.groups", {
     "base",
+    "syntax",
     "lsp",
     "astronvim",
   })