WIP #239 Improve semantic tokens support

Signed-off-by: Remy Suen <[email protected]>
rcjsuen · Apr 3, 2020 · fbdf7dd · fbdf7dd
1 parent 760bd62
commit fbdf7dd
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 38 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [Unreleased]
+### Fixed
+- textDocument/semanticTokens
+  - revamp to better handle strings, more tokens supported, and various fixes ([#239](https://github.com/rcjsuen/dockerfile-language-server-nodejs/issues/239))
+
 ## [0.0.22] - 2020-02-12
 ### Added
 - textDocument/completion
@@ -473,6 +478,7 @@ All notable changes to this project will be documented in this file.
 - textDocument/formatting
 - textDocument/rangeFormatting
 
+[Unreleased]: https://github.com/rcjsuen/dockerfile-language-server-nodejs/compare/v0.0.22...HEAD
 [0.0.22]: https://github.com/rcjsuen/dockerfile-language-server-nodejs/compare/v0.0.21...v0.0.22
 [0.0.21]: https://github.com/rcjsuen/dockerfile-language-server-nodejs/compare/v0.0.20...v0.0.21
 [0.0.20]: https://github.com/rcjsuen/dockerfile-language-server-nodejs/compare/v0.0.19...v0.0.20

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -20,9 +20,9 @@
     "node": "*"
   },
   "dependencies": {
-    "dockerfile-language-service": "0.0.9",
+    "dockerfile-language-service": "0.0.11",
     "dockerfile-utils": "0.0.11",
-    "vscode-languageserver": "^6.1.0"
+    "vscode-languageserver": "^6.1.1"
   },
   "devDependencies": {
     "@types/mocha": "^2.2.33",

diff --git a/src/server.ts b/src/server.ts
@@ -254,9 +254,10 @@ connection.onInitialize((params: InitializeParams): InitializeResult => {
 						SemanticTokenTypes.property,
 						SemanticTokenTypes.label,
 						SemanticTokenTypes.class,
-						SemanticTokenTypes.marco,
+						SemanticTokenTypes.macro,
 						SemanticTokenTypes.string,
 						SemanticTokenTypes.variable,
+						SemanticTokenTypes.operator
 					],
 					tokenModifiers: [
 						SemanticTokenModifiers.declaration,