@astrojs/language-server 0.15.0 → 0.16.0

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

@@ -0,0 +1,141 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CodeActionsProviderImpl = exports.sortImportKind = void 0;
+const lodash_1 = require("lodash");
+const typescript_1 = __importDefault(require("typescript"));
+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 CompletionsProvider_1 = require("./CompletionsProvider");
+const utils_3 = require("./utils");
+// These are VS Code specific CodeActionKind so they're not in the language server protocol
+exports.sortImportKind = `${vscode_languageserver_types_1.CodeActionKind.Source}.sortImports`;
+class CodeActionsProviderImpl {
+    constructor(languageServiceManager) {
+        this.languageServiceManager = languageServiceManager;
+    }
+    async getCodeActions(document, range, context, cancellationToken) {
+        const { lang, tsDoc } = await this.languageServiceManager.getLSAndTSDoc(document);
+        const filePath = (0, utils_2.toVirtualAstroFilePath)(tsDoc.filePath);
+        const fragment = await tsDoc.createFragment();
+        const start = fragment.offsetAt(fragment.getGeneratedPosition(range.start));
+        const end = fragment.offsetAt(fragment.getGeneratedPosition(range.end));
+        let result = [];
+        if (cancellationToken?.isCancellationRequested) {
+            return [];
+        }
+        if (context.only?.[0] === vscode_languageserver_types_1.CodeActionKind.SourceOrganizeImports) {
+            return await this.organizeSortImports(document, false, cancellationToken);
+        }
+        // The difference between Sort Imports and Organize Imports is that Sort Imports won't do anything destructive.
+        // For example, it won't remove unused imports whereas Organize Imports will
+        if (context.only?.[0] === exports.sortImportKind) {
+            return await this.organizeSortImports(document, true, cancellationToken);
+        }
+        if (context.only?.[0] === vscode_languageserver_types_1.CodeActionKind.Source) {
+            return [
+                ...(await this.organizeSortImports(document, true, cancellationToken)),
+                ...(await this.organizeSortImports(document, false, cancellationToken)),
+            ];
+        }
+        if (context.diagnostics.length && (!context.only || context.only.includes(vscode_languageserver_types_1.CodeActionKind.QuickFix))) {
+            const errorCodes = context.diagnostics
+                .map((diag) => Number(diag.code))
+                // We currently cannot support quick fix for unreachable code properly due to the way our TSX output is structured
+                .filter((code) => code !== 7027);
+            let codeFixes = errorCodes.includes(2304) ? this.getComponentQuickFix(start, end, lang, filePath) : undefined;
+            codeFixes = codeFixes ?? lang.getCodeFixesAtPosition(filePath, start, end, errorCodes, {}, {});
+            const codeActions = codeFixes.map((fix) => codeFixToCodeAction(fix, context.diagnostics, context.only ? vscode_languageserver_types_1.CodeActionKind.QuickFix : vscode_languageserver_types_1.CodeActionKind.Empty));
+            result.push(...codeActions);
+        }
+        return result;
+        function codeFixToCodeAction(codeFix, diagnostics, kind) {
+            const documentChanges = codeFix.changes.map((change) => {
+                return vscode_languageserver_types_1.TextDocumentEdit.create(vscode_languageserver_types_1.OptionalVersionedTextDocumentIdentifier.create(document.getURL(), null), change.textChanges.map((edit) => {
+                    let originalRange = (0, documents_1.mapRangeToOriginal)(fragment, (0, utils_2.convertRange)(fragment, edit.span));
+                    if (codeFix.fixName === 'import') {
+                        return (0, CompletionsProvider_1.codeActionChangeToTextEdit)(document, fragment, edit);
+                    }
+                    if (codeFix.fixName === 'fixMissingFunctionDeclaration') {
+                        originalRange = (0, utils_2.checkEndOfFileCodeInsert)(originalRange, document);
+                    }
+                    return vscode_languageserver_types_1.TextEdit.replace(originalRange, edit.newText);
+                }));
+            });
+            const codeAction = vscode_languageserver_types_1.CodeAction.create(codeFix.description, {
+                documentChanges,
+            }, kind);
+            codeAction.diagnostics = diagnostics;
+            return codeAction;
+        }
+    }
+    getComponentQuickFix(start, end, lang, filePath) {
+        const sourceFile = lang.getProgram()?.getSourceFile(filePath);
+        if (!sourceFile) {
+            return;
+        }
+        const node = (0, utils_3.findContainingNode)(sourceFile, {
+            start,
+            length: end - start,
+        }, (n) => typescript_1.default.isJsxClosingElement(n) || typescript_1.default.isJsxOpeningLikeElement(n));
+        if (!node) {
+            return;
+        }
+        const tagName = node.tagName;
+        // Unlike quick fixes, completions will be able to find the component, so let's use those to get it
+        const completion = lang.getCompletionsAtPosition(filePath, tagName.getEnd(), CompletionsProvider_1.completionOptions);
+        if (!completion) {
+            return;
+        }
+        const name = tagName.getText();
+        const suffixedName = name + '__AstroComponent_';
+        const toFix = (c) => lang.getCompletionEntryDetails(filePath, end, c.name, {}, c.source, {}, c.data)?.codeActions?.map((a) => ({
+            ...a,
+            description: (0, utils_2.removeAstroComponentSuffix)(a.description),
+            fixName: 'import',
+        })) ?? [];
+        return (0, lodash_1.flatten)(completion.entries.filter((c) => c.name === name || c.name === suffixedName).map(toFix));
+    }
+    async organizeSortImports(document, skipDestructiveCodeActions = false, cancellationToken) {
+        if (document.astroMeta.frontmatter.state !== 'closed') {
+            return [];
+        }
+        const { lang, tsDoc } = await this.languageServiceManager.getLSAndTSDoc(document);
+        const filePath = (0, utils_2.toVirtualAstroFilePath)(tsDoc.filePath);
+        const fragment = await tsDoc.createFragment();
+        if (cancellationToken?.isCancellationRequested) {
+            return [];
+        }
+        const changes = lang.organizeImports({ fileName: filePath, type: 'file', skipDestructiveCodeActions }, {}, {});
+        const documentChanges = changes.map((change) => {
+            return vscode_languageserver_types_1.TextDocumentEdit.create(vscode_languageserver_types_1.OptionalVersionedTextDocumentIdentifier.create(document.url, null), change.textChanges.map((edit) => {
+                const range = (0, documents_1.mapRangeToOriginal)(fragment, (0, utils_2.convertRange)(fragment, edit.span));
+                return vscode_languageserver_types_1.TextEdit.replace(range, this.fixIndentationOfImports(edit.newText, range, document));
+            }));
+        });
+        return [
+            vscode_languageserver_types_1.CodeAction.create(skipDestructiveCodeActions ? 'Sort Imports' : 'Organize Imports', {
+                documentChanges,
+            }, skipDestructiveCodeActions ? exports.sortImportKind : vscode_languageserver_types_1.CodeActionKind.SourceOrganizeImports),
+        ];
+    }
+    // "Organize Imports" will have edits that delete all imports by return empty edits
+    // and one edit which contains all the organized imports. Fix indentation
+    // of that one by prepending all lines with the indentation of the first line.
+    fixIndentationOfImports(edit, range, document) {
+        if (!edit || range.start.character === 0) {
+            return edit;
+        }
+        const existingLine = (0, documents_1.getLineAtPosition)(range.start, document.getText());
+        const leadingChars = existingLine.substring(0, range.start.character);
+        if (leadingChars.trim() !== '') {
+            return edit;
+        }
+        return (0, utils_1.modifyLines)(edit, (line, idx) => (idx === 0 || !line ? line : leadingChars + line));
+    }
+}
+exports.CodeActionsProviderImpl = CodeActionsProviderImpl;

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

@@ -4,6 +4,7 @@ import { AstroDocument } from '../../../core/documents';
 import ts from 'typescript';
 import { AppCompletionItem, AppCompletionList, CompletionsProvider } from '../../interfaces';
 import { AstroSnapshotFragment } from '../snapshots/DocumentSnapshot';
+export declare const completionOptions: ts.GetCompletionsAtPositionOptions;
 export interface CompletionItemData extends TextDocumentIdentifier {
     filePath: string;
     offset: number;
@@ -19,7 +20,6 @@ export declare class CompletionsProviderImpl implements CompletionsProvider<Comp
     resolveCompletion(document: AstroDocument, item: AppCompletionItem<CompletionItemData>, cancellationToken?: CancellationToken): Promise<AppCompletionItem<CompletionItemData>>;
     private toCompletionItem;
     private isValidCompletion;
-    codeActionChangeToTextEdit(document: AstroDocument, fragment: AstroSnapshotFragment, change: ts.TextChange): TextEdit;
     private getCompletionDocument;
     /**
      * If the textEdit is out of the word range of the triggered position
@@ -31,3 +31,4 @@ export declare class CompletionsProviderImpl implements CompletionsProvider<Comp
     private getExistingImports;
     private isAstroComponentImport;
 }
+export declare function codeActionChangeToTextEdit(document: AstroDocument, fragment: AstroSnapshotFragment, change: ts.TextChange): TextEdit;

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

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CompletionsProviderImpl = void 0;
+exports.codeActionChangeToTextEdit = exports.CompletionsProviderImpl = exports.completionOptions = void 0;
 const vscode_languageserver_1 = require("vscode-languageserver");
 const vscode_languageserver_protocol_1 = require("vscode-languageserver-protocol");
 const utils_1 = require("../../../core/documents/utils");
@@ -35,7 +35,7 @@ const utils_3 = require("../../../utils");
 const lodash_1 = require("lodash");
 const previewer_1 = require("../previewer");
 const utils_4 = require("./utils");
-const completionOptions = {
+exports.completionOptions = {
     importModuleSpecifierPreference: 'relative',
     importModuleSpecifierEnding: 'auto',
     quotePreference: 'single',
@@ -57,11 +57,11 @@ class CompletionsProviderImpl {
         return this.validTriggerCharacters.includes(character);
     }
     async getCompletions(document, position, completionContext, cancellationToken) {
-        const triggerCharacter = completionContext === null || completionContext === void 0 ? void 0 : completionContext.triggerCharacter;
-        const triggerKind = completionContext === null || completionContext === void 0 ? void 0 : completionContext.triggerKind;
+        const triggerCharacter = completionContext?.triggerCharacter;
+        const triggerKind = completionContext?.triggerKind;
         const validTriggerCharacter = this.isValidTriggerCharacter(triggerCharacter) ? triggerCharacter : undefined;
         const isCustomTriggerCharacter = triggerKind === vscode_languageserver_1.CompletionTriggerKind.TriggerCharacter;
-        if ((isCustomTriggerCharacter && !validTriggerCharacter) || (cancellationToken === null || cancellationToken === void 0 ? void 0 : cancellationToken.isCancellationRequested)) {
+        if ((isCustomTriggerCharacter && !validTriggerCharacter) || cancellationToken?.isCancellationRequested) {
             return null;
         }
         if (this.canReuseLastCompletion(this.lastCompletion, triggerKind, triggerCharacter, document, position)) {
@@ -100,7 +100,7 @@ class CompletionsProviderImpl {
         const { lang, tsDoc } = await this.languageServiceManager.getLSAndTSDoc(document);
         const filePath = (0, utils_2.toVirtualAstroFilePath)(tsDoc.filePath);
         const completions = lang.getCompletionsAtPosition(filePath, offset, {
-            ...completionOptions,
+            ...exports.completionOptions,
             triggerCharacter: validTriggerCharacter,
         });
         if (completions === undefined || completions.entries.length === 0) {
@@ -109,7 +109,7 @@ class CompletionsProviderImpl {
         const wordRange = completions.optionalReplacementSpan
             ? vscode_languageserver_1.Range.create(document.positionAt(completions.optionalReplacementSpan.start), document.positionAt(completions.optionalReplacementSpan.start + completions.optionalReplacementSpan.length))
             : undefined;
-        const wordRangeStartPosition = wordRange === null || wordRange === void 0 ? void 0 : wordRange.start;
+        const wordRangeStartPosition = wordRange?.start;
         const fragment = await tsDoc.createFragment();
         const existingImports = this.getExistingImports(document);
         const completionItems = completions.entries
@@ -122,10 +122,9 @@ class CompletionsProviderImpl {
         return completionList;
     }
     async resolveCompletion(document, item, cancellationToken) {
-        var _a;
         const { lang, tsDoc } = await this.languageServiceManager.getLSAndTSDoc(document);
         const data = item.data;
-        if (!data || !data.filePath || (cancellationToken === null || cancellationToken === void 0 ? void 0 : cancellationToken.isCancellationRequested)) {
+        if (!data || !data.filePath || cancellationToken?.isCancellationRequested) {
             return item;
         }
         const fragment = await tsDoc.createFragment();
@@ -134,7 +133,7 @@ class CompletionsProviderImpl {
         data.originalItem.name, // entryName
         {}, // formatOptions
         data.originalItem.source, // source
-        completionOptions, // preferences
+        exports.completionOptions, // preferences
         data.originalItem.data // data
         );
         if (detail) {
@@ -142,23 +141,22 @@ class CompletionsProviderImpl {
             item.detail = itemDetail;
             item.documentation = itemDocumentation;
         }
-        const actions = detail === null || detail === void 0 ? void 0 : detail.codeActions;
+        const actions = detail?.codeActions;
         if (actions) {
             const edit = [];
             for (const action of actions) {
                 for (const change of action.changes) {
-                    edit.push(...change.textChanges.map((textChange) => this.codeActionChangeToTextEdit(document, fragment, textChange)));
+                    edit.push(...change.textChanges.map((textChange) => codeActionChangeToTextEdit(document, fragment, textChange)));
                 }
             }
-            item.additionalTextEdits = ((_a = item.additionalTextEdits) !== null && _a !== void 0 ? _a : []).concat(edit);
+            item.additionalTextEdits = (item.additionalTextEdits ?? []).concat(edit);
         }
         return item;
     }
     toCompletionItem(fragment, comp, filePath, offset, insideFrontmatter, existingImports) {
-        var _a, _b, _c;
         let item = vscode_languageserver_protocol_1.CompletionItem.create(comp.name);
         const isAstroComponent = this.isAstroComponentImport(comp.name);
-        const isImport = (_a = comp.insertText) === null || _a === void 0 ? void 0 : _a.includes('import');
+        const isImport = comp.insertText?.includes('import');
         // Avoid showing completions for using components as functions
         if (isAstroComponent && !isImport && insideFrontmatter) {
             return null;
@@ -167,7 +165,7 @@ class CompletionsProviderImpl {
             item.label = (0, utils_2.removeAstroComponentSuffix)(comp.name);
             // Set component imports as file completion, that way we get cool icons
             item.kind = vscode_languageserver_protocol_1.CompletionItemKind.File;
-            item.detail = (_b = comp.data) === null || _b === void 0 ? void 0 : _b.moduleSpecifier;
+            item.detail = comp.data?.moduleSpecifier;
         }
         else {
             item.kind = (0, utils_2.scriptElementKindToCompletionItemKind)(comp.kind);
@@ -194,7 +192,7 @@ class CompletionsProviderImpl {
             item.insertText = comp.insertText ? (0, utils_2.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_2.convertRange)(fragment, comp.replacementSpan), (_c = item.insertText) !== null && _c !== void 0 ? _c : item.label)
+                ? vscode_languageserver_1.TextEdit.replace((0, utils_2.convertRange)(fragment, comp.replacementSpan), item.insertText ?? item.label)
                 : undefined;
         }
         return {
@@ -214,20 +212,6 @@ class CompletionsProviderImpl {
         }
         return true;
     }
-    codeActionChangeToTextEdit(document, fragment, change) {
-        change.newText = (0, utils_2.removeAstroComponentSuffix)(change.newText);
-        // If we don't have a frontmatter already, create one with the import
-        const frontmatterState = document.astroMeta.frontmatter.state;
-        if (frontmatterState === null) {
-            return vscode_languageserver_1.TextEdit.replace(vscode_languageserver_1.Range.create(vscode_languageserver_1.Position.create(0, 0), vscode_languageserver_1.Position.create(0, 0)), `---${typescript_1.default.sys.newLine}${change.newText}---${typescript_1.default.sys.newLine}${typescript_1.default.sys.newLine}`);
-        }
-        const { span } = change;
-        let range;
-        const virtualRange = (0, utils_2.convertRange)(fragment, span);
-        range = (0, documents_1.mapRangeToOriginal)(fragment, virtualRange);
-        range = (0, utils_2.ensureFrontmatterInsert)(range, document);
-        return vscode_languageserver_1.TextEdit.replace(range, change.newText);
-    }
     getCompletionDocument(compDetail) {
         const { sourceDisplay, documentation: tsDocumentation, displayParts } = compDetail;
         let detail = (0, utils_2.removeAstroComponentSuffix)(typescript_1.default.displayPartsToString(displayParts));
@@ -286,7 +270,7 @@ class CompletionsProviderImpl {
                 (triggerCharacter === '.' && (0, utils_4.isPartOfImportStatement)(document.getText(), position))));
     }
     getExistingImports(document) {
-        const rawImports = (0, utils_3.getRegExpMatches)(scriptImportRegex, document.getText()).map((match) => { var _a; return ((_a = match[1]) !== null && _a !== void 0 ? _a : match[2]).split(','); });
+        const rawImports = (0, utils_3.getRegExpMatches)(scriptImportRegex, document.getText()).map((match) => (match[1] ?? match[2]).split(','));
         const tidiedImports = (0, lodash_1.flatten)(rawImports).map((match) => match.trim());
         return new Set(tidiedImports);
     }
@@ -295,3 +279,24 @@ class CompletionsProviderImpl {
     }
 }
 exports.CompletionsProviderImpl = CompletionsProviderImpl;
+function codeActionChangeToTextEdit(document, fragment, change) {
+    change.newText = (0, utils_2.removeAstroComponentSuffix)(change.newText);
+    // If we don't have a frontmatter already, create one with the import
+    const frontmatterState = document.astroMeta.frontmatter.state;
+    if (frontmatterState === null) {
+        return vscode_languageserver_1.TextEdit.replace(vscode_languageserver_1.Range.create(vscode_languageserver_1.Position.create(0, 0), vscode_languageserver_1.Position.create(0, 0)), `---${typescript_1.default.sys.newLine}${change.newText}---${typescript_1.default.sys.newLine}${typescript_1.default.sys.newLine}`);
+    }
+    const { span } = change;
+    let range;
+    const virtualRange = (0, utils_2.convertRange)(fragment, span);
+    range = (0, documents_1.mapRangeToOriginal)(fragment, virtualRange);
+    if (!(0, utils_1.isInsideFrontmatter)(document.getText(), document.offsetAt(range.start))) {
+        range = (0, utils_2.ensureFrontmatterInsert)(range, document);
+    }
+    // First import in a file will wrongly have a newline before it due to how the frontmatter is replaced by a comment
+    if (range.start.line === 1 && (change.newText.startsWith('\n') || change.newText.startsWith('\r\n'))) {
+        change.newText = change.newText.trimStart();
+    }
+    return vscode_languageserver_1.TextEdit.replace(range, change.newText);
+}
+exports.codeActionChangeToTextEdit = codeActionChangeToTextEdit;

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

@@ -13,10 +13,9 @@ class DiagnosticsProviderImpl {
         this.languageServiceManager = languageServiceManager;
     }
     async getDiagnostics(document, _cancellationToken) {
-        var _a, _b;
         // Don't return diagnostics for files inside node_modules. These are considered read-only
         // and they would pollute the output for astro check
-        if (((_a = document.getFilePath()) === null || _a === void 0 ? void 0 : _a.includes('/node_modules/')) || ((_b = document.getFilePath()) === null || _b === void 0 ? void 0 : _b.includes('\\node_modules\\'))) {
+        if (document.getFilePath()?.includes('/node_modules/') || document.getFilePath()?.includes('\\node_modules\\')) {
             return [];
         }
         const { lang, tsDoc } = await this.languageServiceManager.getLSAndTSDoc(document);
@@ -53,7 +52,7 @@ class DiagnosticsProviderImpl {
     }
     getTagBoundaries(lang, tsFilePath) {
         const program = lang.getProgram();
-        const sourceFile = program === null || program === void 0 ? void 0 : program.getSourceFile(tsFilePath);
+        const sourceFile = program?.getSourceFile(tsFilePath);
         const boundaries = {
             script: [],
             markdown: [],

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

@@ -11,7 +11,6 @@ class DocumentSymbolsProviderImpl {
         this.languageServiceManager = languageServiceManager;
     }
     async getDocumentSymbols(document) {
-        var _a, _b, _c;
         const { lang, tsDoc } = await this.languageServiceManager.getLSAndTSDoc(document);
         const fragment = await tsDoc.createFragment();
         const navTree = lang.getNavigationTree(tsDoc.filePath);
@@ -27,17 +26,17 @@ class DocumentSymbolsProviderImpl {
             result.push(vscode_languageserver_types_1.SymbolInformation.create('Frontmatter', vscode_languageserver_types_1.SymbolKind.Namespace, vscode_languageserver_types_1.Range.create(document.positionAt(document.astroMeta.frontmatter.startOffset), document.positionAt(document.astroMeta.frontmatter.endOffset)), document.getURL()));
         }
         // 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((_a = document.astroMeta.frontmatter.endOffset) !== null && _a !== void 0 ? _a : 0), document.positionAt(document.getTextLength())), document.getURL()));
+        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) >= ((_b = document.astroMeta.content.firstNonWhitespaceOffset) !== null && _b !== void 0 ? _b : 0)) {
+            if (document.offsetAt(symbol.location.range.end) >= (document.astroMeta.content.firstNonWhitespaceOffset ?? 0)) {
                 if (symbol.containerName === originalContainerName) {
                     symbol.containerName = 'Template';
                 }
                 // For some reason, it seems like TypeScript thinks that the "class" attribute is a real class, weird
                 if (symbol.kind === vscode_languageserver_types_1.SymbolKind.Class && symbol.name === '<class>') {
                     const node = document.html.findNodeAt(document.offsetAt(symbol.location.range.start));
-                    if ((_c = node.attributes) === null || _c === void 0 ? void 0 : _c.class) {
+                    if (node.attributes?.class) {
                         continue;
                     }
                 }

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

@@ -15,7 +15,7 @@ class SemanticTokensProviderImpl {
     async getSemanticTokens(document, range, cancellationToken) {
         const { lang, tsDoc } = await this.languageServiceManager.getLSAndTSDoc(document);
         const fragment = (await tsDoc.createFragment());
-        if (cancellationToken === null || cancellationToken === void 0 ? void 0 : cancellationToken.isCancellationRequested) {
+        if (cancellationToken?.isCancellationRequested) {
             return null;
         }
         const filePath = (0, utils_1.toVirtualAstroFilePath)(tsDoc.filePath);

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

@@ -15,7 +15,7 @@ class SignatureHelpProviderImpl {
     async getSignatureHelp(document, position, context, cancellationToken) {
         const { lang, tsDoc } = await this.languageServiceManager.getLSAndTSDoc(document);
         const fragment = await tsDoc.createFragment();
-        if (cancellationToken === null || cancellationToken === void 0 ? void 0 : cancellationToken.isCancellationRequested) {
+        if (cancellationToken?.isCancellationRequested) {
             return null;
         }
         const filePath = (0, utils_1.toVirtualAstroFilePath)(tsDoc.filePath);
@@ -44,7 +44,7 @@ class SignatureHelpProviderImpl {
      * adopted from https://github.com/microsoft/vscode/blob/265a2f6424dfbd3a9788652c7d376a7991d049a3/extensions/typescript-language-features/src/languageFeatures/signatureHelp.ts#L103
      */
     toTsTriggerReason(context) {
-        switch (context === null || context === void 0 ? void 0 : context.triggerKind) {
+        switch (context?.triggerKind) {
             case vscode_languageserver_1.SignatureHelpTriggerKind.TriggerCharacter:
                 if (context.triggerCharacter) {
                     if (this.isReTrigger(context.isRetrigger, context.triggerCharacter)) {

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

@@ -1,6 +1,7 @@
 import type { SnapshotFragment, DocumentSnapshot } from '../snapshots/DocumentSnapshot';
 import type { LanguageServiceManager } from '../LanguageServiceManager';
 import { Position } from 'vscode-languageserver';
+import ts from 'typescript';
 export declare function isPartOfImportStatement(text: string, position: Position): boolean;
 export declare class SnapshotFragmentMap {
     private languageServiceManager;
@@ -21,3 +22,4 @@ export declare class SnapshotFragmentMap {
     }>;
     retrieveFragment(fileName: string): Promise<SnapshotFragment>;
 }
+export declare function findContainingNode<T extends ts.Node>(node: ts.Node, textSpan: ts.TextSpan, predicate: (node: ts.Node) => node is T): T | undefined;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SnapshotFragmentMap = exports.isPartOfImportStatement = void 0;
+exports.findContainingNode = exports.SnapshotFragmentMap = exports.isPartOfImportStatement = void 0;
 const documents_1 = require("../../../core/documents");
 function isPartOfImportStatement(text, position) {
     const line = (0, documents_1.getLineAtPosition)(position, text);
@@ -19,8 +19,7 @@ class SnapshotFragmentMap {
         return this.map.get(fileName);
     }
     getFragment(fileName) {
-        var _a;
-        return (_a = this.map.get(fileName)) === null || _a === void 0 ? void 0 : _a.fragment;
+        return this.map.get(fileName)?.fragment;
     }
     async retrieve(fileName) {
         let snapshotFragment = this.get(fileName);
@@ -37,3 +36,20 @@ class SnapshotFragmentMap {
     }
 }
 exports.SnapshotFragmentMap = SnapshotFragmentMap;
+function findContainingNode(node, textSpan, predicate) {
+    const children = node.getChildren();
+    const end = textSpan.start + textSpan.length;
+    for (const child of children) {
+        if (!(child.getStart() <= textSpan.start && child.getEnd() >= end)) {
+            continue;
+        }
+        if (predicate(child)) {
+            return child;
+        }
+        const foundInChildren = findContainingNode(child, textSpan, predicate);
+        if (foundInChildren) {
+            return foundInChildren;
+        }
+    }
+}
+exports.findContainingNode = findContainingNode;

package/dist/plugins/typescript/language-service.js

@@ -132,7 +132,7 @@ async function createLanguageService(tsconfigPath, docContext, workspaceUris) {
     function updateSnapshotFromDocument(document) {
         const filePath = document.getFilePath() || '';
         const prevSnapshot = snapshotManager.get(filePath);
-        if ((prevSnapshot === null || prevSnapshot === void 0 ? void 0 : prevSnapshot.version) === document.version) {
+        if (prevSnapshot?.version === document.version) {
             return prevSnapshot;
         }
         if (!prevSnapshot) {
@@ -186,16 +186,15 @@ async function createLanguageService(tsconfigPath, docContext, workspaceUris) {
         snapshotManager.updateNonAstroFile(fileName, changes);
     }
     function getParsedTSConfig() {
-        var _a, _b, _c, _d;
         let configJson = (tsconfigPath && typescript_1.default.readConfigFile(tsconfigPath, typescript_1.default.sys.readFile).config) || {};
         // If our user has types in their config but it doesn't include the types needed for Astro, add them to the config
-        if ((_a = configJson.compilerOptions) === null || _a === void 0 ? void 0 : _a.types) {
-            if (!((_b = configJson.compilerOptions) === null || _b === void 0 ? void 0 : _b.types.includes('astro/env'))) {
+        if (configJson.compilerOptions?.types) {
+            if (!configJson.compilerOptions?.types.includes('astro/env')) {
                 configJson.compilerOptions.types.push('astro/env');
             }
             if (astroVersion.major >= 1 &&
                 astroVersion.full !== '1.0.0-beta.0' &&
-                !((_c = configJson.compilerOptions) === null || _c === void 0 ? void 0 : _c.types.includes('astro/astro-jsx'))) {
+                !configJson.compilerOptions?.types.includes('astro/astro-jsx')) {
                 configJson.compilerOptions.types.push('astro/astro-jsx');
             }
         }
@@ -203,7 +202,7 @@ async function createLanguageService(tsconfigPath, docContext, workspaceUris) {
         // Delete include so that .astro files don't get mistakenly excluded by the user
         delete configJson.include;
         // If the user supplied exclude, let's use theirs otherwise, use ours
-        (_d = configJson.exclude) !== null && _d !== void 0 ? _d : (configJson.exclude = getDefaultExclude());
+        configJson.exclude ?? (configJson.exclude = getDefaultExclude());
         // Everything here will always, unconditionally, be in the resulting config
         const forcedCompilerOptions = {
             noEmit: true,

package/dist/plugins/typescript/module-loader.js

@@ -39,7 +39,7 @@ class ModuleResolutionCache {
      */
     delete(resolvedModuleName) {
         this.cache.forEach((val, key) => {
-            if ((val === null || val === void 0 ? void 0 : val.resolvedFileName) === resolvedModuleName) {
+            if (val?.resolvedFileName === resolvedModuleName) {
                 this.cache.delete(key);
             }
         });

package/dist/plugins/typescript/previewer.js

@@ -72,7 +72,7 @@ function getTagBodyText(tag) {
 function getTagDocumentation(tag) {
     function getWithType() {
         const body = (typescript_1.default.displayPartsToString(tag.text) || '').split(/^(\S+)\s*-?\s*/);
-        if ((body === null || body === void 0 ? void 0 : body.length) === 3) {
+        if (body?.length === 3) {
             const param = body[1];
             const doc = body[2];
             const label = `*@${tag.name}* \`${param}\``;

package/dist/plugins/typescript/snapshots/SnapshotManager.js

@@ -129,7 +129,7 @@ class SnapshotManager {
         const { include, exclude } = this.fileSpec;
         // Since we default to not include anything,
         //  just don't waste time on this
-        if ((include === null || include === void 0 ? void 0 : include.length) === 0) {
+        if (include?.length === 0) {
             return;
         }
         const projectFiles = typescript_1.default.sys

package/dist/plugins/typescript/snapshots/utils.js

@@ -55,8 +55,7 @@ exports.createFromNonAstroFilePath = createFromNonAstroFilePath;
  * @param options options that apply in case it's a svelte file
  */
 function createFromTSFilePath(filePath) {
-    var _a;
-    const originalText = (_a = typescript_1.default.sys.readFile(filePath)) !== null && _a !== void 0 ? _a : '';
+    const originalText = typescript_1.default.sys.readFile(filePath) ?? '';
     return new DocumentSnapshot_1.TypeScriptDocumentSnapshot(0, filePath, originalText);
 }
 exports.createFromTSFilePath = createFromTSFilePath;
@@ -66,15 +65,13 @@ exports.createFromTSFilePath = createFromTSFilePath;
  * @param createDocument function that is used to create a document
  */
 function createFromAstroFilePath(filePath, createDocument) {
-    var _a;
-    const originalText = (_a = typescript_1.default.sys.readFile(filePath)) !== null && _a !== void 0 ? _a : '';
+    const originalText = typescript_1.default.sys.readFile(filePath) ?? '';
     return createFromDocument(createDocument(filePath, originalText));
 }
 exports.createFromAstroFilePath = createFromAstroFilePath;
 function createFromFrameworkFilePath(filePath, framework) {
-    var _a;
     const className = classNameFromFilename(filePath);
-    const originalText = (_a = typescript_1.default.sys.readFile(filePath)) !== null && _a !== void 0 ? _a : '';
+    const originalText = typescript_1.default.sys.readFile(filePath) ?? '';
     let code = '';
     if (framework === 'svelte') {
         code = (0, svelte_language_integration_1.toTSX)(originalText, className);

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

@@ -41,6 +41,7 @@ export declare function convertRange(document: {
 }): Range;
 export declare function convertToLocationRange(defDoc: SnapshotFragment, textSpan: ts.TextSpan): Range;
 export declare function ensureFrontmatterInsert(resultRange: Range, document: AstroDocument): Range;
+export declare function checkEndOfFileCodeInsert(resultRange: Range, document: AstroDocument): Range;
 export declare function removeAstroComponentSuffix(name: string): string;
 export declare type FrameworkExt = 'astro' | 'vue' | 'jsx' | 'tsx' | 'svelte';
 declare type FrameworkVirtualExt = 'ts' | 'tsx';

package/dist/plugins/typescript/utils.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ensureRealFilePath = exports.ensureRealAstroFilePath = exports.toRealAstroFilePath = exports.toVirtualFilePath = exports.toVirtualAstroFilePath = exports.isVirtualFilePath = exports.isVirtualSvelteFilePath = exports.isVirtualVueFilePath = exports.isVirtualAstroFilePath = exports.isFrameworkFilePath = exports.isAstroFilePath = exports.isVirtualFrameworkFilePath = exports.getFrameworkFromFilePath = exports.removeAstroComponentSuffix = exports.ensureFrontmatterInsert = exports.convertToLocationRange = exports.convertRange = exports.mapSeverity = exports.getScriptKindFromFileName = exports.isSubPath = exports.findTsConfigPath = exports.getExtensionFromScriptKind = exports.getCommitCharactersForScriptElement = exports.scriptElementKindToCompletionItemKind = exports.symbolKindFromString = exports.getSemanticTokenLegend = void 0;
+exports.ensureRealFilePath = exports.ensureRealAstroFilePath = exports.toRealAstroFilePath = exports.toVirtualFilePath = exports.toVirtualAstroFilePath = exports.isVirtualFilePath = exports.isVirtualSvelteFilePath = exports.isVirtualVueFilePath = exports.isVirtualAstroFilePath = exports.isFrameworkFilePath = exports.isAstroFilePath = exports.isVirtualFrameworkFilePath = exports.getFrameworkFromFilePath = exports.removeAstroComponentSuffix = exports.checkEndOfFileCodeInsert = exports.ensureFrontmatterInsert = exports.convertToLocationRange = exports.convertRange = exports.mapSeverity = exports.getScriptKindFromFileName = exports.isSubPath = exports.findTsConfigPath = exports.getExtensionFromScriptKind = exports.getCommitCharactersForScriptElement = exports.scriptElementKindToCompletionItemKind = exports.symbolKindFromString = exports.getSemanticTokenLegend = void 0;
 const typescript_1 = __importDefault(require("typescript"));
 const path_1 = require("path");
 const utils_1 = require("../../utils");
@@ -251,6 +251,18 @@ function ensureFrontmatterInsert(resultRange, document) {
     return resultRange;
 }
 exports.ensureFrontmatterInsert = ensureFrontmatterInsert;
+// Some code actions ill insert code at the end of the generated TSX file, so we'll manually
+// redirect it to the end of the frontmatter instead
+function checkEndOfFileCodeInsert(resultRange, document) {
+    if (resultRange.start.line > document.lineCount) {
+        if (document.astroMeta.frontmatter.state === 'closed') {
+            const position = document.positionAt(document.astroMeta.frontmatter.endOffset);
+            return vscode_languageserver_1.Range.create(position, position);
+        }
+    }
+    return resultRange;
+}
+exports.checkEndOfFileCodeInsert = checkEndOfFileCodeInsert;
 function removeAstroComponentSuffix(name) {
     return name.replace(/(\w+)__AstroComponent_/, '$1');
 }