feat: Project reference support

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

@@ -50,14 +50,10 @@ export class LSAndTSDocResolver {
         private readonly configManager: LSConfigManager,
         private readonly options?: LSAndTSDocResolverOptions
     ) {
-        const handleDocumentChange = (document: Document) => {
-            // This refreshes the document in the ts language service
-            this.getSnapshot(document);
-        };
         docManager.on(
             'documentChange',
             debounceSameArg(
-                handleDocumentChange,
+                this.updateSnapshot.bind(this),
                 (newDoc, prevDoc) => newDoc.uri === prevDoc?.uri,
                 1000
             )
@@ -68,7 +64,11 @@ export class LSAndTSDocResolver {
         // where multiple files and their dependencies
         // being loaded in a short period of times
         docManager.on('documentOpen', (document) => {
-            handleDocumentChange(document);
+            if (document.openedByClient) {
+                this.getOrCreateSnapshot(document);
+            } else {
+                this.updateSnapshot(document);
+            }
             docManager.lockDocument(document.uri);
         });
 
@@ -151,18 +151,20 @@ export class LSAndTSDocResolver {
     private lsDocumentContext: LanguageServiceDocumentContext;
     private readonly watchedDirectories: FileSet;
 
-    async getLSForPath(path: string) {
-        return (await this.getTSService(path)).getService();
-    }
-
     async getLSAndTSDoc(document: Document): Promise<{
         tsDoc: SvelteDocumentSnapshot;
         lang: ts.LanguageService;
         userPreferences: ts.UserPreferences;
+        lsContainer: LanguageServiceContainer;
     }> {
         const { tsDoc, lsContainer, userPreferences } = await this.getLSAndTSDocWorker(document);
 
-        return { tsDoc, lang: lsContainer.getService(), userPreferences };
+        return {
+            tsDoc,
+            lang: lsContainer.getService(),
+            userPreferences,
+            lsContainer
+        };
     }
 
     /**
@@ -181,7 +183,7 @@ export class LSAndTSDocResolver {
 
     private async getLSAndTSDocWorker(document: Document) {
         const lsContainer = await this.getTSService(document.getFilePath() || '');
-        const tsDoc = await this.getSnapshot(document);
+        const tsDoc = await this.getOrCreateSnapshot(document);
         const userPreferences = this.getUserPreferences(tsDoc);
 
         return { tsDoc, lsContainer, userPreferences };
@@ -192,13 +194,21 @@ export class LSAndTSDocResolver {
      * the ts service it primarily belongs into.
      * The update is mirrored in all other services, too.
      */
-    async getSnapshot(document: Document): Promise<SvelteDocumentSnapshot>;
-    async getSnapshot(pathOrDoc: string | Document): Promise<DocumentSnapshot>;
-    async getSnapshot(pathOrDoc: string | Document) {
+    async getOrCreateSnapshot(document: Document): Promise<SvelteDocumentSnapshot>;
+    async getOrCreateSnapshot(pathOrDoc: string | Document): Promise<DocumentSnapshot>;
+    async getOrCreateSnapshot(pathOrDoc: string | Document) {
         const filePath = typeof pathOrDoc === 'string' ? pathOrDoc : pathOrDoc.getFilePath() || '';
         const tsService = await this.getTSService(filePath);
         return tsService.updateSnapshot(pathOrDoc);
     }
+    private async updateSnapshot(document: Document) {
+        const filePath = document.getFilePath();
+        if (!filePath) {
+            return;
+        }
+        // ensure no new service is created
+        await this.updateExistingFile(filePath, (service) => service.updateSnapshot(document));
+    }
 
     /**
      * Updates snapshot path in all existing ts services and retrieves snapshot
@@ -217,7 +227,7 @@ export class LSAndTSDocResolver {
             });
         } else {
             // This may not be a file but a directory, still try
-            await this.getSnapshot(newPath);
+            await this.getOrCreateSnapshot(newPath);
         }
     }
 
@@ -280,19 +290,11 @@ export class LSAndTSDocResolver {
         });
     }
 
-    /**
-     * @internal Public for tests only
-     */
-    async getSnapshotManager(filePath: string): Promise<SnapshotManager> {
-        return (await this.getTSService(filePath)).snapshotManager;
-    }
-
     async getTSService(filePath?: string): Promise<LanguageServiceContainer> {
         if (this.options?.tsconfigPath) {
-            return getServiceForTsconfig(
-                this.options?.tsconfigPath,
-                dirname(this.options.tsconfigPath),
-                this.lsDocumentContext
+            return this.getTSServiceByConfigPath(
+                this.options.tsconfigPath,
+                dirname(this.options.tsconfigPath)
             );
         }
         if (!filePath) {
@@ -301,6 +303,13 @@ export class LSAndTSDocResolver {
         return getService(filePath, this.workspaceUris, this.lsDocumentContext);
     }
 
+    async getTSServiceByConfigPath(
+        tsconfigPath: string,
+        workspacePath: string
+    ): Promise<LanguageServiceContainer> {
+        return getServiceForTsconfig(tsconfigPath, workspacePath, this.lsDocumentContext);
+    }
+
     private getUserPreferences(tsDoc: DocumentSnapshot): ts.UserPreferences {
         const configLang =
             tsDoc.scriptKind === ts.ScriptKind.TS || tsDoc.scriptKind === ts.ScriptKind.TSX

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

@@ -262,6 +262,11 @@ export class SnapshotManager {
         return Array.from(this.projectFileToOriginalCasing.values());
     }
 
+    isProjectFile(fileName: string): boolean {
+        fileName = normalizePath(fileName);
+        return this.projectFileToOriginalCasing.has(this.getCanonicalFileName(fileName));
+    }
+
     private logStatistics() {
         const date = new Date();
         // Don't use setInterval because that will keep tests running forever

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

@@ -168,7 +168,10 @@ export class TypeScriptPlugin
             this.completionProvider,
             configManager
         );
-        this.updateImportsProvider = new UpdateImportsProviderImpl(this.lsAndTsDocResolver);
+        this.updateImportsProvider = new UpdateImportsProviderImpl(
+            this.lsAndTsDocResolver,
+            ts.sys.useCaseSensitiveFileNames
+        );
         this.diagnosticsProvider = new DiagnosticsProviderImpl(
             this.lsAndTsDocResolver,
             configManager
@@ -383,7 +386,7 @@ export class TypeScriptPlugin
     }
 
     async getDefinitions(document: Document, position: Position): Promise<DefinitionLink[]> {
-        const { lang, tsDoc } = await this.lsAndTsDocResolver.getLSAndTSDoc(document);
+        const { lang, tsDoc, lsContainer } = await this.lsAndTsDocResolver.getLSAndTSDoc(document);
 
         const defs = lang.getDefinitionAndBoundSpan(
             tsDoc.filePath,
@@ -394,7 +397,7 @@ export class TypeScriptPlugin
             return [];
         }
 
-        const snapshots = new SnapshotMap(this.lsAndTsDocResolver);
+        const snapshots = new SnapshotMap(this.lsAndTsDocResolver, lsContainer);
         snapshots.set(tsDoc.filePath, tsDoc);
 
         const result = await Promise.all(

packages/language-server/src/plugins/typescript/features/CallHierarchyProvider.ts

@@ -41,7 +41,7 @@ export class CallHierarchyProviderImpl implements CallHierarchyProvider {
         position: Position,
         cancellationToken?: CancellationToken
     ): Promise<CallHierarchyItem[] | null> {
-        const { lang, tsDoc } = await this.lsAndTsDocResolver.getLSAndTSDoc(document);
+        const { lang, tsDoc, lsContainer } = await this.lsAndTsDocResolver.getLSAndTSDoc(document);
 
         if (cancellationToken?.isCancellationRequested) {
             return null;
@@ -52,7 +52,7 @@ export class CallHierarchyProviderImpl implements CallHierarchyProvider {
 
         const itemsArray = Array.isArray(items) ? items : items ? [items] : [];
 
-        const snapshots = new SnapshotMap(this.lsAndTsDocResolver);
+        const snapshots = new SnapshotMap(this.lsAndTsDocResolver, lsContainer);
         snapshots.set(tsDoc.filePath, tsDoc);
 
         const program = lang.getProgram();
@@ -251,16 +251,17 @@ export class CallHierarchyProviderImpl implements CallHierarchyProvider {
             return null;
         }
 
-        const lang = await this.lsAndTsDocResolver.getLSForPath(filePath);
-        const tsDoc = await this.lsAndTsDocResolver.getSnapshot(filePath);
+        const lsContainer = await this.lsAndTsDocResolver.getTSService(filePath);
+        const lang = lsContainer.getService();
+        const tsDoc = await this.lsAndTsDocResolver.getOrCreateSnapshot(filePath);
 
         if (cancellationToken?.isCancellationRequested) {
             return null;
         }
 
         const program = lang.getProgram();
 
-        const snapshots = new SnapshotMap(this.lsAndTsDocResolver);
+        const snapshots = new SnapshotMap(this.lsAndTsDocResolver, lsContainer);
         snapshots.set(tsDoc.filePath, tsDoc);
 
         const isComponentModulePosition =

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

@@ -46,7 +46,6 @@ import {
 import { CompletionsProviderImpl } from './CompletionProvider';
 import {
     findClosestContainingNode,
-    findContainingNode,
     FormatCodeBasis,
     getFormatCodeBasis,
     getNewScriptStartTag,
@@ -56,6 +55,7 @@ import {
 } from './utils';
 import { DiagnosticCode } from './DiagnosticsProvider';
 import { createGetCanonicalFileName } from '../../../utils';
+import { LanguageServiceContainer } from '../service';
 
 /**
  * TODO change this to protocol constant if it's part of the protocol
@@ -156,7 +156,7 @@ export class CodeActionsProviderImpl implements CodeActionsProvider {
             return codeAction;
         }
 
-        const { lang, tsDoc, userPreferences } =
+        const { lang, tsDoc, userPreferences, lsContainer } =
             await this.lsAndTsDocResolver.getLSAndTSDoc(document);
         if (cancellationToken?.isCancellationRequested) {
             return codeAction;
@@ -180,10 +180,11 @@ export class CodeActionsProviderImpl implements CodeActionsProvider {
 
         const isImportFix = codeAction.data.fixName === FIX_IMPORT_FIX_NAME;
         const virtualDocInfo = isImportFix
-            ? await this.createVirtualDocumentForCombinedImportCodeFix(
+            ? this.createVirtualDocumentForCombinedImportCodeFix(
                   document,
                   getDiagnostics(),
                   tsDoc,
+                  lsContainer,
                   lang
               )
             : undefined;
@@ -218,7 +219,7 @@ export class CodeActionsProviderImpl implements CodeActionsProvider {
             await this.lsAndTsDocResolver.deleteSnapshot(virtualDocPath);
         }
 
-        const snapshots = new SnapshotMap(this.lsAndTsDocResolver);
+        const snapshots = new SnapshotMap(this.lsAndTsDocResolver, lsContainer);
         const fixActions: ts.CodeFixAction[] = [
             {
                 fixName: codeAction.data.fixName,
@@ -259,10 +260,11 @@ export class CodeActionsProviderImpl implements CodeActionsProvider {
      * Do not use this in regular code action
      * This'll cause TypeScript to rebuild and invalidate caches every time. It'll be slow
      */
-    private async createVirtualDocumentForCombinedImportCodeFix(
+    private createVirtualDocumentForCombinedImportCodeFix(
         document: Document,
         diagnostics: Diagnostic[],
         tsDoc: DocumentSnapshot,
+        lsContainer: LanguageServiceContainer,
         lang: ts.LanguageService
     ) {
         const virtualUri = document.uri + '.__virtual__.svelte';
@@ -314,10 +316,8 @@ export class CodeActionsProviderImpl implements CodeActionsProvider {
         const virtualDoc = new Document(virtualUri, newText);
         virtualDoc.openedByClient = true;
         // let typescript know about the virtual document
-        // getLSAndTSDoc instead of getSnapshot so that project dirty state is correctly tracked by us
-        // otherwise, sometime the applied code fix might not be picked up by the language service
-        // because we think the project is still dirty and doesn't update the project version
-        await this.lsAndTsDocResolver.getLSAndTSDoc(virtualDoc);
+        lsContainer.openVirtualDocument(virtualDoc);
+        lsContainer.getService();
 
         return {
             virtualDoc,
@@ -553,7 +553,7 @@ export class CodeActionsProviderImpl implements CodeActionsProvider {
         context: CodeActionContext,
         cancellationToken: CancellationToken | undefined
     ) {
-        const { lang, tsDoc, userPreferences } = await this.getLSAndTSDoc(document);
+        const { lang, tsDoc, userPreferences, lsContainer } = await this.getLSAndTSDoc(document);
 
         if (cancellationToken?.isCancellationRequested) {
             return [];
@@ -613,7 +613,7 @@ export class CodeActionsProviderImpl implements CodeActionsProvider {
             );
         }
 
-        const snapshots = new SnapshotMap(this.lsAndTsDocResolver);
+        const snapshots = new SnapshotMap(this.lsAndTsDocResolver, lsContainer);
         snapshots.set(tsDoc.filePath, tsDoc);
 
         const codeActionsPromises = codeFixes.map(async (fix) => {

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

@@ -49,6 +49,7 @@ import {
     isPartOfImportStatement
 } from './utils';
 import { isInTag as svelteIsInTag } from '../svelte-ast-utils';
+import { LanguageServiceContainer } from '../service';
 
 export interface CompletionResolveInfo
     extends Pick<ts.CompletionEntry, 'data' | 'name' | 'source'>,
@@ -170,7 +171,7 @@ export class CompletionsProviderImpl implements CompletionsProvider<CompletionRe
             return null;
         }
 
-        const { lang } = await this.lsAndTsDocResolver.getLSAndTSDoc(document);
+        const { lang, lsContainer } = await this.lsAndTsDocResolver.getLSAndTSDoc(document);
         if (cancellationToken?.isCancellationRequested) {
             return null;
         }
@@ -192,7 +193,7 @@ export class CompletionsProviderImpl implements CompletionsProvider<CompletionRe
         const tagCompletions =
             componentInfo || eventAndSlotLetCompletions.length > 0
                 ? []
-                : await this.getCustomElementCompletions(lang, document, tsDoc, position);
+                : this.getCustomElementCompletions(lang, lsContainer, document, tsDoc, position);
 
         const formatSettings = await this.configManager.getFormatCodeSettingsForFile(
             document,
@@ -474,12 +475,13 @@ export class CompletionsProviderImpl implements CompletionsProvider<CompletionRe
         ];
     }
 
-    private async getCustomElementCompletions(
+    private getCustomElementCompletions(
         lang: ts.LanguageService,
+        lsContainer: LanguageServiceContainer,
         document: Document,
         tsDoc: SvelteDocumentSnapshot,
         position: Position
-    ): Promise<CompletionItem[] | undefined> {
+    ): CompletionItem[] | undefined {
         const offset = document.offsetAt(position);
         const tag = getNodeIfIsInHTMLStartTag(document.html, offset);
 
@@ -499,9 +501,7 @@ export class CompletionsProviderImpl implements CompletionsProvider<CompletionRe
             return;
         }
 
-        const typingsNamespace = (
-            await this.lsAndTsDocResolver.getTSService(tsDoc.filePath)
-        )?.getTsConfigSvelteOptions().namespace;
+        const typingsNamespace = lsContainer.getTsConfigSvelteOptions().namespace;
 
         const typingsNamespaceSymbol = this.findTypingsNamespaceSymbol(
             typingsNamespace,

packages/language-server/src/plugins/typescript/features/FindComponentReferencesProvider.ts

@@ -20,8 +20,9 @@ export class FindComponentReferencesProviderImpl implements FindComponentReferen
             return null;
         }
 
-        const lang = await this.lsAndTsDocResolver.getLSForPath(fileName);
-        const tsDoc = await this.lsAndTsDocResolver.getSnapshot(fileName);
+        const lsContainer = await this.lsAndTsDocResolver.getTSService(fileName);
+        const lang = lsContainer.getService();
+        const tsDoc = await this.lsAndTsDocResolver.getOrCreateSnapshot(fileName);
         if (!(tsDoc instanceof SvelteDocumentSnapshot)) {
             return null;
         }
@@ -34,7 +35,7 @@ export class FindComponentReferencesProviderImpl implements FindComponentReferen
             return null;
         }
 
-        const snapshots = new SnapshotMap(this.lsAndTsDocResolver);
+        const snapshots = new SnapshotMap(this.lsAndTsDocResolver, lsContainer);
         snapshots.set(tsDoc.filePath, tsDoc);
 
         const locations = await Promise.all(