handle delete file and new export

Author: jasonlyu123

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

@@ -248,6 +248,8 @@ async function createLanguageService(
             ? svelteHtmlDeclaration
             : './svelte-jsx-v4.d.ts';
 
+    const changedFilesForExportCache = new Set<string>();
+
     const svelteTsxFiles = (
         isSvelte3
             ? ['./svelte-shims.d.ts', './svelte-jsx.d.ts', './svelte-native-jsx.d.ts']
@@ -341,7 +343,7 @@ async function createLanguageService(
         svelteModuleLoader.deleteFromModuleCache(filePath);
         svelteModuleLoader.deleteUnresolvedResolutionsFromCache(filePath);
 
-        scheduleUpdate();
+        scheduleUpdate(filePath);
     }
 
     function updateSnapshot(documentOrFilePath: Document | string): DocumentSnapshot {
@@ -359,7 +361,6 @@ async function createLanguageService(
 
         if (!prevSnapshot) {
             svelteModuleLoader.deleteUnresolvedResolutionsFromCache(filePath);
-            host.getCachedExportInfoMap?.()?.clear();
         }
 
         const newSnapshot = DocumentSnapshot.fromDocument(document, transformationConfig);
@@ -375,15 +376,7 @@ async function createLanguageService(
             return prevSnapshot;
         }
 
-        svelteModuleLoader.deleteUnresolvedResolutionsFromCache(filePath);
-        const newSnapshot = DocumentSnapshot.fromFilePath(
-            filePath,
-            docContext.createDocument,
-            transformationConfig,
-            tsSystem
-        );
-        snapshotManager.set(filePath, newSnapshot);
-        return newSnapshot;
+        return createSnapshot(filePath);
     }
 
     /**
@@ -404,8 +397,7 @@ async function createLanguageService(
         }
 
         return createSnapshot(
-            svelteModuleLoader.svelteFileExists(fileName) ? svelteFileName : fileName,
-            doc
+            svelteModuleLoader.svelteFileExists(fileName) ? svelteFileName : fileName
         );
     }
 
@@ -417,12 +409,12 @@ async function createLanguageService(
             return doc;
         }
 
-        return createSnapshot(fileName, doc);
+        return createSnapshot(fileName);
     }
 
-    function createSnapshot(fileName: string, doc: DocumentSnapshot | undefined) {
+    function createSnapshot(fileName: string) {
         svelteModuleLoader.deleteUnresolvedResolutionsFromCache(fileName);
-        doc = DocumentSnapshot.fromFilePath(
+        const doc = DocumentSnapshot.fromFilePath(
             fileName,
             docContext.createDocument,
             transformationConfig,
@@ -433,21 +425,10 @@ async function createLanguageService(
     }
 
     function updateProjectFiles(): void {
-        projectVersion++;
-        dirty = true;
-        const projectFileBefore = snapshotManager.getProjectFileNames();
-        const projectFileCountBefore = projectFileBefore.length;
+        scheduleUpdate();
+        const projectFileCountBefore = snapshotManager.getProjectFileNames().length;
         snapshotManager.updateProjectFiles();
-        const projectFileAfter = snapshotManager.getProjectFileNames();
-        const projectFileCountAfter = projectFileAfter.length;
-
-        const hasAddedOrRemoved =
-            (!!project && projectFileCountAfter !== projectFileCountBefore) ||
-            checkProjectFileUpdate(projectFileBefore, projectFileAfter);
-
-        if (hasAddedOrRemoved) {
-            host.getCachedExportInfoMap?.()?.clear();
-        }
+        const projectFileCountAfter = snapshotManager.getProjectFileNames().length;
 
         if (projectFileCountAfter <= projectFileCountBefore) {
             return;
@@ -456,25 +437,6 @@ async function createLanguageService(
         reduceLanguageServiceCapabilityIfFileSizeTooBig();
     }
 
-    function checkProjectFileUpdate(oldFiles: string[], newFiles: string[]) {
-        const oldSet = new Set(oldFiles);
-        const newSet = new Set(newFiles);
-
-        for (const file of oldSet) {
-            if (!newSet.has(file)) {
-                return true;
-            }
-        }
-
-        for (const file of newSet) {
-            if (!oldSet.has(file)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
     function getScriptFileNames() {
         const projectFiles = languageServiceReducedMode
             ? []
@@ -747,6 +709,7 @@ async function createLanguageService(
             return;
         }
 
+        const oldProgram = project?.program;
         const program = languageService.getProgram();
         svelteModuleLoader.clearPendingInvalidations();
 
@@ -755,9 +718,30 @@ async function createLanguageService(
         }
 
         dirty = false;
+
+        for (const fileName of changedFilesForExportCache) {
+            const oldFile = oldProgram?.getSourceFile(fileName);
+            const newFile = program?.getSourceFile(fileName);
+
+            // file for another tsconfig
+            if (!oldFile && !newFile) {
+                continue;
+            }
+
+            if (oldFile && newFile) {
+                host.getCachedExportInfoMap?.().onFileChanged?.(oldFile, newFile, false);
+            } else {
+                // new file or deleted file
+                host.getCachedExportInfoMap?.().clear();
+            }
+        }
+        changedFilesForExportCache.clear();
     }
 
-    function scheduleUpdate() {
+    function scheduleUpdate(triggeredFile?: string) {
+        if (triggeredFile) {
+            changedFilesForExportCache.add(triggeredFile);
+        }
         if (dirty) {
             return;
         }

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

@@ -1460,6 +1460,43 @@ describe('CompletionProviderImpl', function () {
         assert.strictEqual(detail, 'Add import from "./Bar.svelte"\n\nclass Bar');
     });
 
+    it('can auto import new export', async () => {
+        const virtualTestDir = getRandomVirtualDirPath(testFilesDir);
+        const { document, lsAndTsDocResolver, lsConfigManager, virtualSystem } =
+            setupVirtualEnvironment({
+                filename: 'index.svelte',
+                fileContent: '<script>import {} from "./foo";f</script>',
+                testDir: virtualTestDir
+            });
+
+        const completionProvider = new CompletionsProviderImpl(lsAndTsDocResolver, lsConfigManager);
+        const tsFile = join(virtualTestDir, 'foo.ts');
+
+        virtualSystem.writeFile(tsFile, 'export {}');
+
+        const completions = await completionProvider.getCompletions(document, {
+            line: 0,
+            character: 31
+        });
+
+        const item = completions?.items.find((item) => item.label === 'foo');
+
+        assert.equal(item, undefined);
+
+        virtualSystem.writeFile(tsFile, 'export function foo() {}');
+        lsAndTsDocResolver.updateExistingTsOrJsFile(tsFile);
+
+        const completions2 = await completionProvider.getCompletions(document, {
+            line: 0,
+            character: 31
+        });
+
+        const item2 = completions2?.items.find((item) => item.label === 'foo');
+        const { detail } = await completionProvider.resolveCompletion(document, item2!);
+
+        assert.strictEqual(detail, 'Update import from "./foo"\n\nfunction foo(): void');
+    });
+
     it('provides completions for object literal member', async () => {
         const { completionProvider, document } = setup('object-member.svelte');