Get tests green

orta · orta · commit e4d3ca968ae9 · 2021-12-07T15:19:24.000Z
diff --git a/extensions/html-language-features/server/src/modes/javascriptMode.ts b/extensions/html-language-features/server/src/modes/javascriptMode.ts
@@ -16,7 +16,7 @@ import { normalize, sep } from 'path';
 
 import * as ts from 'typescript';
 import { getSemanticTokens, getSemanticTokenLegend } from './javascriptSemanticTokens';
-import { RequestService } from '../requests';
+import { FileSystemProvider } from '../requests';
 import { NodeRequestService } from '../node/nodeFs';
 
 const JS_WORD_REGEX = /(-?\d*\.\d\w*)|([^\`\~\!\@\#\%\^\&\*\(\)\-\=\+\[\{\]\}\\\|\;\:\'\"\,\.\<\>\/\?\s]+)/g;
@@ -33,7 +33,7 @@ function deschemeURI(uri: string) {
 	// Both \ and / must be escaped in regular expressions
 	newPath = newPath.replace(new RegExp('\\' + sep, 'g'), '/');
 
-	if (process.platform !== 'win32') return newPath;
+	if (process.platform !== 'win32') { return newPath; }
 
 	// Windows URIs come in like '/c%3A/Users/orta/dev/...', we need to switch it to 'c:/Users/orta/dev/...'
 	return newPath.slice(1).replace('%3A', ':');
@@ -104,7 +104,9 @@ function getLanguageServiceHost(scriptKind: ts.ScriptKind, fs: NodeRequestServic
 	return {
 		async getLanguageService(jsDocument: TextDocument, workspace: Workspace): Promise<ts.LanguageService> {
 			currentTextDocument = jsDocument;
-			if (workspace.folders.find(f => f.uri.startsWith('file://'))) currentWorkspace = workspace;
+			if (workspace.folders.find(f => f.uri.startsWith('file://') || f.uri.startsWith('/') || f.uri.startsWith('\\'))) {
+				currentWorkspace = workspace;
+			}
 			return jsLanguageService;
 		},
 		getCompilationSettings() {
@@ -117,7 +119,7 @@ function getLanguageServiceHost(scriptKind: ts.ScriptKind, fs: NodeRequestServic
 }
 
 
-export function getJavaScriptMode(documentRegions: LanguageModelCache<HTMLDocumentRegions>, languageId: 'javascript' | 'typescript', workspace: Workspace, fs: RequestService): LanguageMode {
+export function getJavaScriptMode(documentRegions: LanguageModelCache<HTMLDocumentRegions>, languageId: 'javascript' | 'typescript', workspace: Workspace, fs: FileSystemProvider): LanguageMode {
 	let jsDocuments = getLanguageModelCache<TextDocument>(10, 60, document => documentRegions.get(document).getEmbeddedDocument(languageId));
 
 	const host = getLanguageServiceHost(languageId === 'javascript' ? ts.ScriptKind.JS : ts.ScriptKind.TS, fs as NodeRequestService);
diff --git a/extensions/html-language-features/server/src/node/nodeFs.ts b/extensions/html-language-features/server/src/node/nodeFs.ts
@@ -18,10 +18,10 @@ export interface NodeRequestService extends FileSystemProvider {
 	statSync(location: string): FileStat
 }
 
-export function getNodeFSRequestService(): NodeRequestService {
+export function getNodeFileFS(): NodeRequestService {
 	function ensureFileUri(location: string) {
-		if (getScheme(location) !== 'file') {
-			throw new Error('fileSystemProvider can only handle file URLs');
+		if (getScheme(location) !== 'file' && getScheme(location) !== '') {
+			throw new Error(`fileSystemProvider can only handle file URLs, got ${getScheme(location)}`);
 		}
 	}
 
diff --git a/extensions/html-language-features/server/src/test/completions.test.ts b/extensions/html-language-features/server/src/test/completions.test.ts
@@ -94,18 +94,25 @@ suite('HTML Completion', () => {
 	});
 });
 
-suite('JSDoc Imports', () => {
+suite('Live TSServer inside the HTML script tags', () => {
 	const fixtureRoot = path.resolve(__dirname, '../../src/test/jsdocImportFixtures');
 	const fixtureWorkspace = { name: 'fixture', uri: URI.file(fixtureRoot).toString() };
 	const indexHtmlUri = URI.file(path.resolve(fixtureRoot, 'index.html')).toString();
 
-	test('Imports across files', async () => {
+	test('Imports across files when using fixtured data from the file system', async () => {
 		await testCompletionFor('<html><script>/** @type {import("./jsDocTypes").SomeType } */\nconst a = {}; \n a.| \n</script><html>', {
 			items: [
-				{ label: 'other',  },
-				{ label: 'property', },
+				{ label: 'other' },
+				{ label: 'property' },
 			]
-		}, indexHtmlUri, [fixtureWorkspace] );
+		}, indexHtmlUri, [fixtureWorkspace]);
+	});
+
+	test('Does not run the extended tsserver when _not_ using the local file system', async () => {
+		await testCompletionFor('<html><script>/** @type {import("./jsDocTypes").SomeType } */\nconst a {};\n a.|</script></html>', {
+			// As it's an 'any' then it has no completions
+			items: []
+		}, 'vfs://index.html', [{ name: 'vfs', uri: 'vfs://' }]);
 	});
 });
 

Original file line number	Diff line number	Diff line change
`@@ -18,10 +18,10 @@ export interface NodeRequestService extends FileSystemProvider {`
`18`	`18`	`statSync(location: string): FileStat`
`19`	`19`	`}`
`20`	`20`
`21`		`-export function getNodeFSRequestService(): NodeRequestService {`
	`21`	`+export function getNodeFileFS(): NodeRequestService {`
`22`	`22`	`function ensureFileUri(location: string) {`
`23`		`- if (getScheme(location) !== 'file') {`
`24`		`- throw new Error('fileSystemProvider can only handle file URLs');`
	`23`	`+ if (getScheme(location) !== 'file' && getScheme(location) !== '') {`
	`24`	+ throw new Error(`fileSystemProvider can only handle file URLs, got ${getScheme(location)}`);
`25`	`25`	`}`
`26`	`26`	`}`
`27`	`27`