fix(typescript): define accurate SemanticTokensLegend

volarjs · Jun 22, 2024 · 7ac2881 · 7ac2881
1 parent 0038413
commit 7ac2881
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 18 deletions.
diff --git a/packages/typescript/lib/plugins/semantic.ts b/packages/typescript/lib/plugins/semantic.ts
@@ -138,37 +138,22 @@ export function create(
 						'class',
 						'enum',
 						'interface',
-						'struct',
 						'typeParameter',
 						'type',
 						'parameter',
 						'variable',
 						'property',
 						'enumMember',
-						'decorator',
-						'event',
 						'function',
 						'method',
-						'macro',
-						'label',
-						'comment',
-						'string',
-						'keyword',
-						'number',
-						'regexp',
-						'operator',
 					],
 					tokenModifiers: [
 						'declaration',
-						'definition',
 						'readonly',
 						'static',
-						'deprecated',
-						'abstract',
 						'async',
-						'modification',
-						'documentation',
 						'defaultLibrary',
+						'local', // additional
 					],
 				},
 			},

diff --git a/packages/typescript/lib/semanticFeatures/semanticTokens.ts b/packages/typescript/lib/semanticFeatures/semanticTokens.ts
@@ -23,7 +23,7 @@ export function register(ts: typeof import('typescript'), ctx: SharedContext) {
 		tokenModifiersTable[TokenModifier.declaration] = 1 << legend.tokenModifiers.indexOf('declaration');
 		tokenModifiersTable[TokenModifier.readonly] = 1 << legend.tokenModifiers.indexOf('readonly');
 		tokenModifiersTable[TokenModifier.static] = 1 << legend.tokenModifiers.indexOf('static');
-		tokenModifiersTable[TokenModifier.local] = 1 << legend.tokenModifiers.indexOf('local'); // missing in server tokenModifiers
+		tokenModifiersTable[TokenModifier.local] = 1 << legend.tokenModifiers.indexOf('local');
 		tokenModifiersTable[TokenModifier.defaultLibrary] = 1 << legend.tokenModifiers.indexOf('defaultLibrary');
 		tokenModifiersTable = tokenModifiersTable.map(mod => Math.max(mod, 0));
 
@@ -146,7 +146,7 @@ tokenModifiers[TokenModifier.async] = 'async';
 tokenModifiers[TokenModifier.declaration] = 'declaration';
 tokenModifiers[TokenModifier.readonly] = 'readonly';
 tokenModifiers[TokenModifier.static] = 'static';
-tokenModifiers[TokenModifier.local] = 'local'; // missing in server tokenModifiers
+tokenModifiers[TokenModifier.local] = 'local';
 tokenModifiers[TokenModifier.defaultLibrary] = 'defaultLibrary';
 
 // mapping for the original ExperimentalProtocol.ClassificationType from TypeScript (only used when plugin is not available)