Updated HTML language server

Author: aswinkumar863

server/package-lock.json

@@ -16,12 +16,12 @@
   },
   "main": "./out/node/htmlServerMain",
   "dependencies": {
-    "vscode-css-languageservice": "^6.0.1",
-    "vscode-html-languageservice": "^5.0.0",
-    "vscode-languageserver": "^8.0.2-next.4",
-    "vscode-languageserver-textdocument": "^1.0.4",
-    "vscode-nls": "^5.0.1",
-    "vscode-uri": "^3.0.3"
+    "vscode-css-languageservice": "^6.2.1",
+    "vscode-html-languageservice": "^5.0.3",
+    "vscode-languageserver": "^8.1.0-next.2",
+    "vscode-languageserver-textdocument": "^1.0.7",
+    "vscode-uri": "^3.0.6",
+    "@vscode/l10n": "^0.0.10"
   },
   "devDependencies": {
     "@types/mocha": "^9.1.1",

server/package.json

@@ -0,0 +1,19 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+declare let self: any;
+
+import * as l10n from '@vscode/l10n';
+
+let initialized = false;
+self.onmessage = async (e: any) => {
+	if (!initialized) {
+		initialized = true;
+		const i10lLocation = e.data.i10lLocation;
+		if (i10lLocation) {
+			await l10n.config({ uri: i10lLocation });
+		}
+		await import('./htmlServerMain');
+	}
+};

server/src/browser/htmlServerWorkerMain.ts

@@ -168,7 +168,7 @@ function getEmbeddedDocument(document: TextDocument, contents: EmbeddedRegion[],
 	for (const c of contents) {
 		if (c.languageId === languageId && (!ignoreAttributeValues || !c.attributeValue)) {
 			result = substituteWithWhitespace(result, currentPos, c.start, oldContent, lastSuffix, getPrefix(c));
-			result += oldContent.substring(c.start, c.end);
+			result += updateContent(c, oldContent.substring(c.start, c.end));
 			currentPos = c.end;
 			lastSuffix = getSuffix(c);
 		}
@@ -194,11 +194,17 @@ function getSuffix(c: EmbeddedRegion) {
 	}
 	return '';
 }
+function updateContent(c: EmbeddedRegion, content: string): string {
+	if (!c.attributeValue && c.languageId === 'javascript') {
+		return content.replace(`<!--`, `/* `).replace(`-->`, ` */`);
+	}
+	return content;
+}
 
 function substituteWithWhitespace(result: string, start: number, end: number, oldContent: string, before: string, after: string) {
-	let accumulatedWS = 0;
 	result += before;
-	for (let i = start + before.length; i < end; i++) {
+	let accumulatedWS = -before.length; // start with a negative value to account for the before string
+	for (let i = start; i < end; i++) {
 		const ch = oldContent[i];
 		if (ch === '\n' || ch === '\r') {
 			// only write new lines, skip the whitespace

server/src/modes/embeddedSupport.ts

@@ -93,13 +93,16 @@ function getLanguageServiceHost(scriptKind: ts.ScriptKind) {
 	};
 }
 
+const ignoredErrors = [
+	1108,  /* A_return_statement_can_only_be_used_within_a_function_body_1108 */
+	2792, /* Cannot_find_module_0_Did_you_mean_to_set_the_moduleResolution_option_to_node_or_to_add_aliases_to_the_paths_option */
+];
 
 export function getJavaScriptMode(documentRegions: LanguageModelCache<HTMLDocumentRegions>, languageId: 'javascript' | 'typescript', workspace: Workspace): LanguageMode {
 	const jsDocuments = getLanguageModelCache<TextDocument>(10, 60, document => documentRegions.get(document).getEmbeddedDocument(languageId));
 
 	const host = getLanguageServiceHost(languageId === 'javascript' ? ts.ScriptKind.JS : ts.ScriptKind.TS);
 	const globalSettings: Settings = {};
-
 	return {
 		getId() {
 			return languageId;
@@ -110,7 +113,7 @@ export function getJavaScriptMode(documentRegions: LanguageModelCache<HTMLDocume
 			const languageService = await host.getLanguageService(jsDocument);
 			const syntaxDiagnostics: ts.Diagnostic[] = languageService.getSyntacticDiagnostics(jsDocument.uri);
 			const semanticDiagnostics = languageService.getSemanticDiagnostics(jsDocument.uri);
-			return syntaxDiagnostics.concat(semanticDiagnostics).filter(d => d.code !== 1108).map((diag: ts.Diagnostic): Diagnostic => {
+			return syntaxDiagnostics.concat(semanticDiagnostics).filter(d => !ignoredErrors.includes(d.code)).map((diag: ts.Diagnostic): Diagnostic => {
 				return {
 					range: convertRange(jsDocument, diag),
 					severity: DiagnosticSeverity.Error,

server/src/modes/javascriptMode.ts

@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { FileSystemProvider, getScheme } from '../requests';
+import { FileSystemProvider } from '../requests';
 import { URI as Uri } from 'vscode-uri';
 
 import * as fs from 'fs';
 import { FileType } from 'vscode-css-languageservice';
 
 export function getNodeFileFS(): FileSystemProvider {
 	function ensureFileUri(location: string) {
-		if (getScheme(location) !== 'file') {
+		if (!location.startsWith('file:')) {
 			throw new Error('fileSystemProvider can only handle file URLs');
 		}
 	}