@astrojs/language-server 0.28.3 → 0.29.0

package/dist/plugins/typescript/features/CompletionsProvider.js

@@ -56,13 +56,14 @@ class CompletionsProviderImpl {
             this.lastCompletion = undefined;
         }
         const html = document.html;
-        const offset = document.offsetAt(position);
-        const node = html.findNodeAt(offset);
+        const documentOffset = document.offsetAt(position);
+        const node = html.findNodeAt(documentOffset);
         const { lang, tsDoc } = await this.languageServiceManager.getLSAndTSDoc(document);
+        const offset = tsDoc.offsetAt(tsDoc.getGeneratedPosition(position));
         let filePath = tsDoc.filePath;
         let completions;
-        const isCompletionInsideFrontmatter = (0, utils_1.isInsideFrontmatter)(document.getText(), offset);
-        const isCompletionInsideExpression = (0, utils_1.isInsideExpression)(document.getText(), node.start, offset);
+        const isCompletionInsideFrontmatter = (0, utils_1.isInsideFrontmatter)(document.getText(), documentOffset);
+        const isCompletionInsideExpression = (0, utils_1.isInsideExpression)(document.getText(), node.start, documentOffset);
         const tsPreferences = await this.configManager.getTSPreferences(document);
         const formatOptions = await this.configManager.getTSFormatConfig(document);
         let scriptTagIndex = undefined;
@@ -105,11 +106,10 @@ class CompletionsProviderImpl {
             ? vscode_languageserver_1.Range.create(document.positionAt(completions.optionalReplacementSpan.start), document.positionAt(completions.optionalReplacementSpan.start + completions.optionalReplacementSpan.length))
             : undefined;
         const wordRangeStartPosition = wordRange?.start;
-        const fragment = await tsDoc.createFragment();
         const existingImports = this.getExistingImports(document);
         const completionItems = completions.entries
             .filter((completion) => this.isValidCompletion(completion, this.ts))
-            .map((entry) => this.toCompletionItem(fragment, entry, filePath, offset, isCompletionInsideFrontmatter, scriptTagIndex, existingImports))
+            .map((entry) => this.toCompletionItem(tsDoc, entry, filePath, offset, isCompletionInsideFrontmatter, scriptTagIndex, existingImports))
             .filter(utils_2.isNotNullOrUndefined)
             .map((comp) => this.fixTextEditRange(wordRangeStartPosition, comp));
         const completionList = vscode_languageserver_1.CompletionList.create(completionItems, true);
@@ -123,7 +123,6 @@ class CompletionsProviderImpl {
         if (!data || !data.filePath || cancellationToken?.isCancellationRequested) {
             return item;
         }
-        const fragment = await tsDoc.createFragment();
         const detail = lang.getCompletionEntryDetails(data.filePath, // fileName
         data.offset, // position
         data.originalItem.name, // entryName
@@ -154,17 +153,18 @@ class CompletionsProviderImpl {
                 for (const change of action.changes) {
                     if (isInsideScriptTag) {
                         change.textChanges.forEach((textChange) => {
-                            textChange.span.start = fragment.offsetAt(scriptTagSnapshot.getOriginalPosition(scriptTagSnapshot.positionAt(textChange.span.start)));
+                            const originalPosition = scriptTagSnapshot.getOriginalPosition(scriptTagSnapshot.positionAt(textChange.span.start));
+                            textChange.span.start = tsDoc.offsetAt(tsDoc.getGeneratedPosition(originalPosition));
                         });
                     }
-                    edit.push(...change.textChanges.map((textChange) => codeActionChangeToTextEdit(document, fragment, isInsideScriptTag, textChange, this.ts)));
+                    edit.push(...change.textChanges.map((textChange) => codeActionChangeToTextEdit(document, tsDoc, isInsideScriptTag, textChange, this.ts)));
                 }
             }
             item.additionalTextEdits = (item.additionalTextEdits ?? []).concat(edit);
         }
         return item;
     }
-    toCompletionItem(fragment, comp, filePath, offset, insideFrontmatter, scriptTagIndex, existingImports) {
+    toCompletionItem(snapshot, comp, filePath, offset, insideFrontmatter, scriptTagIndex, existingImports) {
         let item = vscode_languageserver_protocol_1.CompletionItem.create(comp.name);
         const isAstroComponent = this.isAstroComponentImport(comp.name);
         const isImport = comp.insertText?.includes('import');
@@ -212,13 +212,13 @@ class CompletionsProviderImpl {
             item.insertText = comp.insertText ? (0, utils_3.removeAstroComponentSuffix)(comp.insertText) : undefined;
             item.insertTextFormat = comp.isSnippet ? vscode_languageserver_1.InsertTextFormat.Snippet : vscode_languageserver_1.InsertTextFormat.PlainText;
             item.textEdit = comp.replacementSpan
-                ? vscode_languageserver_1.TextEdit.replace((0, utils_3.convertRange)(fragment, comp.replacementSpan), item.insertText ?? item.label)
+                ? vscode_languageserver_1.TextEdit.replace((0, utils_3.convertRange)(snapshot, comp.replacementSpan), item.insertText ?? item.label)
                 : undefined;
         }
         return {
             ...item,
             data: {
-                uri: fragment.getURL(),
+                uri: snapshot.getURL(),
                 filePath,
                 scriptTagIndex,
                 offset,
@@ -303,12 +303,12 @@ class CompletionsProviderImpl {
     }
 }
 exports.CompletionsProviderImpl = CompletionsProviderImpl;
-function codeActionChangeToTextEdit(document, fragment, isInsideScriptTag, change, ts) {
+function codeActionChangeToTextEdit(document, snapshot, isInsideScriptTag, change, ts) {
     change.newText = (0, utils_3.removeAstroComponentSuffix)(change.newText);
     const { span } = change;
     let range;
-    const virtualRange = (0, utils_3.convertRange)(fragment, span);
-    range = (0, documents_1.mapRangeToOriginal)(fragment, virtualRange);
+    const virtualRange = (0, utils_3.convertRange)(snapshot, span);
+    range = (0, documents_1.mapRangeToOriginal)(snapshot, virtualRange);
     if (!isInsideScriptTag) {
         // If we don't have a frontmatter already, create one with the import
         const frontmatterState = document.astroMeta.frontmatter.state;

package/dist/plugins/typescript/features/DefinitionsProvider.d.ts

@@ -1,5 +1,5 @@
 import { LocationLink, Position } from 'vscode-languageserver-types';
-import type { AstroDocument } from '../../../core/documents';
+import { AstroDocument } from '../../../core/documents';
 import type { DefinitionsProvider } from '../../interfaces';
 import type { LanguageServiceManager } from '../LanguageServiceManager';
 export declare class DefinitionsProviderImpl implements DefinitionsProvider {

package/dist/plugins/typescript/features/DefinitionsProvider.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DefinitionsProviderImpl = void 0;
 const vscode_languageserver_types_1 = require("vscode-languageserver-types");
+const documents_1 = require("../../../core/documents");
 const utils_1 = require("../../../utils");
 const utils_2 = require("../utils");
 const utils_3 = require("./utils");
@@ -11,9 +12,8 @@ class DefinitionsProviderImpl {
     }
     async getDefinitions(document, position) {
         const { lang, tsDoc } = await this.languageServiceManager.getLSAndTSDoc(document);
-        const mainFragment = await tsDoc.createFragment();
-        const fragmentPosition = mainFragment.getGeneratedPosition(position);
-        const fragmentOffset = mainFragment.offsetAt(fragmentPosition);
+        const fragmentPosition = tsDoc.getGeneratedPosition(position);
+        const fragmentOffset = tsDoc.offsetAt(fragmentPosition);
         let defs;
         const html = document.html;
         const offset = document.offsetAt(position);
@@ -26,11 +26,11 @@ class DefinitionsProviderImpl {
                     const isInSameFile = def.fileName === scriptFilePath;
                     def.fileName = isInSameFile ? tsDoc.filePath : def.fileName;
                     if (isInSameFile) {
-                        def.textSpan.start = mainFragment.offsetAt(scriptTagSnapshot.getOriginalPosition(scriptTagSnapshot.positionAt(def.textSpan.start)));
+                        def.textSpan.start = (0, documents_1.mapScriptSpanStartToSnapshot)(def.textSpan, scriptTagSnapshot, tsDoc);
                     }
                     return def;
                 });
-                defs.textSpan.start = mainFragment.offsetAt(scriptTagSnapshot.getOriginalPosition(scriptTagSnapshot.positionAt(defs.textSpan.start)));
+                defs.textSpan.start = (0, documents_1.mapScriptSpanStartToSnapshot)(defs.textSpan, scriptTagSnapshot, tsDoc);
             }
         }
         else {
@@ -39,16 +39,18 @@ class DefinitionsProviderImpl {
         if (!defs || !defs.definitions) {
             return [];
         }
-        const docs = new utils_3.SnapshotFragmentMap(this.languageServiceManager);
-        docs.set(tsDoc.filePath, { fragment: mainFragment, snapshot: tsDoc });
+        const snapshots = new utils_3.SnapshotMap(this.languageServiceManager);
+        snapshots.set(tsDoc.filePath, tsDoc);
         const result = await Promise.all(defs.definitions.map(async (def) => {
-            const { fragment, snapshot } = await docs.retrieve(def.fileName);
+            const snapshot = await snapshots.retrieve(def.fileName);
             const fileName = (0, utils_2.ensureRealFilePath)(def.fileName);
             // For Astro, Svelte and Vue, the position is wrongly mapped to the end of the file due to the TSX output
             // So we'll instead redirect to the beginning of the file
-            const isFramework = (0, utils_2.isFrameworkFilePath)(def.fileName) || (0, utils_2.isAstroFilePath)(def.fileName);
-            const textSpan = isFramework && tsDoc.filePath !== def.fileName ? { start: 0, length: 0 } : def.textSpan;
-            return vscode_languageserver_types_1.LocationLink.create((0, utils_1.pathToUrl)(fileName), (0, utils_2.convertToLocationRange)(fragment, textSpan), (0, utils_2.convertToLocationRange)(fragment, textSpan), (0, utils_2.convertToLocationRange)(mainFragment, defs.textSpan));
+            const isFramework = ((0, utils_2.isFrameworkFilePath)(def.fileName) || (0, utils_2.isAstroFilePath)(def.fileName)) && tsDoc.filePath !== def.fileName;
+            const targetRange = isFramework
+                ? (0, utils_2.convertRange)(document, { start: 0, length: 0 })
+                : (0, utils_2.convertToLocationRange)(snapshot, def.textSpan);
+            return vscode_languageserver_types_1.LocationLink.create((0, utils_1.pathToUrl)(fileName), targetRange, targetRange, (0, utils_2.convertToLocationRange)(tsDoc, defs.textSpan));
         }));
         return result.filter(utils_1.isNotNullOrUndefined);
     }

package/dist/plugins/typescript/features/DiagnosticsProvider.d.ts

@@ -7,7 +7,6 @@ export declare enum DiagnosticCodes {
     SPREAD_EXPECTED = 1005,
     IS_NOT_A_MODULE = 2306,
     DUPLICATED_JSX_ATTRIBUTES = 17001,
-    MUST_HAVE_PARENT_ELEMENT = 2657,
     CANT_RETURN_OUTSIDE_FUNC = 1108,
     ISOLATED_MODULE_COMPILE_ERR = 1208,
     TYPE_NOT_ASSIGNABLE = 2322,

package/dist/plugins/typescript/features/DiagnosticsProvider.js

@@ -12,7 +12,6 @@ var DiagnosticCodes;
     DiagnosticCodes[DiagnosticCodes["SPREAD_EXPECTED"] = 1005] = "SPREAD_EXPECTED";
     DiagnosticCodes[DiagnosticCodes["IS_NOT_A_MODULE"] = 2306] = "IS_NOT_A_MODULE";
     DiagnosticCodes[DiagnosticCodes["DUPLICATED_JSX_ATTRIBUTES"] = 17001] = "DUPLICATED_JSX_ATTRIBUTES";
-    DiagnosticCodes[DiagnosticCodes["MUST_HAVE_PARENT_ELEMENT"] = 2657] = "MUST_HAVE_PARENT_ELEMENT";
     DiagnosticCodes[DiagnosticCodes["CANT_RETURN_OUTSIDE_FUNC"] = 1108] = "CANT_RETURN_OUTSIDE_FUNC";
     DiagnosticCodes[DiagnosticCodes["ISOLATED_MODULE_COMPILE_ERR"] = 1208] = "ISOLATED_MODULE_COMPILE_ERR";
     DiagnosticCodes[DiagnosticCodes["TYPE_NOT_ASSIGNABLE"] = 2322] = "TYPE_NOT_ASSIGNABLE";
@@ -31,7 +30,11 @@ class DiagnosticsProviderImpl {
             return [];
         }
         const { lang, tsDoc } = await this.languageServiceManager.getLSAndTSDoc(document);
-        const fragment = await tsDoc.createFragment();
+        // If we have compiler errors, our TSX isn't valid so don't bother showing TS errors
+        if (tsDoc.compilerDiagnostics.filter((diag) => diag.severity === vscode_languageserver_1.DiagnosticSeverity.Error).length >
+            0) {
+            return [];
+        }
         let scriptDiagnostics = [];
         document.scriptTags.forEach((scriptTag) => {
             const { filePath: scriptFilePath, snapshot: scriptTagSnapshot } = (0, utils_1.getScriptTagSnapshot)(tsDoc, document, scriptTag.container);
@@ -71,7 +74,7 @@ class DiagnosticsProviderImpl {
                 code: diagnostic.code,
                 tags: getDiagnosticTag(diagnostic),
             }))
-                .map(mapRange(fragment, document)),
+                .map(mapRange(tsDoc, document)),
             ...scriptDiagnostics,
         ]
             .filter((diag) => {
@@ -79,8 +82,6 @@ class DiagnosticsProviderImpl {
             // Make sure the diagnostic is inside the document and not in generated code
             diag.range.start.line <= document.lineCount &&
                 hasNoNegativeLines(diag) &&
-                isNoJSXMustHaveOneParent(diag) &&
-                isNoSpreadExpected(diag, document) &&
                 isNoCantReturnOutsideFunction(diag) &&
                 isNoIsolatedModuleError(diag) &&
                 isNoJsxCannotHaveMultipleAttrsError(diag));
@@ -151,9 +152,9 @@ function diagnosticIsWithinBoundaries(sourceFile, boundaries, diagnostic, ts) {
 function isNoWithinBoundary(boundaries, diagnostic, ts) {
     return !diagnosticIsWithinBoundaries(undefined, boundaries, diagnostic, ts);
 }
-function mapRange(fragment, _document) {
+function mapRange(snapshot, _document) {
     return (diagnostic) => {
-        let range = (0, documents_1.mapRangeToOriginal)(fragment, diagnostic.range);
+        let range = (0, documents_1.mapRangeToOriginal)(snapshot, diagnostic.range);
         return { ...diagnostic, range };
     };
 }
@@ -171,23 +172,6 @@ function hasNoNegativeLines(diagnostic) {
 function isNoJsxCannotHaveMultipleAttrsError(diagnostic) {
     return diagnostic.code !== DiagnosticCodes.DUPLICATED_JSX_ATTRIBUTES;
 }
-/** Astro allows component with multiple root elements */
-function isNoJSXMustHaveOneParent(diagnostic) {
-    return diagnostic.code !== DiagnosticCodes.MUST_HAVE_PARENT_ELEMENT;
-}
-/**
- * When using the shorthand syntax for props TSX expects you to use the spread operator
- * Since the shorthand syntax works differently in Astro and this is not required, hide this message
- * However, the error code used here is quite generic, as such we need to make we only ignore in valid cases
- */
-function isNoSpreadExpected(diagnostic, document) {
-    if (diagnostic.code === DiagnosticCodes.SPREAD_EXPECTED &&
-        diagnostic.message.includes('...') &&
-        document.offsetAt(diagnostic.range.start) > (document.astroMeta.frontmatter.endOffset ?? 0)) {
-        return false;
-    }
-    return true;
-}
 /**
  * Ignore "Can't return outside of function body"
  * Since the frontmatter is at the top level, users trying to return a Response for SSR mode run into this

package/dist/plugins/typescript/features/DocumentSymbolsProvider.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DocumentSymbolsProviderImpl = void 0;
 const vscode_languageserver_types_1 = require("vscode-languageserver-types");
-const documents_1 = require("../../../core/documents");
 const utils_1 = require("../utils");
 class DocumentSymbolsProviderImpl {
     constructor(languageServiceManager) {
@@ -11,13 +10,12 @@ class DocumentSymbolsProviderImpl {
     }
     async getDocumentSymbols(document) {
         const { lang, tsDoc } = await this.languageServiceManager.getLSAndTSDoc(document);
-        const fragment = await tsDoc.createFragment();
         const navTree = lang.getNavigationTree(tsDoc.filePath + '?documentSymbols');
         if (!navTree) {
             return [];
         }
         const symbols = [];
-        this.collectSymbols(navTree, fragment, undefined, (symbol) => symbols.push(symbol));
+        this.collectSymbols(navTree, document, undefined, (symbol) => symbols.push(symbol));
         const originalContainerName = symbols[0].name;
         const result = [];
         // Add a "Frontmatter" namespace for the frontmatter if we have a closed one
@@ -27,7 +25,6 @@ class DocumentSymbolsProviderImpl {
         // Add a "Template" namespace for everything under the frontmatter
         result.push(vscode_languageserver_types_1.SymbolInformation.create('Template', vscode_languageserver_types_1.SymbolKind.Namespace, vscode_languageserver_types_1.Range.create(document.positionAt(document.astroMeta.frontmatter.endOffset ?? 0), document.positionAt(document.getTextLength())), document.getURL()));
         for (let symbol of symbols.splice(1)) {
-            symbol = (0, documents_1.mapSymbolInformationToOriginal)(fragment, symbol);
             if (document.offsetAt(symbol.location.range.end) >= (document.astroMeta.content.firstNonWhitespaceOffset ?? 0)) {
                 if (symbol.containerName === originalContainerName) {
                     symbol.containerName = 'Template';
@@ -48,9 +45,9 @@ class DocumentSymbolsProviderImpl {
         }
         return result;
     }
-    collectSymbols(item, fragment, container, cb) {
+    collectSymbols(item, document, container, cb) {
         for (const span of item.spans) {
-            const symbol = vscode_languageserver_types_1.SymbolInformation.create(item.text, (0, utils_1.symbolKindFromString)(item.kind), vscode_languageserver_types_1.Range.create(fragment.positionAt(span.start), fragment.positionAt(span.start + span.length)), fragment.getURL(), container);
+            const symbol = vscode_languageserver_types_1.SymbolInformation.create(item.text, (0, utils_1.symbolKindFromString)(item.kind), vscode_languageserver_types_1.Range.create(document.positionAt(span.start), document.positionAt(span.start + span.length)), document.getURL(), container);
             // TypeScript gives us kind modifiers as a string instead of an array
             const kindModifiers = new Set(item.kindModifiers.split(/,|\s+/g));
             if (kindModifiers.has(this.ts.ScriptElementKindModifier.deprecatedModifier)) {
@@ -62,7 +59,7 @@ class DocumentSymbolsProviderImpl {
         }
         if (item.childItems) {
             for (const child of item.childItems) {
-                this.collectSymbols(child, fragment, item.text, cb);
+                this.collectSymbols(child, document, item.text, cb);
             }
         }
     }

package/dist/plugins/typescript/features/FileReferencesProvider.js

@@ -11,16 +11,15 @@ class FileReferencesProviderImpl {
     }
     async fileReferences(document) {
         const { lang, tsDoc } = await this.languageServiceManager.getLSAndTSDoc(document);
-        const mainFragment = await tsDoc.createFragment();
         const references = lang.getFileReferences(tsDoc.filePath);
         if (!references) {
             return null;
         }
-        const docs = new utils_3.SnapshotFragmentMap(this.languageServiceManager);
-        docs.set(tsDoc.filePath, { fragment: mainFragment, snapshot: tsDoc });
+        const snapshots = new utils_3.SnapshotMap(this.languageServiceManager);
+        snapshots.set(tsDoc.filePath, tsDoc);
         const locations = await Promise.all(references.map(async (ref) => {
-            const defDoc = await docs.retrieveFragment(ref.fileName);
-            return vscode_languageserver_1.Location.create((0, utils_1.pathToUrl)(ref.fileName), (0, utils_2.convertToLocationRange)(defDoc, ref.textSpan));
+            const snapshot = await snapshots.retrieve(ref.fileName);
+            return vscode_languageserver_1.Location.create((0, utils_1.pathToUrl)(ref.fileName), (0, utils_2.convertToLocationRange)(snapshot, ref.textSpan));
         }));
         return locations;
     }

package/dist/plugins/typescript/features/FoldingRangesProvider.js

@@ -27,13 +27,17 @@ class FoldingRangesProviderImpl {
         });
         const foldingRanges = [];
         for (const span of [...outliningSpans, ...scriptOutliningSpans]) {
-            const start = document.positionAt(span.textSpan.start);
-            const end = adjustFoldingEnd(start, document.positionAt(span.textSpan.start + span.textSpan.length), document);
+            const start = tsDoc.getOriginalPosition(tsDoc.positionAt(span.textSpan.start));
+            const end = adjustFoldingEnd(start, document.positionAt(document.offsetAt(start) + span.textSpan.length), document);
             // When using this method for generating folding ranges, TypeScript tend to return some
             // one line / one character ones that we should be able to safely ignore
             if (start.line === end.line && start.character === end.character) {
                 continue;
             }
+            // Ignore folding ranges that are from unmapped regions
+            if (start.line < 0 || end.line < 0) {
+                continue;
+            }
             foldingRanges.push(vscode_languageserver_1.FoldingRange.create(start.line, end.line, start.character, end.character, this.transformFoldingRangeKind(span.kind)));
         }
         return foldingRanges;

package/dist/plugins/typescript/features/HoverProvider.js

@@ -12,8 +12,7 @@ class HoverProviderImpl {
     }
     async doHover(document, position) {
         const { lang, tsDoc } = await this.languageServiceManager.getLSAndTSDoc(document);
-        const fragment = await tsDoc.createFragment();
-        const offset = fragment.offsetAt(fragment.getGeneratedPosition(position));
+        const offset = tsDoc.offsetAt(tsDoc.getGeneratedPosition(position));
         const html = document.html;
         const documentOffset = document.offsetAt(position);
         const node = html.findNodeAt(documentOffset);
@@ -22,7 +21,7 @@ class HoverProviderImpl {
             const { snapshot: scriptTagSnapshot, filePath: scriptFilePath, offset: scriptOffset, } = (0, utils_1.getScriptTagSnapshot)(tsDoc, document, node, position);
             info = lang.getQuickInfoAtPosition(scriptFilePath, scriptOffset);
             if (info) {
-                info.textSpan.start = fragment.offsetAt(scriptTagSnapshot.getOriginalPosition(scriptTagSnapshot.positionAt(info.textSpan.start)));
+                info.textSpan.start = (0, documents_1.mapScriptSpanStartToSnapshot)(info.textSpan, scriptTagSnapshot, tsDoc);
             }
         }
         else {
@@ -42,8 +41,8 @@ class HoverProviderImpl {
         const contents = ['```typescript', declaration, '```']
             .concat(documentation ? ['---', documentation] : [])
             .join('\n');
-        return (0, documents_1.mapObjWithRangeToOriginal)(fragment, {
-            range: (0, utils_1.convertRange)(fragment, textSpan),
+        return (0, documents_1.mapObjWithRangeToOriginal)(tsDoc, {
+            range: (0, utils_1.convertRange)(tsDoc, textSpan),
             contents,
         });
     }

package/dist/plugins/typescript/features/ImplementationsProvider.js

@@ -12,8 +12,10 @@ class ImplementationsProviderImpl {
     }
     async getImplementation(document, position) {
         const { lang, tsDoc } = await this.languageServiceManager.getLSAndTSDoc(document);
-        const mainFragment = await tsDoc.createFragment();
-        const offset = mainFragment.offsetAt(mainFragment.getGeneratedPosition(position));
+        const fragmentPosition = tsDoc.getGeneratedPosition(position);
+        const fragmentOffset = tsDoc.offsetAt(fragmentPosition);
+        const html = document.html;
+        const offset = document.offsetAt(position);
         const node = document.html.findNodeAt(offset);
         let implementations;
         if (node.tag === 'script') {
@@ -24,23 +26,23 @@ class ImplementationsProviderImpl {
                     const isInSameFile = impl.fileName === scriptFilePath;
                     impl.fileName = isInSameFile ? tsDoc.filePath : impl.fileName;
                     if (isInSameFile) {
-                        impl.textSpan.start = mainFragment.offsetAt(scriptTagSnapshot.getOriginalPosition(scriptTagSnapshot.positionAt(impl.textSpan.start)));
+                        impl.textSpan.start = (0, documents_1.mapScriptSpanStartToSnapshot)(impl.textSpan, scriptTagSnapshot, tsDoc);
                     }
                     return impl;
                 });
             }
         }
         else {
-            implementations = lang.getImplementationAtPosition(tsDoc.filePath, offset);
+            implementations = lang.getImplementationAtPosition(tsDoc.filePath, fragmentOffset);
         }
-        const docs = new utils_3.SnapshotFragmentMap(this.languageServiceManager);
-        docs.set(tsDoc.filePath, { fragment: mainFragment, snapshot: tsDoc });
+        const snapshots = new utils_3.SnapshotMap(this.languageServiceManager);
+        snapshots.set(tsDoc.filePath, tsDoc);
         if (!implementations) {
             return null;
         }
         const result = await Promise.all(implementations.map(async (implementation) => {
-            const { fragment } = await docs.retrieve(implementation.fileName);
-            const range = (0, documents_1.mapRangeToOriginal)(fragment, (0, utils_2.convertRange)(fragment, implementation.textSpan));
+            const snapshot = await snapshots.retrieve(implementation.fileName);
+            const range = (0, documents_1.mapRangeToOriginal)(snapshot, (0, utils_2.convertRange)(snapshot, implementation.textSpan));
             if (range.start.line >= 0 && range.end.line >= 0) {
                 return vscode_languageserver_types_1.Location.create((0, utils_1.pathToUrl)(implementation.fileName), range);
             }

package/dist/plugins/typescript/features/InlayHintsProvider.js

@@ -11,13 +11,12 @@ class InlayHintsProviderImpl {
     }
     async getInlayHints(document, range) {
         const { lang, tsDoc } = await this.languageServiceManager.getLSAndTSDoc(document);
-        const fragment = await tsDoc.createFragment();
-        const start = fragment.offsetAt(fragment.getGeneratedPosition(range.start));
-        const end = fragment.offsetAt(fragment.getGeneratedPosition(range.end));
+        const start = tsDoc.offsetAt(tsDoc.getGeneratedPosition(range.start));
+        const end = tsDoc.offsetAt(tsDoc.getGeneratedPosition(range.end));
         const tsPreferences = await this.configManager.getTSPreferences(document);
         const inlayHints = lang.provideInlayHints(tsDoc.filePath, { start, length: end - start }, tsPreferences);
         return inlayHints.map((hint) => {
-            const result = vscode_languageserver_1.InlayHint.create(fragment.getOriginalPosition(fragment.positionAt(hint.position)), hint.text, hint.kind === this.ts.InlayHintKind.Type
+            const result = vscode_languageserver_1.InlayHint.create(tsDoc.getOriginalPosition(tsDoc.positionAt(hint.position)), hint.text, hint.kind === this.ts.InlayHintKind.Type
                 ? vscode_languageserver_types_1.InlayHintKind.Type
                 : hint.kind === this.ts.InlayHintKind.Parameter
                     ? vscode_languageserver_types_1.InlayHintKind.Parameter

package/dist/plugins/typescript/features/ReferencesProvider.js

@@ -12,8 +12,9 @@ class FindReferencesProviderImpl {
     }
     async findReferences(document, position, context) {
         const { lang, tsDoc } = await this.languageServiceManager.getLSAndTSDoc(document);
-        const mainFragment = await tsDoc.createFragment();
-        const offset = mainFragment.offsetAt(mainFragment.getGeneratedPosition(position));
+        const fragmentPosition = tsDoc.getGeneratedPosition(position);
+        const fragmentOffset = tsDoc.offsetAt(fragmentPosition);
+        const offset = document.offsetAt(position);
         const node = document.html.findNodeAt(offset);
         let references;
         if (node.tag === 'script') {
@@ -24,26 +25,26 @@ class FindReferencesProviderImpl {
                     const isInSameFile = ref.fileName === scriptFilePath;
                     ref.fileName = isInSameFile ? tsDoc.filePath : ref.fileName;
                     if (isInSameFile) {
-                        ref.textSpan.start = mainFragment.offsetAt(scriptTagSnapshot.getOriginalPosition(scriptTagSnapshot.positionAt(ref.textSpan.start)));
+                        ref.textSpan.start = (0, documents_1.mapScriptSpanStartToSnapshot)(ref.textSpan, scriptTagSnapshot, tsDoc);
                     }
                     return ref;
                 });
             }
         }
         else {
-            references = lang.getReferencesAtPosition(tsDoc.filePath, offset);
+            references = lang.getReferencesAtPosition(tsDoc.filePath, fragmentOffset);
         }
         if (!references) {
             return null;
         }
-        const docs = new utils_3.SnapshotFragmentMap(this.languageServiceManager);
-        docs.set(tsDoc.filePath, { fragment: mainFragment, snapshot: tsDoc });
+        const snapshots = new utils_3.SnapshotMap(this.languageServiceManager);
+        snapshots.set(tsDoc.filePath, tsDoc);
         const result = await Promise.all(references.map(async (reference) => {
             if (!context.includeDeclaration) {
                 return null;
             }
-            const { fragment } = await docs.retrieve(reference.fileName);
-            const range = (0, documents_1.mapRangeToOriginal)(fragment, (0, utils_2.convertRange)(fragment, reference.textSpan));
+            const snapshot = await snapshots.retrieve(reference.fileName);
+            const range = (0, documents_1.mapRangeToOriginal)(snapshot, (0, utils_2.convertRange)(snapshot, reference.textSpan));
             if (range.start.line >= 0 && range.end.line >= 0) {
                 return vscode_languageserver_types_1.Location.create((0, utils_1.pathToUrl)(reference.fileName), range);
             }

package/dist/plugins/typescript/features/SemanticTokenProvider.js

@@ -10,17 +10,16 @@ class SemanticTokensProviderImpl {
     }
     async getSemanticTokens(document, range, cancellationToken) {
         const { lang, tsDoc } = await this.languageServiceManager.getLSAndTSDoc(document);
-        const fragment = (await tsDoc.createFragment());
         if (cancellationToken?.isCancellationRequested) {
             return null;
         }
-        const start = range ? fragment.offsetAt(fragment.getGeneratedPosition(range.start)) : 0;
+        const start = range ? tsDoc.offsetAt(tsDoc.getGeneratedPosition(range.start)) : 0;
         const { spans } = lang.getEncodedSemanticClassifications(tsDoc.filePath, {
             start,
             length: range
-                ? fragment.offsetAt(fragment.getGeneratedPosition(range.end)) - start
+                ? tsDoc.offsetAt(tsDoc.getGeneratedPosition(range.end)) - start
                 : // We don't want tokens for things added by astro2tsx
-                    fragment.text.lastIndexOf('export default function ') || fragment.text.length,
+                    tsDoc.getFullText().lastIndexOf('export default function ') || tsDoc.getLength(),
         }, this.ts.SemanticClassificationFormat.TwentyTwenty);
         const tokens = [];
         let i = 0;
@@ -28,7 +27,7 @@ class SemanticTokensProviderImpl {
             const offset = spans[i++];
             const generatedLength = spans[i++];
             const classification = spans[i++];
-            const originalPosition = this.mapToOrigin(document, fragment, offset, generatedLength);
+            const originalPosition = this.mapToOrigin(document, tsDoc, offset, generatedLength);
             if (!originalPosition) {
                 continue;
             }
@@ -50,12 +49,12 @@ class SemanticTokensProviderImpl {
         const build = builder.build();
         return build;
     }
-    mapToOrigin(document, fragment, generatedOffset, generatedLength) {
+    mapToOrigin(document, snapshot, generatedOffset, generatedLength) {
         const range = {
-            start: fragment.positionAt(generatedOffset),
-            end: fragment.positionAt(generatedOffset + generatedLength),
+            start: snapshot.positionAt(generatedOffset),
+            end: snapshot.positionAt(generatedOffset + generatedLength),
         };
-        const { start: startPosition, end: endPosition } = (0, documents_1.mapRangeToOriginal)(fragment, range);
+        const { start: startPosition, end: endPosition } = (0, documents_1.mapRangeToOriginal)(snapshot, range);
         if (startPosition.line < 0 || endPosition.line < 0) {
             return;
         }

package/dist/plugins/typescript/features/SignatureHelpProvider.js

@@ -11,11 +11,10 @@ class SignatureHelpProviderImpl {
     }
     async getSignatureHelp(document, position, context, cancellationToken) {
         const { lang, tsDoc } = await this.languageServiceManager.getLSAndTSDoc(document);
-        const fragment = await tsDoc.createFragment();
         if (cancellationToken?.isCancellationRequested) {
             return null;
         }
-        const offset = fragment.offsetAt(fragment.getGeneratedPosition(position));
+        const offset = tsDoc.offsetAt(tsDoc.getGeneratedPosition(position));
         const node = document.html.findNodeAt(offset);
         let info;
         const triggerReason = this.toTsTriggerReason(context);

package/dist/plugins/typescript/features/TypeDefinitionsProvider.js

@@ -12,8 +12,8 @@ class TypeDefinitionsProviderImpl {
     }
     async getTypeDefinitions(document, position) {
         const { lang, tsDoc } = await this.languageServiceManager.getLSAndTSDoc(document);
-        const mainFragment = await tsDoc.createFragment();
-        const fragmentOffset = mainFragment.offsetAt(mainFragment.getGeneratedPosition(position));
+        const fragmentPosition = tsDoc.getGeneratedPosition(position);
+        const fragmentOffset = tsDoc.offsetAt(fragmentPosition);
         const html = document.html;
         const offset = document.offsetAt(position);
         const node = html.findNodeAt(offset);
@@ -26,7 +26,7 @@ class TypeDefinitionsProviderImpl {
                     const isInSameFile = def.fileName === scriptFilePath;
                     def.fileName = isInSameFile ? tsDoc.filePath : def.fileName;
                     if (isInSameFile) {
-                        def.textSpan.start = mainFragment.offsetAt(scriptTagSnapshot.getOriginalPosition(scriptTagSnapshot.positionAt(def.textSpan.start)));
+                        def.textSpan.start = (0, documents_1.mapScriptSpanStartToSnapshot)(def.textSpan, scriptTagSnapshot, tsDoc);
                     }
                     return def;
                 });
@@ -35,15 +35,15 @@ class TypeDefinitionsProviderImpl {
         else {
             typeDefs = lang.getTypeDefinitionAtPosition(tsDoc.filePath, fragmentOffset);
         }
-        const docs = new utils_3.SnapshotFragmentMap(this.languageServiceManager);
-        docs.set(tsDoc.filePath, { fragment: mainFragment, snapshot: tsDoc });
+        const snapshots = new utils_3.SnapshotMap(this.languageServiceManager);
+        snapshots.set(tsDoc.filePath, tsDoc);
         if (!typeDefs) {
             return [];
         }
         const result = await Promise.all(typeDefs.map(async (typeDef) => {
-            const { fragment } = await docs.retrieve(typeDef.fileName);
+            const snapshot = await snapshots.retrieve(typeDef.fileName);
             const fileName = (0, utils_2.ensureRealFilePath)(typeDef.fileName);
-            const range = (0, documents_1.mapRangeToOriginal)(fragment, (0, utils_2.convertRange)(fragment, typeDef.textSpan));
+            const range = (0, documents_1.mapRangeToOriginal)(snapshot, (0, utils_2.convertRange)(snapshot, typeDef.textSpan));
             if (range.start.line >= 0 && range.end.line >= 0) {
                 return vscode_languageserver_protocol_1.Location.create((0, utils_1.pathToUrl)(fileName), range);
             }

package/dist/plugins/typescript/features/utils.d.ts

@@ -1,25 +1,14 @@
 import type ts from 'typescript';
 import type { Position } from 'vscode-languageserver';
 import type { LanguageServiceManager } from '../LanguageServiceManager';
-import type { DocumentSnapshot, SnapshotFragment } from '../snapshots/DocumentSnapshot';
+import type { DocumentSnapshot } from '../snapshots/DocumentSnapshot';
 export declare function isPartOfImportStatement(text: string, position: Position): boolean;
-export declare class SnapshotFragmentMap {
+export declare class SnapshotMap {
     private languageServiceManager;
     private map;
     constructor(languageServiceManager: LanguageServiceManager);
-    set(fileName: string, content: {
-        fragment: SnapshotFragment;
-        snapshot: DocumentSnapshot;
-    }): void;
-    get(fileName: string): {
-        fragment: SnapshotFragment;
-        snapshot: DocumentSnapshot;
-    } | undefined;
-    getFragment(fileName: string): SnapshotFragment | undefined;
-    retrieve(fileName: string): Promise<{
-        fragment: SnapshotFragment;
-        snapshot: DocumentSnapshot;
-    }>;
-    retrieveFragment(fileName: string): Promise<SnapshotFragment>;
+    set(fileName: string, snapshot: DocumentSnapshot): void;
+    get(fileName: string): DocumentSnapshot | undefined;
+    retrieve(fileName: string): Promise<DocumentSnapshot>;
 }
 export declare function findContainingNode<T extends ts.Node>(node: ts.Node, textSpan: ts.TextSpan, predicate: (node: ts.Node) => node is T): T | undefined;