fix: adjust ambient module snipping logic

Since sveltejs/svelte#12061 the `declare module "*.svelte" {..}` declaration contains more closing braces and the logic to snip it out is now outdated. This updates the logic to instead look for the first bracket that comes directly after one line.
sveltejs · Jun 17, 2024 · 0261112 · 0261112
1 parent 730090f
commit 0261112
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/packages/language-server/src/plugins/typescript/DocumentSnapshot.ts b/packages/language-server/src/plugins/typescript/DocumentSnapshot.ts
@@ -136,7 +136,7 @@ export namespace DocumentSnapshot {
 
         if (normalizedPath.endsWith('node_modules/svelte/types/index.d.ts')) {
             const startIdx = originalText.indexOf(`declare module '*.svelte' {`);
-            const endIdx = originalText.indexOf(`}`, originalText.indexOf(';', startIdx)) + 1;
+            const endIdx = originalText.indexOf(`\n}`, startIdx + 1) + 2;
             originalText =
                 originalText.substring(0, startIdx) +
                 ' '.repeat(endIdx - startIdx) +

diff --git a/packages/typescript-plugin/src/index.ts b/packages/typescript-plugin/src/index.ts
@@ -67,8 +67,7 @@ function init(modules: { typescript: typeof ts }): ts.server.PluginModule {
                 if (snapshot) {
                     const originalText = snapshot.getText(0, snapshot.getLength());
                     const startIdx = originalText.indexOf(`declare module '*.svelte' {`);
-                    const endIdx =
-                        originalText.indexOf(`}`, originalText.indexOf(';', startIdx)) + 1;
+                    const endIdx = originalText.indexOf(`\n}`, startIdx + 1) + 2;
                     return modules.typescript.ScriptSnapshot.fromString(
                         originalText.substring(0, startIdx) +
                             ' '.repeat(endIdx - startIdx) +