@astrojs/language-server 0.13.3 → 0.15.0

package/CHANGELOG.md

@@ -1,5 +1,39 @@
 # @astrojs/language-server
 
+## 0.15.0
+
+### Minor Changes
+
+- 6bb45cb: Overhaul TypeScript completions
+
+  - Add support for completions inside expressions
+  - Add support for auto imports on completion
+  - Fix misc issues in completions (missing description, deprecated stuff not showing as deprecated)
+
+### Patch Changes
+
+- 7978de1: Add support for folding JavaScript
+- 3ac74bc: Improve props completions on components
+- Updated dependencies [6bb45cb]
+  - @astrojs/svelte-language-integration@0.1.3
+
+## 0.14.0
+
+### Minor Changes
+
+- 9118c46: Add support for loading type definitions from Astro itself
+
+### Patch Changes
+
+- 9ea5b97: Make TypeScript ignore content of Markdown tags
+- dbf624a: Fix error when returning a response from the frontmatter
+
+## 0.13.4
+
+### Patch Changes
+
+- 5874655: Add support for Astro 0.26.0 attributes
+
 ## 0.13.3
 
 ### Patch Changes

package/dist/core/documents/utils.d.ts

@@ -11,9 +11,15 @@ export interface TagInformation {
         start: number;
         end: number;
     };
+    closed: boolean;
 }
 export declare function walk(node: Node): Generator<Node, void, unknown>;
 export declare function extractStyleTags(source: string, html?: HTMLDocument): TagInformation[];
+export declare function getLineAtPosition(position: Position, text: string): string;
+/**
+ * Returns the node if offset is inside a HTML start tag
+ */
+export declare function getNodeIfIsInHTMLStartTag(html: HTMLDocument, offset: number): Node | undefined;
 /**
  * Return if a Node is a Component
  */

package/dist/core/documents/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getFirstNonWhitespaceIndex = exports.getLineOffsets = exports.offsetAt = exports.positionAt = exports.isInsideFrontmatter = exports.isInsideExpression = exports.isInTag = exports.isInComponentStartTag = exports.isComponentTag = exports.extractStyleTags = exports.walk = void 0;
+exports.getFirstNonWhitespaceIndex = exports.getLineOffsets = exports.offsetAt = exports.positionAt = exports.isInsideFrontmatter = exports.isInsideExpression = exports.isInTag = exports.isInComponentStartTag = exports.isComponentTag = exports.getNodeIfIsInHTMLStartTag = exports.getLineAtPosition = exports.extractStyleTags = exports.walk = void 0;
 const vscode_languageserver_1 = require("vscode-languageserver");
 const utils_1 = require("../../utils");
 const parseHtml_1 = require("./parseHtml");
@@ -48,6 +48,8 @@ function extractTags(text, tag, html) {
             startPos,
             endPos,
             container,
+            // vscode-html-languageservice types does not contain this, despite it existing. Annoying
+            closed: matchedNode.closed,
         };
     }
 }
@@ -77,6 +79,20 @@ function parseAttributes(rawAttrs) {
         return attrValue;
     }
 }
+function getLineAtPosition(position, text) {
+    return text.substring(offsetAt({ line: position.line, character: 0 }, text), offsetAt({ line: position.line, character: Number.MAX_VALUE }, text));
+}
+exports.getLineAtPosition = getLineAtPosition;
+/**
+ * Returns the node if offset is inside a HTML start tag
+ */
+function getNodeIfIsInHTMLStartTag(html, offset) {
+    const node = html.findNodeAt(offset);
+    if (!!node.tag && node.tag[0] === node.tag[0].toLowerCase() && (!node.startTagEnd || offset < node.startTagEnd)) {
+        return node;
+    }
+}
+exports.getNodeIfIsInHTMLStartTag = getNodeIfIsInHTMLStartTag;
 /**
  * Return if a Node is a Component
  */

package/dist/plugins/PluginHost.d.ts

@@ -12,7 +12,7 @@ export declare class PluginHost {
     constructor(docManager: DocumentManager);
     initialize(pluginHostConfig: PluginHostConfig): void;
     registerPlugin(plugin: Plugin): void;
-    getCompletions(textDocument: TextDocumentIdentifier, position: Position, completionContext?: CompletionContext): Promise<CompletionList>;
+    getCompletions(textDocument: TextDocumentIdentifier, position: Position, completionContext?: CompletionContext, cancellationToken?: CancellationToken): Promise<CompletionList>;
     resolveCompletion(textDocument: TextDocumentIdentifier, completionItem: AppCompletionItem): Promise<CompletionItem>;
     getDiagnostics(textDocument: TextDocumentIdentifier): Promise<Diagnostic[]>;
     doHover(textDocument: TextDocumentIdentifier, position: Position): Promise<Hover | null>;

package/dist/plugins/PluginHost.js

@@ -3,6 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PluginHost = void 0;
 const vscode_languageserver_1 = require("vscode-languageserver");
 const lodash_1 = require("lodash");
+const utils_1 = require("../utils");
+const documents_1 = require("../core/documents");
 var ExecuteMode;
 (function (ExecuteMode) {
     ExecuteMode[ExecuteMode["None"] = 0] = "None";
@@ -24,11 +26,34 @@ class PluginHost {
     registerPlugin(plugin) {
         this.plugins.push(plugin);
     }
-    async getCompletions(textDocument, position, completionContext) {
+    async getCompletions(textDocument, position, completionContext, cancellationToken) {
         const document = this.getDocument(textDocument.uri);
-        const completions = (await this.execute('getCompletions', [document, position, completionContext], ExecuteMode.Collect)).filter((completion) => completion != null);
-        let flattenedCompletions = (0, lodash_1.flatten)(completions.map((completion) => completion.items));
-        const isIncomplete = completions.reduce((incomplete, completion) => incomplete || completion.isIncomplete, false);
+        const completions = await Promise.all(this.plugins.map(async (plugin) => {
+            const result = await this.tryExecutePlugin(plugin, 'getCompletions', [document, position, completionContext, cancellationToken], null);
+            if (result) {
+                return { result: result, plugin: plugin.__name };
+            }
+        })).then((fullCompletions) => fullCompletions.filter(utils_1.isNotNullOrUndefined));
+        const html = completions.find((completion) => completion.plugin === 'html');
+        const ts = completions.find((completion) => completion.plugin === 'typescript');
+        const astro = completions.find((completion) => completion.plugin === 'astro');
+        if (html && ts) {
+            if ((0, documents_1.getNodeIfIsInHTMLStartTag)(document.html, document.offsetAt(position))) {
+                ts.result.items = [];
+            }
+            // If the Astro plugin has completions for us, don't show TypeScript's as they're most likely duplicates
+            if (astro && astro.result.items.length > 0 && (0, documents_1.isInComponentStartTag)(document.html, document.offsetAt(position))) {
+                ts.result.items = [];
+            }
+            ts.result.items = ts.result.items.map((item) => {
+                if (item.sortText != '-1') {
+                    item.sortText = 'Z' + (item.sortText || '');
+                }
+                return item;
+            });
+        }
+        let flattenedCompletions = (0, lodash_1.flatten)(completions.map((completion) => completion.result.items));
+        const isIncomplete = completions.reduce((incomplete, completion) => incomplete || completion.result.isIncomplete, false);
         return vscode_languageserver_1.CompletionList.create(flattenedCompletions, isIncomplete);
     }
     async resolveCompletion(textDocument, completionItem) {

package/dist/plugins/astro/AstroPlugin.d.ts

@@ -9,7 +9,7 @@ export declare class AstroPlugin implements Plugin {
     private readonly completionProvider;
     constructor(docManager: DocumentManager, configManager: ConfigManager, workspaceUris: string[]);
     getCompletions(document: AstroDocument, position: Position, completionContext?: CompletionContext): Promise<AppCompletionList | null>;
-    getFoldingRanges(document: AstroDocument): Promise<FoldingRange[]>;
+    getFoldingRanges(document: AstroDocument): FoldingRange[];
     getDefinitions(document: AstroDocument, position: Position): Promise<DefinitionLink[]>;
     private isInsideFrontmatter;
     private isComponentTag;

package/dist/plugins/astro/AstroPlugin.js

@@ -22,7 +22,7 @@ class AstroPlugin {
         const completions = this.completionProvider.getCompletions(document, position, completionContext);
         return completions;
     }
-    async getFoldingRanges(document) {
+    getFoldingRanges(document) {
         const foldingRanges = [];
         const { frontmatter } = document.astroMeta;
         // Currently editing frontmatter, don't fold

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

@@ -1,8 +1,8 @@
-import type { AppCompletionList } from '../../interfaces';
+import type { AppCompletionList, CompletionsProvider } from '../../interfaces';
 import type { AstroDocument, DocumentManager } from '../../../core/documents';
 import { CompletionContext, Position } from 'vscode-languageserver';
 import { LanguageServiceManager as TypeScriptLanguageServiceManager } from '../../typescript/LanguageServiceManager';
-export declare class CompletionsProviderImpl {
+export declare class CompletionsProviderImpl implements CompletionsProvider {
     private readonly docManager;
     private readonly languageServiceManager;
     directivesHTMLLang: import("vscode-html-languageservice").LanguageService;

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

@@ -31,19 +31,18 @@ class CompletionsProviderImpl {
             if (frontmatter)
                 items.push(frontmatter);
         }
+        const html = document.html;
         const offset = document.offsetAt(position);
-        if (!(0, utils_1.isInsideFrontmatter)(document.getText(), offset)) {
+        const node = html.findNodeAt(offset);
+        if ((0, utils_1.isInComponentStartTag)(html, offset) && !(0, utils_1.isInsideExpression)(document.getText(), node.start, offset)) {
             const props = await this.getPropCompletions(document, position, completionContext);
             if (props.length) {
                 items.push(...props);
             }
-        }
-        const html = document.html;
-        if ((0, utils_1.isInComponentStartTag)(html, offset)) {
-            const node = html.findNodeAt(offset);
             const isAstro = await this.isAstroComponent(document, node);
             if (!isAstro) {
-                items.push(...(0, utils_4.removeDataAttrCompletion)(this.directivesHTMLLang.doComplete(document, position, html).items));
+                const directives = (0, utils_4.removeDataAttrCompletion)(this.directivesHTMLLang.doComplete(document, position, html).items);
+                items.push(...directives);
             }
         }
         return vscode_languageserver_1.CompletionList.create(items, true);
@@ -124,7 +123,8 @@ class CompletionsProviderImpl {
         // Add completions for this component's props type properties
         const properties = componentType.getProperties().filter((property) => property.name !== 'children') || [];
         properties.forEach((property) => {
-            let completionItem = this.getCompletionItemForProperty(property, typeChecker);
+            const type = typeChecker.getTypeOfSymbolAtLocation(property, imp);
+            let completionItem = this.getCompletionItemForProperty(property, typeChecker, type);
             completionItems.push(completionItem);
         });
         // Ensure that props shows up first as a completion, despite this plugin being ran after the HTML one
@@ -181,10 +181,25 @@ class CompletionsProviderImpl {
         }
         return null;
     }
-    getCompletionItemForProperty(mem, typeChecker) {
+    getCompletionItemForProperty(mem, typeChecker, type) {
+        const typeString = typeChecker.typeToString(type);
+        let insertText = mem.name;
+        switch (typeString) {
+            case 'string':
+                insertText = `${mem.name}="$1"`;
+                break;
+            case 'boolean':
+                insertText = mem.name;
+                break;
+            default:
+                insertText = `${mem.name}={$1}`;
+                break;
+        }
         let item = {
             label: mem.name,
-            insertText: mem.name,
+            detail: typeString,
+            insertText: insertText,
+            insertTextFormat: vscode_languageserver_1.InsertTextFormat.Snippet,
             commitCharacters: [],
         };
         mem.getDocumentationComment(typeChecker);

package/dist/plugins/css/CSSPlugin.js

@@ -25,6 +25,12 @@ class CSSPlugin {
             return null;
         }
         const styleTag = this.getStyleTagForPosition(document, position);
+        // We technically can return results even for open tags, however, a lot of the info returned is not valid
+        // Since most editors will automatically close the tag before the user start working in them, this shouldn't be a problem
+        if (styleTag && !styleTag.closed) {
+            return null;
+        }
+        // If we don't have a style tag at this position, we might be in a style property instead, let's check
         if (!styleTag) {
             const attributeContext = (0, parseHtml_1.getAttributeContextAtPosition)(document, position);
             if (!attributeContext) {
@@ -61,7 +67,9 @@ class CSSPlugin {
             return null;
         }
         const styleTag = this.getStyleTagForPosition(document, position);
-        // If we don't have a style tag at this position, we might be in a style property instead, let's check
+        if (styleTag && !styleTag.closed) {
+            return null;
+        }
         if (!styleTag) {
             const attributeContext = (0, parseHtml_1.getAttributeContextAtPosition)(document, position);
             if (!attributeContext) {

package/dist/plugins/css/features/astro-selectors.js

@@ -4,8 +4,7 @@ exports.pseudoClass = void 0;
 exports.pseudoClass = [
     {
         name: ':global()',
-        description: `[astro] :global modifier
-Apply styles to a selector globally`,
+        description: 'Apply styles to a selector globally',
         references: [
             {
                 name: 'Astro documentation',

package/dist/plugins/html/features/astro-attributes.js

@@ -43,7 +43,7 @@ exports.astroAttributes = (0, vscode_html_languageservice_1.newHTMLDataProvider)
                     // The VS Code tag definitions does not provide a description for the deprecated `charset` attribute on script tags
                     // Which mean that since we get no hover info for this, we instead get JSX hover info. So we'll just specify a description ourselves for this specific case
                     name: 'charset',
-                    description: "(Deprecated) It's unnecessary to specify the charset attribute, because documents must use UTF-8, and the script element inherits its character encoding from the document.",
+                    description: "**Deprecated**\n\nIt's unnecessary to specify the charset attribute, because documents must use UTF-8, and the script element inherits its character encoding from the document.",
                 },
                 {
                     name: 'define:vars',
@@ -55,6 +55,28 @@ exports.astroAttributes = (0, vscode_html_languageservice_1.newHTMLDataProvider)
                         },
                     ],
                 },
+                {
+                    name: 'hoist',
+                    description: '**Deprecated in Astro >= 0.26.0**\n\nBuilds, optimizes, and bundles your script with the other JavaScript on the page',
+                    valueSet: 'v',
+                    references: [
+                        {
+                            name: 'Astro documentation',
+                            url: 'https://docs.astro.build/en/core-concepts/astro-components/#using-hoisted-scripts',
+                        },
+                    ],
+                },
+                {
+                    name: 'is:inline',
+                    description: 'Leave a script tag inline in the page template. No processing will be done on its content',
+                    valueSet: 'v',
+                    references: [
+                        {
+                            name: 'Astro documentation',
+                            url: 'https://docs.astro.build/en/migrate/#new-default-script-behavior',
+                        },
+                    ],
+                },
             ],
         },
         {
@@ -70,6 +92,39 @@ exports.astroAttributes = (0, vscode_html_languageservice_1.newHTMLDataProvider)
                         },
                     ],
                 },
+                {
+                    name: 'global',
+                    description: '**Deprecated in favor of `is:global` in >= Astro 0.26.0**\n\nOpts-out of automatic CSS scoping, all contents will be available globally',
+                    valueSet: 'v',
+                    references: [
+                        {
+                            name: 'Astro documentation',
+                            url: 'https://docs.astro.build/en/guides/styling/#global-styles',
+                        },
+                    ],
+                },
+                {
+                    name: 'is:global',
+                    description: 'Opts-out of automatic CSS scoping, all contents will be available globally',
+                    valueSet: 'v',
+                    references: [
+                        {
+                            name: 'Astro documentation',
+                            url: 'https://docs.astro.build/en/guides/styling/#global-styles',
+                        },
+                    ],
+                },
+                {
+                    name: 'is:inline',
+                    description: 'Leave a style tag inline in the page template. No processing will be done on its content',
+                    valueSet: 'v',
+                    references: [
+                        {
+                            name: 'Astro documentation',
+                            url: 'https://docs.astro.build/en/migrate/#new-default-script-behavior',
+                        },
+                    ],
+                },
             ],
         },
     ],

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

@@ -1,6 +1,6 @@
 import { CompletionItem } from 'vscode-languageserver-types';
 /**
  * The VS Code HTML language service provides a completion for data attributes that is independent from
- * data providers, which mean that you can't disable it, so this function removes them from a completionList
+ * data providers, which mean that you can't disable it, so this function removes them from completions
  */
 export declare function removeDataAttrCompletion(items: CompletionItem[]): CompletionItem[];

package/dist/plugins/html/utils.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.removeDataAttrCompletion = void 0;
 /**
  * The VS Code HTML language service provides a completion for data attributes that is independent from
- * data providers, which mean that you can't disable it, so this function removes them from a completionList
+ * data providers, which mean that you can't disable it, so this function removes them from completions
  */
 function removeDataAttrCompletion(items) {
     return items.filter((item) => !item.label.startsWith('data-'));

package/dist/plugins/interfaces.d.ts

@@ -13,7 +13,7 @@ export interface DiagnosticsProvider {
 export interface HoverProvider {
     doHover(document: TextDocument, position: Position): Resolvable<Hover | null>;
 }
-export interface FoldingRangeProvider {
+export interface FoldingRangesProvider {
     getFoldingRanges(document: TextDocument): Resolvable<FoldingRange[] | null>;
 }
 export interface CompletionsProvider<T extends TextDocumentIdentifier = any> {
@@ -81,7 +81,7 @@ export interface OnWatchFileChangesProvider {
 export interface UpdateNonAstroFile {
     updateNonAstroFile(fileName: string, changes: TextDocumentContentChangeEvent[]): void;
 }
-declare type ProviderBase = DiagnosticsProvider & HoverProvider & CompletionsProvider & DefinitionsProvider & FormattingProvider & FoldingRangeProvider & TagCompleteProvider & DocumentColorsProvider & ColorPresentationsProvider & DocumentSymbolsProvider & UpdateImportsProvider & CodeActionsProvider & FindReferencesProvider & RenameProvider & SignatureHelpProvider & SemanticTokensProvider & SelectionRangeProvider & OnWatchFileChangesProvider & LinkedEditingRangesProvider & UpdateNonAstroFile;
+declare type ProviderBase = DiagnosticsProvider & HoverProvider & CompletionsProvider & DefinitionsProvider & FormattingProvider & FoldingRangesProvider & TagCompleteProvider & DocumentColorsProvider & ColorPresentationsProvider & DocumentSymbolsProvider & UpdateImportsProvider & CodeActionsProvider & FindReferencesProvider & RenameProvider & SignatureHelpProvider & SemanticTokensProvider & SelectionRangeProvider & OnWatchFileChangesProvider & LinkedEditingRangesProvider & UpdateNonAstroFile;
 export declare type LSProvider = ProviderBase;
 export declare type Plugin = Partial<ProviderBase> & {
     __name: string;

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

@@ -1,8 +1,8 @@
-import { CancellationToken, CompletionContext, DefinitionLink, Diagnostic, Hover, Position, Range, SemanticTokens, SignatureHelp, SignatureHelpContext, SymbolInformation, TextDocumentContentChangeEvent, WorkspaceEdit } from 'vscode-languageserver';
+import { CancellationToken, CompletionContext, DefinitionLink, Diagnostic, FoldingRange, Hover, Position, Range, SemanticTokens, SignatureHelp, SignatureHelpContext, SymbolInformation, TextDocumentContentChangeEvent, WorkspaceEdit } from 'vscode-languageserver';
 import { ConfigManager } from '../../core/config';
 import { AstroDocument, DocumentManager } from '../../core/documents';
 import { AppCompletionItem, AppCompletionList, OnWatchFileChangesParam, Plugin } from '../interfaces';
-import { CompletionEntryWithIdentifer } from './features/CompletionsProvider';
+import { CompletionItemData } from './features/CompletionsProvider';
 export declare class TypeScriptPlugin implements Plugin {
     __name: string;
     private configManager;
@@ -13,13 +13,15 @@ export declare class TypeScriptPlugin implements Plugin {
     private readonly diagnosticsProvider;
     private readonly documentSymbolsProvider;
     private readonly semanticTokensProvider;
+    private readonly foldingRangesProvider;
     constructor(docManager: DocumentManager, configManager: ConfigManager, workspaceUris: string[]);
     doHover(document: AstroDocument, position: Position): Promise<Hover | null>;
     rename(document: AstroDocument, position: Position, newName: string): Promise<WorkspaceEdit | null>;
+    getFoldingRanges(document: AstroDocument): Promise<FoldingRange[] | null>;
     getSemanticTokens(textDocument: AstroDocument, range?: Range, cancellationToken?: CancellationToken): Promise<SemanticTokens | null>;
     getDocumentSymbols(document: AstroDocument): Promise<SymbolInformation[]>;
-    getCompletions(document: AstroDocument, position: Position, completionContext?: CompletionContext): Promise<AppCompletionList<CompletionEntryWithIdentifer> | null>;
-    resolveCompletion(document: AstroDocument, completionItem: AppCompletionItem<CompletionEntryWithIdentifer>): Promise<AppCompletionItem<CompletionEntryWithIdentifer>>;
+    getCompletions(document: AstroDocument, position: Position, completionContext?: CompletionContext, cancellationToken?: CancellationToken): Promise<AppCompletionList<CompletionItemData> | null>;
+    resolveCompletion(document: AstroDocument, completionItem: AppCompletionItem<CompletionItemData>, cancellationToken?: CancellationToken): Promise<AppCompletionItem<CompletionItemData>>;
     getDefinitions(document: AstroDocument, position: Position): Promise<DefinitionLink[]>;
     getDiagnostics(document: AstroDocument, cancellationToken?: CancellationToken): Promise<Diagnostic[]>;
     onWatchFileChanges(onWatchFileChangesParas: OnWatchFileChangesParam[]): Promise<void>;

package/dist/plugins/typescript/TypeScriptPlugin.js

@@ -37,6 +37,7 @@ const LanguageServiceManager_1 = require("./LanguageServiceManager");
 const utils_3 = require("./utils");
 const DocumentSymbolsProvider_1 = require("./features/DocumentSymbolsProvider");
 const SemanticTokenProvider_1 = require("./features/SemanticTokenProvider");
+const FoldingRangesProvider_1 = require("./features/FoldingRangesProvider");
 class TypeScriptPlugin {
     constructor(docManager, configManager, workspaceUris) {
         this.__name = 'typescript';
@@ -48,6 +49,7 @@ class TypeScriptPlugin {
         this.diagnosticsProvider = new DiagnosticsProvider_1.DiagnosticsProviderImpl(this.languageServiceManager);
         this.documentSymbolsProvider = new DocumentSymbolsProvider_1.DocumentSymbolsProviderImpl(this.languageServiceManager);
         this.semanticTokensProvider = new SemanticTokenProvider_1.SemanticTokensProviderImpl(this.languageServiceManager);
+        this.foldingRangesProvider = new FoldingRangesProvider_1.FoldingRangesProviderImpl(this.languageServiceManager);
     }
     async doHover(document, position) {
         if (!this.featureEnabled('hover')) {
@@ -78,7 +80,13 @@ class TypeScriptPlugin {
         });
         return edit;
     }
+    async getFoldingRanges(document) {
+        return this.foldingRangesProvider.getFoldingRanges(document);
+    }
     async getSemanticTokens(textDocument, range, cancellationToken) {
+        if (!this.featureEnabled('semanticTokens')) {
+            return null;
+        }
         return this.semanticTokensProvider.getSemanticTokens(textDocument, range, cancellationToken);
     }
     async getDocumentSymbols(document) {
@@ -88,15 +96,15 @@ class TypeScriptPlugin {
         const symbols = await this.documentSymbolsProvider.getDocumentSymbols(document);
         return symbols;
     }
-    async getCompletions(document, position, completionContext) {
+    async getCompletions(document, position, completionContext, cancellationToken) {
         if (!this.featureEnabled('completions')) {
             return null;
         }
-        const completions = await this.completionProvider.getCompletions(document, position, completionContext);
+        const completions = await this.completionProvider.getCompletions(document, position, completionContext, cancellationToken);
         return completions;
     }
-    async resolveCompletion(document, completionItem) {
-        return this.completionProvider.resolveCompletion(document, completionItem);
+    async resolveCompletion(document, completionItem, cancellationToken) {
+        return this.completionProvider.resolveCompletion(document, completionItem, cancellationToken);
     }
     async getDefinitions(document, position) {
         const { lang, tsDoc } = await this.languageServiceManager.getLSAndTSDoc(document);

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

@@ -1,5 +1,5 @@
 interface Astro2TSXResult {
     code: string;
 }
-export default function (content: string): Astro2TSXResult;
+export default function (content: string, className: string): Astro2TSXResult;
 export {};

package/dist/plugins/typescript/astro2tsx.js

@@ -2,17 +2,17 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const os_1 = require("os");
 const parseAstro_1 = require("../../core/documents/parseAstro");
-function addProps(content) {
+function addProps(content, className) {
     let defaultExportType = 'Record<string, any>';
     if (/(interface|type) Props/.test(content)) {
         defaultExportType = 'Props';
     }
-    return os_1.EOL + `export default function (_props: ${defaultExportType}) { return <div></div>; }`;
+    return os_1.EOL + `export default function ${className}__AstroComponent_(_props: ${defaultExportType}): any {}`;
 }
 function escapeTemplateLiteralContent(content) {
     return content.replace(/`/g, '\\`');
 }
-function default_1(content) {
+function default_1(content, className) {
     var _a, _b;
     let result = {
         code: '',
@@ -24,8 +24,9 @@ function default_1(content) {
         frontMatterRaw = content
             .substring((_a = astroDocument.frontmatter.startOffset) !== null && _a !== void 0 ? _a : 0, ((_b = astroDocument.frontmatter.endOffset) !== null && _b !== void 0 ? _b : 0) + 3)
             // Handle case where semicolons is not used in the frontmatter section
+            // We need to add something before the semi-colon or TypeScript won't be able to do completions
             .replace(/((?!^)(?<!;)\n)(---)/g, (_whole, start, _dashes) => {
-            return start + ';' + '//';
+            return start + '"";';
         })
             // Replace frontmatter marks with comments
             .replace(/---/g, '///');
@@ -38,9 +39,13 @@ function default_1(content) {
         .replace(/<\s*!--([^-->]*)(.*?)-->/gs, (whole) => {
         return `{/*${whole}*/}`;
     })
-        // Turn styles into internal strings
+        // Turn styles tags into internal strings
         .replace(/<\s*style([^>]*)>(.*?)<\s*\/\s*style>/gs, (_whole, attrs, children) => {
         return `<style${attrs}>{\`${escapeTemplateLiteralContent(children)}\`}</style>`;
+    })
+        // Turn Markdown tags into internal strings
+        .replace(/<\s*Markdown([^>]*)>(.*?)<\s*\/\s*Markdown>/gs, (_whole, attrs, children) => {
+        return `<Markdown${attrs}>{\`${escapeTemplateLiteralContent(children)}\`}</Markdown>`;
     })
         // Turn scripts into function calls
         .replace(/<\s*script([^\/>]*)>(.*?)<\s*\/\s*script>/gs, (_whole, attrs, children, offset) => {
@@ -76,7 +81,7 @@ function default_1(content) {
             htmlRaw +
             os_1.EOL +
             // Add TypeScript definitions
-            addProps(frontMatterRaw);
+            addProps(frontMatterRaw, className);
     return result;
 }
 exports.default = default_1;

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

@@ -1,16 +1,33 @@
-import type { CompletionContext, Position, TextDocumentIdentifier } from 'vscode-languageserver';
+import { CompletionContext, Position, TextDocumentIdentifier, TextEdit, CancellationToken } from 'vscode-languageserver';
 import type { LanguageServiceManager } from '../LanguageServiceManager';
 import { AstroDocument } from '../../../core/documents';
 import ts from 'typescript';
 import { AppCompletionItem, AppCompletionList, CompletionsProvider } from '../../interfaces';
-export interface CompletionEntryWithIdentifer extends ts.CompletionEntry, TextDocumentIdentifier {
-    position: Position;
+import { AstroSnapshotFragment } from '../snapshots/DocumentSnapshot';
+export interface CompletionItemData extends TextDocumentIdentifier {
+    filePath: string;
+    offset: number;
+    originalItem: ts.CompletionEntry;
 }
-export declare class CompletionsProviderImpl implements CompletionsProvider<CompletionEntryWithIdentifer> {
+export declare class CompletionsProviderImpl implements CompletionsProvider<CompletionItemData> {
     private languageServiceManager;
     constructor(languageServiceManager: LanguageServiceManager);
-    getCompletions(document: AstroDocument, position: Position, _completionContext?: CompletionContext): Promise<AppCompletionList<CompletionEntryWithIdentifer> | null>;
-    resolveCompletion(document: AstroDocument, completionItem: AppCompletionItem<CompletionEntryWithIdentifer>): Promise<AppCompletionItem<CompletionEntryWithIdentifer>>;
+    private readonly validTriggerCharacters;
+    private isValidTriggerCharacter;
+    private lastCompletion?;
+    getCompletions(document: AstroDocument, position: Position, completionContext?: CompletionContext, cancellationToken?: CancellationToken): Promise<AppCompletionList<CompletionItemData> | null>;
+    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
+     * vscode would refuse to show the completions
+     * split those edits into additionalTextEdit to fix it
+     */
+    private fixTextEditRange;
+    private canReuseLastCompletion;
+    private getExistingImports;
+    private isAstroComponentImport;
 }