From f07fae16be03142ecae8cce106abf9eea9ec1836 Mon Sep 17 00:00:00 2001
From: Martin Aeschlimann <martinae@microsoft.com>
Date: Fri, 13 Dec 2019 11:50:23 +0100
Subject: [PATCH] extract js semantic tokens

---
 .../server/src/modes/javascriptMode.ts        | 50 ++---------------
 .../src/modes/javascriptSemanticTokens.ts     | 56 +++++++++++++++++++
 .../server/src/modes/languageModes.ts         |  3 +-
 3 files changed, 64 insertions(+), 45 deletions(-)
 create mode 100644 extensions/html-language-features/server/src/modes/javascriptSemanticTokens.ts

diff --git a/extensions/html-language-features/server/src/modes/javascriptMode.ts b/extensions/html-language-features/server/src/modes/javascriptMode.ts
index 337d47a65a4..258e471d7dc 100644
--- a/extensions/html-language-features/server/src/modes/javascriptMode.ts
+++ b/extensions/html-language-features/server/src/modes/javascriptMode.ts
@@ -7,14 +7,15 @@ import { LanguageModelCache, getLanguageModelCache } from '../languageModelCache
 import {
 	SymbolInformation, SymbolKind, CompletionItem, Location, SignatureHelp, SignatureInformation, ParameterInformation,
 	Definition, TextEdit, TextDocument, Diagnostic, DiagnosticSeverity, Range, CompletionItemKind, Hover, MarkedString,
-	DocumentHighlight, DocumentHighlightKind, CompletionList, Position, FormattingOptions, FoldingRange, FoldingRangeKind, SelectionRange
-} from 'vscode-html-languageservice';
-import { LanguageMode, Settings } from './languageModes';
+	DocumentHighlight, DocumentHighlightKind, CompletionList, Position, FormattingOptions, FoldingRange, FoldingRangeKind, SelectionRange,
+	LanguageMode, Settings
+} from './languageModes';
 import { getWordAtText, startsWith, isWhitespaceOnly, repeat } from '../utils/strings';
 import { HTMLDocumentRegions } from './embeddedSupport';
 
 import * as ts from 'typescript';
 import { join } from 'path';
+import { getSemanticTokens, getSemanticTokenLegend } from './javascriptSemanticTokens';
 
 const FILE_NAME = 'vscode://javascript/1';  // the same 'file' is used for all contents
 const TS_FILE_NAME = 'vscode://javascript/2.ts';
@@ -320,38 +321,10 @@ export function getJavaScriptMode(documentRegions: LanguageModelCache<HTMLDocume
 			if (!ranges) {
 				ranges = [Range.create(Position.create(0, 0), document.positionAt(document.getText().length))];
 			}
-			const result = [];
-
-			for (let range of ranges) {
-				const start = document.offsetAt(range.start), length = document.offsetAt(range.end) - start;
-				const tokens = jsLanguageService.getSemanticClassifications(TS_FILE_NAME, { start, length });
-
-				let prefLine = 0;
-				let prevChar = 0;
-
-				for (let token of tokens) {
-					const m = tokenMapping[token.classificationType];
-					if (m) {
-						const startPos = currentTextDocument.positionAt(token.textSpan.start);
-						if (prefLine !== startPos.line) {
-							prevChar = 0;
-						}
-						result.push(startPos.line - prefLine); // line delta
-						result.push(startPos.character - prevChar); // line delta
-						result.push(token.textSpan.length); // lemgth
-						result.push(tokenTypes.indexOf(m)); // tokenType
-						result.push(0); // tokenModifier
-
-						prefLine = startPos.line;
-						prevChar = startPos.character;
-					}
-
-				}
-			}
-			return result;
+			return getSemanticTokens(jsLanguageService, document, TS_FILE_NAME, ranges);
 		},
 		getSemanticTokenLegend(): { types: string[], modifiers: string[] } {
-			return { types: tokenTypes, modifiers: tokenModifiers };
+			return getSemanticTokenLegend();
 		},
 		dispose() {
 			jsLanguageService.dispose();
@@ -360,17 +333,6 @@ export function getJavaScriptMode(documentRegions: LanguageModelCache<HTMLDocume
 	};
 }
 
-const tokenTypes: string[] = ['class', 'enum', 'interface', 'namespace', 'parameterType', 'type', 'parameter'];
-const tokenModifiers: string[] = [];
-const tokenMapping: { [name: string]: string } = {
-	[ts.ClassificationTypeNames.className]: 'class',
-	[ts.ClassificationTypeNames.enumName]: 'enum',
-	[ts.ClassificationTypeNames.interfaceName]: 'interface',
-	[ts.ClassificationTypeNames.moduleName]: 'namespace',
-	[ts.ClassificationTypeNames.typeParameterName]: 'parameterType',
-	[ts.ClassificationTypeNames.typeAliasName]: 'type',
-	[ts.ClassificationTypeNames.parameterName]: 'parameter'
-};
 
 
 
diff --git a/extensions/html-language-features/server/src/modes/javascriptSemanticTokens.ts b/extensions/html-language-features/server/src/modes/javascriptSemanticTokens.ts
new file mode 100644
index 00000000000..9e818f5ddc8
--- /dev/null
+++ b/extensions/html-language-features/server/src/modes/javascriptSemanticTokens.ts
@@ -0,0 +1,56 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { TextDocument, Range } from './languageModes';
+import * as ts from 'typescript';
+
+export function getSemanticTokens(jsLanguageService: ts.LanguageService, currentTextDocument: TextDocument, fileName: string, ranges: Range[]) {
+	const result = [];
+
+	for (let range of ranges) {
+		const start = currentTextDocument.offsetAt(range.start), length = currentTextDocument.offsetAt(range.end) - start;
+		const tokens = jsLanguageService.getSemanticClassifications(fileName, { start, length });
+
+		let prefLine = 0;
+		let prevChar = 0;
+
+		for (let token of tokens) {
+			const m = tokenMapping[token.classificationType];
+			if (m) {
+				const startPos = currentTextDocument.positionAt(token.textSpan.start);
+				if (prefLine !== startPos.line) {
+					prevChar = 0;
+				}
+				result.push(startPos.line - prefLine); // line delta
+				result.push(startPos.character - prevChar); // line delta
+				result.push(token.textSpan.length); // lemgth
+				result.push(tokenTypes.indexOf(m)); // tokenType
+				result.push(0); // tokenModifier
+
+				prefLine = startPos.line;
+				prevChar = startPos.character;
+			}
+
+		}
+	}
+	return result;
+}
+
+export function getSemanticTokenLegend() {
+	return { types: tokenTypes, modifiers: tokenModifiers };
+}
+
+
+const tokenTypes: string[] = ['class', 'enum', 'interface', 'namespace', 'parameterType', 'type', 'parameter'];
+const tokenModifiers: string[] = [];
+const tokenMapping: { [name: string]: string } = {
+	[ts.ClassificationTypeNames.className]: 'class',
+	[ts.ClassificationTypeNames.enumName]: 'enum',
+	[ts.ClassificationTypeNames.interfaceName]: 'interface',
+	[ts.ClassificationTypeNames.moduleName]: 'namespace',
+	[ts.ClassificationTypeNames.typeParameterName]: 'parameterType',
+	[ts.ClassificationTypeNames.typeAliasName]: 'type',
+	[ts.ClassificationTypeNames.parameterName]: 'parameter'
+};
diff --git a/extensions/html-language-features/server/src/modes/languageModes.ts b/extensions/html-language-features/server/src/modes/languageModes.ts
index 4400e774c78..e522de5cb86 100644
--- a/extensions/html-language-features/server/src/modes/languageModes.ts
+++ b/extensions/html-language-features/server/src/modes/languageModes.ts
@@ -17,7 +17,8 @@ import { getDocumentRegions, HTMLDocumentRegions } from './embeddedSupport';
 import { getHTMLMode } from './htmlMode';
 import { getJavaScriptMode } from './javascriptMode';
 
-export { ColorInformation, ColorPresentation, Color };
+export * from 'vscode-html-languageservice';
+export { WorkspaceFolder } from 'vscode-languageserver';
 
 export interface Settings {
 	css?: any;