@astrojs/language-server 0.14.0 → 0.16.1

package/CHANGELOG.md

@@ -1,5 +1,44 @@
 # @astrojs/language-server
 
+## 0.16.1
+
+### Patch Changes
+
+- ad5a5e5: Fix misc issues with Go To Definition
+- 1bd790d: Updates config management, make sure to respect TypeScript settings when doing completions and quickfixes
+
+## 0.16.0
+
+### Minor Changes
+
+- 9abff62: Add support for code actions
+
+### Patch Changes
+
+- b485acd: Fixed bug where nonexistent server settings would result in a crash
+- 1cff04c: Fix Emmet settings not being loaded, add support for Emmet in CSS
+- 1bcae45: Remove support for Node 12 (VS Code versions under 1.56)
+- c8d81a1: Update directives tooltips, add missing `is:raw`
+- Updated dependencies [1bcae45]
+  - @astrojs/svelte-language-integration@0.1.4
+
+## 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

package/dist/check.js

@@ -37,11 +37,10 @@ class AstroCheck {
         this.pluginHost.registerPlugin(new plugins_1.TypeScriptPlugin(this.docManager, this.configManager, [workspacePath]));
     }
     async getDiagnosticsForFile(uri) {
-        var _a;
         const diagnostics = await this.pluginHost.getDiagnostics({ uri });
         return {
             filePath: new URL(uri).pathname || '',
-            text: ((_a = this.docManager.get(uri)) === null || _a === void 0 ? void 0 : _a.getText()) || '',
+            text: this.docManager.get(uri)?.getText() || '',
             diagnostics,
         };
     }

package/dist/core/config/ConfigManager.d.ts

@@ -1,5 +1,9 @@
 import { VSCodeEmmetConfig } from '@vscode/emmet-helper';
-import { LSConfig } from './interfaces';
+import { LSConfig, LSCSSConfig, LSHTMLConfig, LSTypescriptConfig } from './interfaces';
+import { Connection } from 'vscode-languageserver';
+import { TextDocument } from 'vscode-languageserver-textdocument';
+import { FormatCodeSettings, UserPreferences } from 'typescript';
+export declare const defaultLSConfig: LSConfig;
 declare type DeepPartial<T> = T extends Record<string, unknown> ? {
     [P in keyof T]?: DeepPartial<T[P]>;
 } : T;
@@ -9,25 +13,25 @@ declare type DeepPartial<T> = T extends Record<string, unknown> ? {
  * For more info on this, see the [internal docs](../../../../../docs/internal/language-server/config.md)
  */
 export declare class ConfigManager {
-    private config;
-    private emmetConfig;
+    private globalConfig;
+    private documentSettings;
     private isTrusted;
-    updateConfig(config: DeepPartial<LSConfig>): void;
-    updateEmmetConfig(config: VSCodeEmmetConfig): void;
-    getEmmetConfig(): VSCodeEmmetConfig;
+    private connection;
+    constructor(connection?: Connection);
+    updateConfig(): void;
+    removeDocument(scopeUri: string): void;
+    getConfig<T>(section: string, scopeUri: string): Promise<T>;
+    getEmmetConfig(document: TextDocument): Promise<VSCodeEmmetConfig>;
+    getTSFormatConfig(document: TextDocument): Promise<FormatCodeSettings>;
+    getTSPreferences(document: TextDocument): Promise<UserPreferences>;
     /**
-     * Whether or not specified setting is enabled
-     * @param key a string which is a path. Example: 'astro.diagnostics.enabled'.
+     * Return true if a plugin and an optional feature is enabled
      */
-    enabled(key: string): boolean;
+    isEnabled(document: TextDocument, plugin: keyof LSConfig, feature?: keyof LSTypescriptConfig | keyof LSCSSConfig | keyof LSHTMLConfig): Promise<boolean>;
     /**
-     * Get a specific setting value
-     * @param key a string which is a path. Example: 'astro.diagnostics.enable'.
+     * Updating the global config should only be done in cases where the client doesn't support `workspace/configuration`
+     * or inside of tests
      */
-    get<T>(key: string): T;
-    /**
-     * Get the entire user configuration
-     */
-    getFullConfig(): Readonly<LSConfig>;
+    updateGlobalConfig(config: DeepPartial<LSConfig>): void;
 }
 export {};

package/dist/core/config/ConfigManager.js

@@ -1,43 +1,27 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ConfigManager = void 0;
+exports.ConfigManager = exports.defaultLSConfig = void 0;
 const lodash_1 = require("lodash");
-const defaultLSConfig = {
-    astro: {
-        enabled: true,
-        diagnostics: { enabled: true },
-        rename: { enabled: true },
-        format: { enabled: true },
-        completions: { enabled: true },
-        hover: { enabled: true },
-        codeActions: { enabled: true },
-        selectionRange: { enabled: true },
-    },
+const typescript_1 = require("typescript");
+exports.defaultLSConfig = {
     typescript: {
         enabled: true,
         diagnostics: { enabled: true },
         hover: { enabled: true },
         completions: { enabled: true },
         definitions: { enabled: true },
-        findReferences: { enabled: true },
         documentSymbols: { enabled: true },
         codeActions: { enabled: true },
         rename: { enabled: true },
-        selectionRange: { enabled: true },
         signatureHelp: { enabled: true },
         semanticTokens: { enabled: true },
-        implementation: { enabled: true },
-        typeDefinition: { enabled: true },
     },
     css: {
         enabled: true,
-        diagnostics: { enabled: true },
         hover: { enabled: true },
         completions: { enabled: true, emmet: true },
         documentColors: { enabled: true },
-        colorPresentations: { enabled: true },
         documentSymbols: { enabled: true },
-        selectionRange: { enabled: true },
     },
     html: {
         enabled: true,
@@ -45,8 +29,6 @@ const defaultLSConfig = {
         completions: { enabled: true, emmet: true },
         tagComplete: { enabled: true },
         documentSymbols: { enabled: true },
-        renameTags: { enabled: true },
-        linkedEditing: { enabled: true },
     },
 };
 /**
@@ -55,42 +37,126 @@ const defaultLSConfig = {
  * For more info on this, see the [internal docs](../../../../../docs/internal/language-server/config.md)
  */
 class ConfigManager {
-    constructor() {
-        this.config = defaultLSConfig;
-        this.emmetConfig = {};
+    constructor(connection) {
+        this.globalConfig = { astro: exports.defaultLSConfig };
+        this.documentSettings = {};
         this.isTrusted = true;
+        this.connection = connection;
     }
-    updateConfig(config) {
-        // Ideally we shouldn't need the merge here because all updates should be valid and complete configs.
-        // But since those configs come from the client they might be out of synch with the valid config:
-        // We might at some point in the future forget to synch config settings in all packages after updating the config.
-        this.config = (0, lodash_1.merge)({}, defaultLSConfig, this.config, config);
+    updateConfig() {
+        // Reset all cached document settings
+        this.documentSettings = {};
     }
-    updateEmmetConfig(config) {
-        this.emmetConfig = config || {};
+    removeDocument(scopeUri) {
+        delete this.documentSettings[scopeUri];
     }
-    getEmmetConfig() {
-        return this.emmetConfig;
+    async getConfig(section, scopeUri) {
+        if (!this.connection) {
+            return this.globalConfig[section];
+        }
+        if (!this.documentSettings[scopeUri]) {
+            this.documentSettings[scopeUri] = {};
+        }
+        if (!this.documentSettings[scopeUri][section]) {
+            this.documentSettings[scopeUri][section] = await this.connection.workspace.getConfiguration({
+                scopeUri,
+                section,
+            });
+        }
+        return this.documentSettings[scopeUri][section];
     }
-    /**
-     * Whether or not specified setting is enabled
-     * @param key a string which is a path. Example: 'astro.diagnostics.enabled'.
-     */
-    enabled(key) {
-        return !!this.get(key);
+    async getEmmetConfig(document) {
+        const emmetConfig = (await this.getConfig('emmet', document.uri)) ?? {};
+        return emmetConfig;
+    }
+    async getTSFormatConfig(document) {
+        const formatConfig = (await this.getConfig('typescript.format', document.uri)) ?? {};
+        return {
+            // We can use \n here since the editor normalizes later on to its line endings.
+            newLineCharacter: '\n',
+            insertSpaceAfterCommaDelimiter: formatConfig.insertSpaceAfterCommaDelimiter ?? true,
+            insertSpaceAfterConstructor: formatConfig.insertSpaceAfterConstructor ?? false,
+            insertSpaceAfterSemicolonInForStatements: formatConfig.insertSpaceAfterSemicolonInForStatements ?? true,
+            insertSpaceBeforeAndAfterBinaryOperators: formatConfig.insertSpaceBeforeAndAfterBinaryOperators ?? true,
+            insertSpaceAfterKeywordsInControlFlowStatements: formatConfig.insertSpaceAfterKeywordsInControlFlowStatements ?? true,
+            insertSpaceAfterFunctionKeywordForAnonymousFunctions: formatConfig.insertSpaceAfterFunctionKeywordForAnonymousFunctions ?? true,
+            insertSpaceBeforeFunctionParenthesis: formatConfig.insertSpaceBeforeFunctionParenthesis ?? false,
+            insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis: formatConfig.insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis ?? false,
+            insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets: formatConfig.insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets ?? false,
+            insertSpaceAfterOpeningAndBeforeClosingNonemptyBraces: formatConfig.insertSpaceAfterOpeningAndBeforeClosingNonemptyBraces ?? true,
+            insertSpaceAfterOpeningAndBeforeClosingEmptyBraces: formatConfig.insertSpaceAfterOpeningAndBeforeClosingEmptyBraces ?? true,
+            insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces: formatConfig.insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces ?? false,
+            insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces: formatConfig.insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces ?? false,
+            insertSpaceAfterTypeAssertion: formatConfig.insertSpaceAfterTypeAssertion ?? false,
+            placeOpenBraceOnNewLineForFunctions: formatConfig.placeOpenBraceOnNewLineForFunctions ?? false,
+            placeOpenBraceOnNewLineForControlBlocks: formatConfig.placeOpenBraceOnNewLineForControlBlocks ?? false,
+            semicolons: formatConfig.semicolons ?? typescript_1.SemicolonPreference.Ignore,
+        };
+    }
+    async getTSPreferences(document) {
+        const config = (await this.getConfig('typescript', document.uri)) ?? {};
+        const preferences = (await this.getConfig('typescript.preferences', document.uri)) ?? {};
+        return {
+            quotePreference: getQuoteStylePreference(preferences),
+            importModuleSpecifierPreference: getImportModuleSpecifierPreference(preferences),
+            importModuleSpecifierEnding: getImportModuleSpecifierEndingPreference(preferences),
+            allowTextChangesInNewFiles: document.uri.startsWith('file://'),
+            providePrefixAndSuffixTextForRename: (preferences.renameShorthandProperties ?? true) === false ? false : preferences.useAliasesForRenames ?? true,
+            includeAutomaticOptionalChainCompletions: config.suggest?.includeAutomaticOptionalChainCompletions ?? true,
+            includeCompletionsForImportStatements: config.suggest?.includeCompletionsForImportStatements ?? true,
+            includeCompletionsWithSnippetText: config.suggest?.includeCompletionsWithSnippetText ?? true,
+            includeCompletionsForModuleExports: config.suggest?.autoImports ?? true,
+            allowIncompleteCompletions: true,
+            includeCompletionsWithInsertText: true,
+        };
     }
     /**
-     * Get a specific setting value
-     * @param key a string which is a path. Example: 'astro.diagnostics.enable'.
+     * Return true if a plugin and an optional feature is enabled
      */
-    get(key) {
-        return (0, lodash_1.get)(this.config, key);
+    async isEnabled(document, plugin, feature) {
+        const config = await this.getConfig('astro', document.uri);
+        return feature ? config[plugin].enabled && config[plugin][feature].enabled : config[plugin].enabled;
     }
     /**
-     * Get the entire user configuration
+     * Updating the global config should only be done in cases where the client doesn't support `workspace/configuration`
+     * or inside of tests
      */
-    getFullConfig() {
-        return this.config;
+    updateGlobalConfig(config) {
+        this.globalConfig.astro = (0, lodash_1.merge)({}, exports.defaultLSConfig, this.globalConfig.astro, config);
     }
 }
 exports.ConfigManager = ConfigManager;
+function getQuoteStylePreference(config) {
+    switch (config.quoteStyle) {
+        case 'single':
+            return 'single';
+        case 'double':
+            return 'double';
+        default:
+            return 'auto';
+    }
+}
+function getImportModuleSpecifierPreference(config) {
+    switch (config.importModuleSpecifier) {
+        case 'project-relative':
+            return 'project-relative';
+        case 'relative':
+            return 'relative';
+        case 'non-relative':
+            return 'non-relative';
+        default:
+            return undefined;
+    }
+}
+function getImportModuleSpecifierEndingPreference(config) {
+    switch (config.importModuleSpecifierEnding) {
+        case 'minimal':
+            return 'minimal';
+        case 'index':
+            return 'index';
+        case 'js':
+            return 'js';
+        default:
+            return 'auto';
+    }
+}

package/dist/core/config/interfaces.d.ts

@@ -3,35 +3,10 @@
  * Make sure that this is kept in sync with the `package.json` of the VS Code extension
  */
 export interface LSConfig {
-    astro: LSAstroConfig;
     typescript: LSTypescriptConfig;
     html: LSHTMLConfig;
     css: LSCSSConfig;
 }
-export interface LSAstroConfig {
-    enabled: boolean;
-    diagnostics: {
-        enabled: boolean;
-    };
-    format: {
-        enabled: boolean;
-    };
-    rename: {
-        enabled: boolean;
-    };
-    completions: {
-        enabled: boolean;
-    };
-    hover: {
-        enabled: boolean;
-    };
-    codeActions: {
-        enabled: boolean;
-    };
-    selectionRange: {
-        enabled: boolean;
-    };
-}
 export interface LSTypescriptConfig {
     enabled: boolean;
     diagnostics: {
@@ -46,9 +21,6 @@ export interface LSTypescriptConfig {
     completions: {
         enabled: boolean;
     };
-    findReferences: {
-        enabled: boolean;
-    };
     definitions: {
         enabled: boolean;
     };
@@ -58,21 +30,12 @@ export interface LSTypescriptConfig {
     rename: {
         enabled: boolean;
     };
-    selectionRange: {
-        enabled: boolean;
-    };
     signatureHelp: {
         enabled: boolean;
     };
     semanticTokens: {
         enabled: boolean;
     };
-    implementation: {
-        enabled: boolean;
-    };
-    typeDefinition: {
-        enabled: boolean;
-    };
 }
 export interface LSHTMLConfig {
     enabled: boolean;
@@ -89,18 +52,9 @@ export interface LSHTMLConfig {
     documentSymbols: {
         enabled: boolean;
     };
-    renameTags: {
-        enabled: boolean;
-    };
-    linkedEditing: {
-        enabled: boolean;
-    };
 }
 export interface LSCSSConfig {
     enabled: boolean;
-    diagnostics: {
-        enabled: boolean;
-    };
     hover: {
         enabled: boolean;
     };
@@ -111,13 +65,7 @@ export interface LSCSSConfig {
     documentColors: {
         enabled: boolean;
     };
-    colorPresentations: {
-        enabled: boolean;
-    };
     documentSymbols: {
         enabled: boolean;
     };
-    selectionRange: {
-        enabled: boolean;
-    };
 }

package/dist/core/documents/DocumentMapper.js

@@ -33,8 +33,7 @@ class IdentityMapper {
         return this.url;
     }
     destroy() {
-        var _a, _b;
-        (_b = (_a = this.parent) === null || _a === void 0 ? void 0 : _a.destroy) === null || _b === void 0 ? void 0 : _b.call(_a);
+        this.parent?.destroy?.();
     }
 }
 exports.IdentityMapper = IdentityMapper;
@@ -130,8 +129,7 @@ class SourceMapDocumentMapper {
      * Needs to be called when source mapper is no longer needed in order to prevent memory leaks.
      */
     destroy() {
-        var _a, _b;
-        (_b = (_a = this.parent) === null || _a === void 0 ? void 0 : _a.destroy) === null || _b === void 0 ? void 0 : _b.call(_a);
+        this.parent?.destroy?.();
         this.consumer.destroy();
     }
 }

package/dist/core/documents/parseAstro.js

@@ -55,7 +55,7 @@ function getContent(content, frontmatter) {
         }
         case 'closed': {
             const { endOffset } = frontmatter;
-            const end = (endOffset !== null && endOffset !== void 0 ? endOffset : 0) + 3;
+            const end = (endOffset ?? 0) + 3;
             const offset = (0, utils_1.getFirstNonWhitespaceIndex)(content.slice(end));
             return { firstNonWhitespaceOffset: end + offset };
         }

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

@@ -15,6 +15,11 @@ export interface TagInformation {
 }
 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");
@@ -19,7 +19,7 @@ exports.walk = walk;
  * @param tag the tag to extract
  */
 function extractTags(text, tag, html) {
-    const rootNodes = (html === null || html === void 0 ? void 0 : html.roots) || (0, parseHtml_1.parseHtml)(text).roots;
+    const rootNodes = html?.roots || (0, parseHtml_1.parseHtml)(text).roots;
     const matchedNodes = rootNodes.filter((node) => node.tag === tag);
     if (tag === 'style' && !matchedNodes.length && rootNodes.length) {
         for (let child of walk(rootNodes[0])) {
@@ -30,9 +30,8 @@ function extractTags(text, tag, html) {
     }
     return matchedNodes.map(transformToTagInfo);
     function transformToTagInfo(matchedNode) {
-        var _a, _b;
-        const start = (_a = matchedNode.startTagEnd) !== null && _a !== void 0 ? _a : matchedNode.start;
-        const end = (_b = matchedNode.endTagStart) !== null && _b !== void 0 ? _b : matchedNode.end;
+        const start = matchedNode.startTagEnd ?? matchedNode.start;
+        const end = matchedNode.endTagStart ?? matchedNode.end;
         const startPos = positionAt(start, text);
         const endPos = positionAt(end, text);
         const container = {
@@ -79,6 +78,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

@@ -1,4 +1,4 @@
-import { CancellationToken, Color, ColorInformation, ColorPresentation, CompletionContext, CompletionItem, CompletionList, DefinitionLink, Diagnostic, FoldingRange, Hover, Position, Range, Location, SignatureHelp, SignatureHelpContext, TextDocumentContentChangeEvent, TextDocumentIdentifier, WorkspaceEdit, SymbolInformation, SemanticTokens } from 'vscode-languageserver';
+import { CancellationToken, Color, ColorInformation, ColorPresentation, CompletionContext, CompletionItem, CompletionList, DefinitionLink, Diagnostic, FoldingRange, Hover, Position, Range, Location, SignatureHelp, SignatureHelpContext, TextDocumentContentChangeEvent, TextDocumentIdentifier, WorkspaceEdit, SymbolInformation, SemanticTokens, CodeActionContext, CodeAction } from 'vscode-languageserver';
 import type { AppCompletionItem, Plugin } from './interfaces';
 import { DocumentManager } from '../core/documents/DocumentManager';
 interface PluginHostConfig {
@@ -12,10 +12,11 @@ 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>;
+    getCodeActions(textDocument: TextDocumentIdentifier, range: Range, context: CodeActionContext, cancellationToken: CancellationToken): Promise<CodeAction[]>;
     doTagComplete(textDocument: TextDocumentIdentifier, position: Position): Promise<string | null>;
     getFoldingRanges(textDocument: TextDocumentIdentifier): Promise<FoldingRange[] | null>;
     getDocumentSymbols(textDocument: TextDocumentIdentifier, cancellationToken: CancellationToken): Promise<SymbolInformation[]>;

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,17 +26,40 @@ 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) {
         const document = this.getDocument(textDocument.uri);
         const result = await this.execute('resolveCompletion', [document, completionItem], ExecuteMode.FirstNonNull);
-        return result !== null && result !== void 0 ? result : completionItem;
+        return result ?? completionItem;
     }
     async getDiagnostics(textDocument) {
         const document = this.getDocument(textDocument.uri);
@@ -44,13 +69,17 @@ class PluginHost {
         const document = this.getDocument(textDocument.uri);
         return this.execute('doHover', [document, position], ExecuteMode.FirstNonNull);
     }
+    async getCodeActions(textDocument, range, context, cancellationToken) {
+        const document = this.getDocument(textDocument.uri);
+        return (0, lodash_1.flatten)(await this.execute('getCodeActions', [document, range, context, cancellationToken], ExecuteMode.Collect));
+    }
     async doTagComplete(textDocument, position) {
         const document = this.getDocument(textDocument.uri);
         return this.execute('doTagComplete', [document, position], ExecuteMode.FirstNonNull);
     }
     async getFoldingRanges(textDocument) {
         const document = this.getDocument(textDocument.uri);
-        const foldingRanges = (0, lodash_1.flatten)(await this.execute('getFoldingRanges', [document], ExecuteMode.Collect)).filter((completion) => completion != null);
+        const foldingRanges = (0, lodash_1.flatten)(await this.execute('getFoldingRanges', [document], ExecuteMode.Collect));
         return foldingRanges;
     }
     async getDocumentSymbols(textDocument, cancellationToken) {
@@ -91,15 +120,13 @@ class PluginHost {
         return await this.execute('getSignatureHelp', [document, position, context, cancellationToken], ExecuteMode.FirstNonNull);
     }
     onWatchFileChanges(onWatchFileChangesParams) {
-        var _a;
         for (const support of this.plugins) {
-            (_a = support.onWatchFileChanges) === null || _a === void 0 ? void 0 : _a.call(support, onWatchFileChangesParams);
+            support.onWatchFileChanges?.(onWatchFileChangesParams);
         }
     }
     updateNonAstroFile(fileName, changes) {
-        var _a;
         for (const support of this.plugins) {
-            (_a = support.updateNonAstroFile) === null || _a === void 0 ? void 0 : _a.call(support, fileName, changes);
+            support.updateNonAstroFile?.(fileName, changes);
         }
     }
     getDocument(uri) {

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

@@ -1,4 +1,4 @@
-import { CompletionContext, DefinitionLink, FoldingRange, Position } from 'vscode-languageserver';
+import { CompletionContext, FoldingRange, Position } from 'vscode-languageserver';
 import { ConfigManager } from '../../core/config';
 import { AstroDocument, DocumentManager } from '../../core/documents';
 import { AppCompletionList, Plugin } from '../interfaces';
@@ -10,9 +10,4 @@ export declare class AstroPlugin implements Plugin {
     constructor(docManager: DocumentManager, configManager: ConfigManager, workspaceUris: string[]);
     getCompletions(document: AstroDocument, position: Position, completionContext?: CompletionContext): Promise<AppCompletionList | null>;
     getFoldingRanges(document: AstroDocument): FoldingRange[];
-    getDefinitions(document: AstroDocument, position: Position): Promise<DefinitionLink[]>;
-    private isInsideFrontmatter;
-    private isComponentTag;
-    private getDefinitionsForComponentName;
-    private getImportSpecifierForIdentifier;
 }