Adjust semantic faces/limit-types and complete multi-server config key.

manateelazycat · May 4, 2024 · 9ff3037 · 9ff3037
1 parent e2ae485
commit 9ff3037
Show file tree

Hide file tree

Showing 13 changed files with 52 additions and 3 deletions.
diff --git a/lsp-bridge-semantic-tokens.el b/lsp-bridge-semantic-tokens.el
@@ -154,14 +154,51 @@ requesting new semantic tokens."
   :group 'lsp-bridge-semantic-tokens)
 
 (defvar-local lsp-bridge-semantic-tokens-type-faces
-    [("comment" . lsp-bridge-semantic-tokens-comment-face)]
+    [
+     ("namespace" . lsp-bridge-semantic-tokens-namespace-face)
+     ("type" . lsp-bridge-semantic-tokens-type-face)
+     ("class" . lsp-bridge-semantic-tokens-class-face)
+     ("enum" . lsp-bridge-semantic-tokens-enum-face)
+     ("interface" . lsp-bridge-semantic-tokens-interface-face)
+     ("struct" . lsp-bridge-semantic-tokens-struct-face)
+     ("typeParameter" . lsp-bridge-semantic-tokens-type-parameter-face)
+     ("parameter" . lsp-bridge-semantic-tokens-parameter-face)
+     ("variable" . lsp-bridge-semantic-tokens-variable-face)
+     ("property" . lsp-bridge-semantic-tokens-property-face)
+     ("enumMember" . lsp-bridge-semantic-tokens-enum-member-face)
+     ("event" . lsp-bridge-semantic-tokens-event-face)
+     ("function" . lsp-bridge-semantic-tokens-function-face)
+     ("method" . lsp-bridge-semantic-tokens-method-face)
+     ("macro" . lsp-bridge-semantic-tokens-macro-face)
+     ("keyword" . lsp-bridge-semantic-tokens-keyword-face)
+     ("modifier" . lsp-bridge-semantic-tokens-modifier-face)
+     ("comment" . lsp-bridge-semantic-tokens-comment-face)
+     ("string" . lsp-bridge-semantic-tokens-string-face)
+     ("number" . lsp-bridge-semantic-tokens-number-face)
+     ("regexp" . lsp-bridge-semantic-tokens-regexp-face)
+     ("operator" . lsp-bridge-semantic-tokens-operator-face)
+     ("decorator" . lsp-bridge-semantic-tokens-decorator-face)
+     ]
   "Faces to use for semantic tokens.")
 
 (defvar-local lsp-bridge-semantic-tokens-type-modifier-faces []
   "Semantic tokens modifier faces.
 Faces to use for semantic token modifiers.")
 
-(defvar-local lsp-bridge-semantic-tokens-ignore-modifier-limit-types ["comment"]
+(defvar-local lsp-bridge-semantic-tokens-ignore-modifier-limit-types ["namespace"
+                                                                      "class"
+                                                                      "enum"
+                                                                      "interface"
+                                                                      "struct"
+                                                                      "typeParameter"
+                                                                      "parameter"
+                                                                      "enumMember"
+                                                                      "event"
+                                                                      "macro"
+                                                                      "modifier"
+                                                                      "comment"
+                                                                      "decorator"
+                                                                      ]
   "Which types need to ignore modifier limit.")
 
 (defvar-local lsp-bridge-semantic-tokens--overlays nil  "Semantic tokens overlays.")

diff --git a/multiserver/css_emmet.json b/multiserver/css_emmet.json
@@ -17,5 +17,6 @@
   "rename": "vscode-css-language-server",
   "document_symbol": "vscode-css-language-server",
   "workspace_symbol": "vscode-css-language-server",
+  "semantic_tokens": "vscode-css-language-server",
   "inlay_hint": "vscode-css-language-server"
 }
diff --git a/multiserver/css_tailwindcss.json b/multiserver/css_tailwindcss.json
@@ -17,5 +17,6 @@
   "rename": "vscode-css-language-server",
   "document_symbol": "vscode-css-language-server",
   "workspace_symbol": "vscode-css-language-server",
+  "semantic_tokens": "vscode-css-language-server",
   "inlay_hint": "vscode-css-language-server"
 }
diff --git a/multiserver/html_emmet.json b/multiserver/html_emmet.json
@@ -17,5 +17,6 @@
   "rename": "vscode-html-language-server",
   "document_symbol": "vscode-html-language-server",
   "workspace_symbol": "vscode-html-language-server",
+  "semantic_tokens": "vscode-html-language-server",
   "inlay_hint": "vscode-html-language-server"
 }
diff --git a/multiserver/html_tailwindcss.json b/multiserver/html_tailwindcss.json
@@ -17,5 +17,6 @@
   "rename": "vscode-html-language-server",
   "document_symbol": "vscode-html-language-server",
   "workspace_symbol": "vscode-html-language-server",
+  "semantic_tokens": "vscode-html-language-server",
   "inlay_hint": "vscode-html-language-server"
-}
+}
diff --git a/multiserver/jedi_ruff.json b/multiserver/jedi_ruff.json
@@ -17,5 +17,6 @@
   "rename": "jedi",
   "document_symbol": "jedi",
   "workspace_symbol": "jedi",
+  "semantic_tokens": "jedi",
   "inlay_hint": "jedi"
 }
diff --git a/multiserver/pylsp_ruff.json b/multiserver/pylsp_ruff.json
@@ -17,5 +17,6 @@
   "rename": "pylsp",
   "document_symbol": "pylsp",
   "workspace_symbol": "pylsp",
+  "semantic_tokens": "pylsp",
   "inlay_hint": "pylsp"
 }
diff --git a/multiserver/pyright-background-analysis_ruff.json b/multiserver/pyright-background-analysis_ruff.json
@@ -17,5 +17,6 @@
   "rename": "pyright-background-analysis",
   "document_symbol": "pyright-background-analysis",
   "workspace_symbol": "pyright-background-analysis",
+  "semantic_tokens": "pyright-background-analysis",
   "inlay_hint": "pyright-background-analysis"
 }
diff --git a/multiserver/pyright_ruff.json b/multiserver/pyright_ruff.json
@@ -17,5 +17,6 @@
   "rename": "pyright",
   "document_symbol": "pyright",
   "workspace_symbol": "pyright",
+  "semantic_tokens": "pyright",
   "inlay_hint": "pyright"
 }
diff --git a/multiserver/python-ms_ruff.json b/multiserver/python-ms_ruff.json
@@ -17,5 +17,6 @@
   "rename": "python-ms",
   "document_symbol": "python-ms",
   "workspace_symbol": "python-ms",
+  "semantic_tokens": "python-ms",
   "inlay_hint": "python-ms"
 }
diff --git a/multiserver/qmlls_javascript.json b/multiserver/qmlls_javascript.json
@@ -17,5 +17,6 @@
   "rename": "qmlls",
   "document_symbol": "qmalls",
   "workspace_symbol": "qmalls",
+  "semantic_tokens": "qmalls",
   "inlay_hint": "qmalls"
 }
diff --git a/multiserver/typescript_eslint.json b/multiserver/typescript_eslint.json
@@ -17,5 +17,6 @@
   "rename": "typescript",
   "document_symbol": "typescript",
   "workspace_symbol": "typescript",
+  "semantic_tokens": "typescript",
   "inlay_hint": "typescript"
 }
diff --git a/multiserver/volar_emmet.json b/multiserver/volar_emmet.json
@@ -17,5 +17,6 @@
   "rename": "volar",
   "document_symbol": "volar",
   "workspace_symbol": "volar",
+  "semantic_tokens": "volar",
   "inlay_hint": "volar"
 }