(fix) support for multiple folders in workspace (#480)

Author: g-plane

packages/language-server/src/plugins/typescript/LSAndTSDocResolver.ts

@@ -13,7 +13,7 @@ import { SnapshotManager } from './SnapshotManager';
 export class LSAndTSDocResolver {
     constructor(
         private readonly docManager: DocumentManager,
-        private readonly workspacePath: string,
+        private readonly workspaceUris: string[],
     ) {
         docManager.on(
             'documentChange',
@@ -42,7 +42,7 @@ export class LSAndTSDocResolver {
     };
 
     getLSForPath(path: string) {
-        return getLanguageServiceForPath(path, this.workspacePath, this.createDocument);
+        return getLanguageServiceForPath(path, this.workspaceUris, this.createDocument);
     }
 
     getLSAndTSDoc(
@@ -53,7 +53,7 @@ export class LSAndTSDocResolver {
     } {
         const lang = getLanguageServiceForDocument(
             document,
-            this.workspacePath,
+            this.workspaceUris,
             this.createDocument,
         );
         const filePath = document.getFilePath()!;
@@ -95,6 +95,6 @@ export class LSAndTSDocResolver {
     }
 
     private getTSService(filePath: string): LanguageServiceContainer {
-        return getService(filePath, this.workspacePath, this.createDocument);
+        return getService(filePath, this.workspaceUris, this.createDocument);
     }
 }

packages/language-server/src/plugins/typescript/TypeScriptPlugin.ts

@@ -74,10 +74,10 @@ export class TypeScriptPlugin
     constructor(
         docManager: DocumentManager,
         configManager: LSConfigManager,
-        workspacePath: string,
+        workspaceUris: string[],
     ) {
         this.configManager = configManager;
-        this.lsAndTsDocResolver = new LSAndTSDocResolver(docManager, workspacePath);
+        this.lsAndTsDocResolver = new LSAndTSDocResolver(docManager, workspaceUris);
         this.completionProvider = new CompletionsProviderImpl(this.lsAndTsDocResolver);
         this.codeActionsProvider = new CodeActionsProviderImpl(
             this.lsAndTsDocResolver,

packages/language-server/src/plugins/typescript/service.ts

@@ -23,24 +23,24 @@ export type CreateDocument = (fileName: string, content: string) => Document;
 
 export function getLanguageServiceForPath(
     path: string,
-    workspacePath: string,
+    workspaceUris: string[],
     createDocument: CreateDocument,
 ): ts.LanguageService {
-    return getService(path, workspacePath, createDocument).getService();
+    return getService(path, workspaceUris, createDocument).getService();
 }
 
 export function getLanguageServiceForDocument(
     document: Document,
-    workspacePath: string,
+    workspaceUris: string[],
     createDocument: CreateDocument,
 ): ts.LanguageService {
-    return getService(document.getFilePath() || '', workspacePath, createDocument).updateDocument(
+    return getService(document.getFilePath() || '', workspaceUris, createDocument).updateDocument(
         document,
     );
 }
 
-export function getService(path: string, workspacePath: string, createDocument: CreateDocument) {
-    const tsconfigPath = findTsConfigPath(path, workspacePath);
+export function getService(path: string, workspaceUris: string[], createDocument: CreateDocument) {
+    const tsconfigPath = findTsConfigPath(path, workspaceUris);
 
     let service: LanguageServiceContainer;
     if (services.has(tsconfigPath)) {

packages/language-server/src/plugins/typescript/utils.ts

@@ -1,4 +1,4 @@
-import { dirname, relative, isAbsolute } from 'path';
+import { dirname } from 'path';
 import ts from 'typescript';
 import {
     CompletionItemKind,
@@ -8,6 +8,7 @@ import {
     SymbolKind,
 } from 'vscode-languageserver';
 import { mapRangeToOriginal } from '../../lib/documents';
+import { pathToUrl } from '../../utils';
 import { SnapshotFragment } from './DocumentSnapshot';
 
 export function getScriptKindFromFileName(fileName: string): ts.ScriptKind {
@@ -102,20 +103,19 @@ export function convertToLocationRange(defDoc: SnapshotFragment, textSpan: ts.Te
     return range;
 }
 
-export function findTsConfigPath(fileName: string, rootPath: string) {
+export function findTsConfigPath(fileName: string, rootUris: string[]) {
     const searchDir = dirname(fileName);
 
     const path =
         ts.findConfigFile(searchDir, ts.sys.fileExists, 'tsconfig.json') ||
         ts.findConfigFile(searchDir, ts.sys.fileExists, 'jsconfig.json') ||
         '';
     // Don't return config files that exceed the current workspace context.
-    return !!path && isSubPath(rootPath, path) ? path : '';
+    return !!path && rootUris.some(rootUri => isSubPath(rootUri, path)) ? path : '';
 }
 
-export function isSubPath(path: string, possibleSubPath: string): boolean {
-    const relativePath = relative(path, possibleSubPath);
-    return !!relativePath && !relativePath.startsWith('..') && !isAbsolute(relativePath);
+export function isSubPath(uri: string, possibleSubPath: string): boolean {
+    return pathToUrl(possibleSubPath).startsWith(uri);
 }
 
 export function symbolKindFromString(kind: string): SymbolKind {

packages/language-server/src/server.ts

@@ -86,9 +86,10 @@ export function startServer(options?: LSOptions) {
     let sveltePlugin: SveltePlugin = undefined as any;
 
     connection.onInitialize((evt) => {
-        const workspacePath = urlToPath(evt.rootUri || '') || '';
-        Logger.log('Initialize language server at ', workspacePath);
-        if (!workspacePath) {
+        const workspaceUris = evt.workspaceFolders?.map(folder => folder.uri.toString())
+            ?? [evt.rootUri ?? ''];
+        Logger.log('Initialize language server at ', workspaceUris.join(', '));
+        if (workspaceUris.length === 0) {
             Logger.error('No workspace path set');
         }
 
@@ -102,7 +103,7 @@ export function startServer(options?: LSOptions) {
         );
         pluginHost.register(new HTMLPlugin(docManager, configManager));
         pluginHost.register(new CSSPlugin(docManager, configManager));
-        pluginHost.register(new TypeScriptPlugin(docManager, configManager, workspacePath));
+        pluginHost.register(new TypeScriptPlugin(docManager, configManager, workspaceUris));
 
         const clientSupportApplyEditCommand = !!evt.capabilities.workspace?.applyEdit;
 

packages/language-server/src/svelte-check.ts

@@ -3,7 +3,7 @@ import { LSConfigManager } from './ls-config';
 import { CSSPlugin, HTMLPlugin, PluginHost, SveltePlugin, TypeScriptPlugin } from './plugins';
 import { Diagnostic } from 'vscode-languageserver';
 import { Logger } from './logger';
-import { urlToPath } from './utils';
+import { urlToPath, pathToUrl } from './utils';
 
 export interface SvelteCheckOptions {
     compilerWarnings?: Record<string, 'ignore' | 'error'>;
@@ -35,7 +35,7 @@ export class SvelteCheck {
         this.pluginHost.register(new HTMLPlugin(this.docManager, this.configManager));
         this.pluginHost.register(new CSSPlugin(this.docManager, this.configManager));
         this.pluginHost.register(
-            new TypeScriptPlugin(this.docManager, this.configManager, workspacePath),
+            new TypeScriptPlugin(this.docManager, this.configManager, [pathToUrl(workspacePath)]),
         );
     }
 

packages/language-server/test/plugins/typescript/TypescriptPlugin.test.ts

@@ -20,7 +20,7 @@ describe('TypescriptPlugin', () => {
         const filePath = path.join(testDir, filename);
         const document = new Document(pathToUrl(filePath), ts.sys.readFile(filePath) || '');
         const pluginManager = new LSConfigManager();
-        const plugin = new TypeScriptPlugin(docManager, pluginManager, testDir);
+        const plugin = new TypeScriptPlugin(docManager, pluginManager, [pathToUrl(testDir)]);
         docManager.openDocument(<any>'some doc');
         return { plugin, document };
     }

packages/language-server/test/plugins/typescript/features/CodeActionsProvider.test.ts

@@ -27,7 +27,7 @@ describe('CodeActionsProvider', () => {
         const docManager = new DocumentManager(
             (textDocument) => new Document(textDocument.uri, textDocument.text),
         );
-        const lsAndTsDocResolver = new LSAndTSDocResolver(docManager, testDir);
+        const lsAndTsDocResolver = new LSAndTSDocResolver(docManager, [pathToUrl(testDir)]);
         const completionProvider = new CompletionsProviderImpl(lsAndTsDocResolver);
         const provider = new CodeActionsProviderImpl(lsAndTsDocResolver, completionProvider);
         const filePath = getFullPath(filename);

packages/language-server/test/plugins/typescript/features/CompletionProvider.test.ts

@@ -33,7 +33,7 @@ describe('CompletionProviderImpl', () => {
         const docManager = new DocumentManager(
             (textDocument) => new Document(textDocument.uri, textDocument.text),
         );
-        const lsAndTsDocResolver = new LSAndTSDocResolver(docManager, testDir);
+        const lsAndTsDocResolver = new LSAndTSDocResolver(docManager, [pathToUrl(testDir)]);
         const completionProvider = new CompletionsProviderImpl(lsAndTsDocResolver);
         const filePath = join(testFilesDir, filename);
         const document = docManager.openDocument(<any>{

packages/language-server/test/plugins/typescript/features/DiagnosticsProvider.test.ts

@@ -13,7 +13,7 @@ describe('DiagnosticsProvider', () => {
         const filePath = path.join(testDir, 'testfiles', filename);
         const document = new Document(pathToUrl(filePath), ts.sys.readFile(filePath)!);
         const pluginManager = new LSConfigManager();
-        const plugin = new TypeScriptPlugin(docManager, pluginManager, testDir);
+        const plugin = new TypeScriptPlugin(docManager, pluginManager, [pathToUrl(testDir)]);
         docManager.openDocument(<any>'some doc');
         return { plugin, document };
     }