From cd76dbe7f73e0321cf951031b4da21f4625a1e97 Mon Sep 17 00:00:00 2001
From: "Lyu, Wei Da" <b00605009@ntu.edu.tw>
Date: Fri, 16 Aug 2024 16:05:52 +0800
Subject: [PATCH] skip type-check for shim files

---
 .../src/plugins/typescript/service.ts         | 48 +++++++++++++------
 packages/language-server/src/svelte-check.ts  |  1 +
 packages/svelte-check/test/tsconfig.json      |  2 +-
 3 files changed, 35 insertions(+), 16 deletions(-)

diff --git a/packages/language-server/src/plugins/typescript/service.ts b/packages/language-server/src/plugins/typescript/service.ts
index 5a378d246..613cf04ab 100644
--- a/packages/language-server/src/plugins/typescript/service.ts
+++ b/packages/language-server/src/plugins/typescript/service.ts
@@ -56,6 +56,7 @@ export interface LanguageServiceContainer {
     getTsConfigSvelteOptions(): { namespace: string };
     getResolvedProjectReferences(): TsConfigInfo[];
     openVirtualDocument(document: Document): void;
+    isShimFiles(filePath: string): boolean;
     dispose(): void;
 }
 
@@ -353,22 +354,8 @@ async function createLanguageService(
             ? importSvelte(tsconfigPath || workspacePath)
             : undefined;
 
-    const isSvelte3 = sveltePackageInfo.version.major === 3;
-    const svelteHtmlDeclaration = isSvelte3
-        ? undefined
-        : join(sveltePackageInfo.path, 'svelte-html.d.ts');
-    const svelteHtmlFallbackIfNotExist =
-        svelteHtmlDeclaration && tsSystem.fileExists(svelteHtmlDeclaration)
-            ? 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']
-            : ['./svelte-shims-v4.d.ts', svelteHtmlFallbackIfNotExist, './svelte-native-jsx.d.ts']
-    ).map((f) => tsSystem.resolvePath(resolve(svelteTsPath, f)));
+    const svelteTsxFiles = getSvelteShimFiles();
 
     let languageServiceReducedMode = false;
     let projectVersion = 0;
@@ -446,6 +433,7 @@ async function createLanguageService(
         getTsConfigSvelteOptions,
         getResolvedProjectReferences,
         openVirtualDocument,
+        isShimFiles,
         dispose
     };
 
@@ -1153,6 +1141,36 @@ async function createLanguageService(
         updateSnapshot(document);
         scheduleUpdate(filePath);
     }
+
+    function getSvelteShimFiles() {
+        const isSvelte3 = sveltePackageInfo.version.major === 3;
+        const svelteHtmlDeclaration = isSvelte3
+            ? undefined
+            : join(sveltePackageInfo.path, 'svelte-html.d.ts');
+        const svelteHtmlFallbackIfNotExist =
+            svelteHtmlDeclaration && tsSystem.fileExists(svelteHtmlDeclaration)
+                ? svelteHtmlDeclaration
+                : './svelte-jsx-v4.d.ts';
+
+        const svelteTsxFiles = (
+            isSvelte3
+                ? ['./svelte-shims.d.ts', './svelte-jsx.d.ts', './svelte-native-jsx.d.ts']
+                : [
+                      './svelte-shims-v4.d.ts',
+                      svelteHtmlFallbackIfNotExist,
+                      './svelte-native-jsx.d.ts'
+                  ]
+        ).map((f) => tsSystem.resolvePath(resolve(svelteTsPath, f)));
+
+        const result = new FileSet(tsSystem.useCaseSensitiveFileNames);
+
+        svelteTsxFiles.forEach((f) => result.add(normalizePath(f)));
+        return result;
+    }
+
+    function isShimFiles(filePath: string) {
+        return svelteTsxFiles.has(normalizePath(filePath));
+    }
 }
 
 /**
diff --git a/packages/language-server/src/svelte-check.ts b/packages/language-server/src/svelte-check.ts
index b6100e60c..57ab91586 100644
--- a/packages/language-server/src/svelte-check.ts
+++ b/packages/language-server/src/svelte-check.ts
@@ -211,6 +211,7 @@ export class SvelteCheck {
                     const skipDiagnosticsForFile =
                         (options.skipLibCheck && file.isDeclarationFile) ||
                         (options.skipDefaultLibCheck && file.hasNoDefaultLib) ||
+                        lsContainer.isShimFiles(file.fileName) ||
                         // ignore JS files in node_modules
                         /\/node_modules\/.+\.(c|m)?js$/.test(file.fileName);
                     const snapshot = lsContainer.snapshotManager.get(file.fileName) as
diff --git a/packages/svelte-check/test/tsconfig.json b/packages/svelte-check/test/tsconfig.json
index 15458e89c..d1df1fdec 100644
--- a/packages/svelte-check/test/tsconfig.json
+++ b/packages/svelte-check/test/tsconfig.json
@@ -1,6 +1,6 @@
 {
-    "extends": "@tsconfig/node12/tsconfig.json",
     "compilerOptions": {
+        "target": "ES2019",
         "moduleResolution": "node",
         "strict": true,
         "allowJs": true,