@astrojs/language-server 0.13.4 → 0.16.0

package/CHANGELOG.md

@@ -1,5 +1,48 @@
 # @astrojs/language-server
 
+## 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
+
+- 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

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/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.js

@@ -77,7 +77,7 @@ class AstroPlugin {
         const filePath = (0, utils_1.urlToPath)(document.uri);
         const tsFilePath = (0, utils_2.toVirtualAstroFilePath)(filePath);
         const program = lang.getProgram();
-        const sourceFile = program === null || program === void 0 ? void 0 : program.getSourceFile(tsFilePath);
+        const sourceFile = program?.getSourceFile(tsFilePath);
         if (!sourceFile) {
             return undefined;
         }

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

@@ -26,19 +26,19 @@ class CompletionsProviderImpl {
         if (!doc)
             return null;
         let items = [];
-        if ((completionContext === null || completionContext === void 0 ? void 0 : completionContext.triggerCharacter) === '-') {
+        if (completionContext?.triggerCharacter === '-') {
             const frontmatter = this.getComponentScriptCompletion(doc, position, completionContext);
             if (frontmatter)
                 items.push(frontmatter);
         }
         const html = document.html;
         const offset = document.offsetAt(position);
-        if ((0, utils_1.isInComponentStartTag)(html, 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 node = html.findNodeAt(offset);
             const isAstro = await this.isAstroComponent(document, node);
             if (!isAstro) {
                 const directives = (0, utils_4.removeDataAttrCompletion)(this.directivesHTMLLang.doComplete(document, position, html).items);
@@ -89,7 +89,7 @@ class CompletionsProviderImpl {
         if (!inAttribute) {
             return [];
         }
-        if ((completionContext === null || completionContext === void 0 ? void 0 : completionContext.triggerCharacter) === '/' || (completionContext === null || completionContext === void 0 ? void 0 : completionContext.triggerCharacter) === '>') {
+        if (completionContext?.triggerCharacter === '/' || completionContext?.triggerCharacter === '>') {
             return [];
         }
         // If inside of attribute value, skip.
@@ -103,8 +103,8 @@ class CompletionsProviderImpl {
         // Get the source file
         const tsFilePath = (0, utils_3.toVirtualAstroFilePath)(tsDoc.filePath);
         const program = lang.getProgram();
-        const sourceFile = program === null || program === void 0 ? void 0 : program.getSourceFile(tsFilePath);
-        const typeChecker = program === null || program === void 0 ? void 0 : program.getTypeChecker();
+        const sourceFile = program?.getSourceFile(tsFilePath);
+        const typeChecker = program?.getTypeChecker();
         if (!sourceFile || !typeChecker) {
             return [];
         }
@@ -123,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
@@ -159,11 +160,11 @@ class CompletionsProviderImpl {
         return null;
     }
     getPropType(type, typeChecker) {
-        const sym = type === null || type === void 0 ? void 0 : type.getSymbol();
+        const sym = type?.getSymbol();
         if (!sym) {
             return null;
         }
-        for (const decl of (sym === null || sym === void 0 ? void 0 : sym.getDeclarations()) || []) {
+        for (const decl of sym?.getDeclarations() || []) {
             const fileName = (0, utils_3.toVirtualFilePath)(decl.getSourceFile().fileName);
             if (fileName.endsWith('.tsx') || fileName.endsWith('.jsx')) {
                 if (!typescript_1.default.isFunctionDeclaration(decl)) {
@@ -180,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);
@@ -201,13 +217,12 @@ class CompletionsProviderImpl {
         return item;
     }
     async isAstroComponent(document, node) {
-        var _a;
         const { lang, tsDoc } = await this.languageServiceManager.getLSAndTSDoc(document);
         // Get the source file
         const tsFilePath = (0, utils_3.toVirtualAstroFilePath)(tsDoc.filePath);
         const program = lang.getProgram();
-        const sourceFile = program === null || program === void 0 ? void 0 : program.getSourceFile(tsFilePath);
-        const typeChecker = program === null || program === void 0 ? void 0 : program.getTypeChecker();
+        const sourceFile = program?.getSourceFile(tsFilePath);
+        const typeChecker = program?.getTypeChecker();
         if (!sourceFile || !typeChecker) {
             return false;
         }
@@ -217,7 +232,7 @@ class CompletionsProviderImpl {
         if (!importType) {
             return false;
         }
-        const symbolDeclaration = (_a = importType.getSymbol()) === null || _a === void 0 ? void 0 : _a.declarations;
+        const symbolDeclaration = importType.getSymbol()?.declarations;
         if (symbolDeclaration) {
             const fileName = symbolDeclaration[0].getSourceFile().fileName;
             return fileName.endsWith('.astro');

package/dist/plugins/css/CSSPlugin.js

@@ -60,8 +60,8 @@ class CSSPlugin {
         if ((0, documents_1.isInsideFrontmatter)(document.getText(), document.offsetAt(position))) {
             return null;
         }
-        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 isCustomTriggerCharacter = triggerKind === vscode_languageserver_1.CompletionTriggerKind.TriggerCharacter;
         if (isCustomTriggerCharacter && triggerCharacter && !this.triggerCharacters.has(triggerCharacter)) {
             return null;
@@ -97,10 +97,26 @@ class CSSPlugin {
         }
         const cssLang = extractLanguage(cssDocument);
         const langService = (0, language_service_1.getLanguageService)(cssLang);
-        const emmetResults = {
-            isIncomplete: true,
+        let emmetResults = {
+            isIncomplete: false,
             items: [],
         };
+        langService.setCompletionParticipants([
+            {
+                onCssProperty: (context) => {
+                    if (context?.propertyName) {
+                        emmetResults =
+                            (0, emmet_helper_1.doComplete)(cssDocument, cssDocument.getGeneratedPosition(position), (0, language_service_1.getLanguage)(cssLang), this.configManager.getEmmetConfig()) || emmetResults;
+                    }
+                },
+                onCssPropertyValue: (context) => {
+                    if (context?.propertyValue) {
+                        emmetResults =
+                            (0, emmet_helper_1.doComplete)(cssDocument, cssDocument.getGeneratedPosition(position), (0, language_service_1.getLanguage)(cssLang), this.configManager.getEmmetConfig()) || emmetResults;
+                    }
+                },
+            },
+        ]);
         const results = langService.doComplete(cssDocument, cssDocument.getGeneratedPosition(position), cssDocument.stylesheet);
         return vscode_languageserver_1.CompletionList.create([...(results ? results.items : []), ...emmetResults.items].map((completionItem) => (0, documents_1.mapCompletionItemToOriginal)(cssDocument, completionItem)), 
         // Emmet completions change on every keystroke, so they are never complete

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

@@ -8,6 +8,12 @@ exports.classListAttribute = (0, vscode_html_languageservice_1.newHTMLDataProvid
         {
             name: 'class:list',
             description: 'Utility to provide a list of class',
+            references: [
+                {
+                    name: 'Astro reference',
+                    url: 'https://docs.astro.build/en/reference/directives-reference/#classlist',
+                },
+            ],
         },
     ],
 });
@@ -19,8 +25,8 @@ exports.astroAttributes = (0, vscode_html_languageservice_1.newHTMLDataProvider)
             description: 'Inject unescaped HTML into this tag',
             references: [
                 {
-                    name: 'Astro documentation',
-                    url: 'https://docs.astro.build/en/migrate/#deprecated-unescaped-html',
+                    name: 'Astro reference',
+                    url: 'https://docs.astro.build/en/reference/directives-reference/#sethtml',
                 },
             ],
         },
@@ -29,8 +35,18 @@ exports.astroAttributes = (0, vscode_html_languageservice_1.newHTMLDataProvider)
             description: 'Inject escaped text into this tag',
             references: [
                 {
-                    name: 'Astro documentation',
-                    url: 'https://docs.astro.build/en/migrate/#deprecated-unescaped-html',
+                    name: 'Astro reference',
+                    url: 'https://docs.astro.build/en/reference/directives-reference/#settext',
+                },
+            ],
+        },
+        {
+            name: 'is:raw',
+            description: 'Instructs the Astro compiler to treat any children of this element as text',
+            references: [
+                {
+                    name: 'Astro reference',
+                    url: 'https://docs.astro.build/en/reference/directives-reference/#israw',
                 },
             ],
         },
@@ -50,8 +66,8 @@ exports.astroAttributes = (0, vscode_html_languageservice_1.newHTMLDataProvider)
                     description: 'Passes serializable server-side variables into a client-side script element',
                     references: [
                         {
-                            name: 'Astro documentation',
-                            url: 'https://docs.astro.build/en/guides/styling/#variables-in-scripts--styles',
+                            name: 'Astro reference',
+                            url: 'https://docs.astro.build/en/reference/directives-reference/#definevars',
                         },
                     ],
                 },
@@ -61,7 +77,7 @@ exports.astroAttributes = (0, vscode_html_languageservice_1.newHTMLDataProvider)
                     valueSet: 'v',
                     references: [
                         {
-                            name: 'Astro documentation',
+                            name: 'Astro reference',
                             url: 'https://docs.astro.build/en/core-concepts/astro-components/#using-hoisted-scripts',
                         },
                     ],
@@ -72,8 +88,8 @@ exports.astroAttributes = (0, vscode_html_languageservice_1.newHTMLDataProvider)
                     valueSet: 'v',
                     references: [
                         {
-                            name: 'Astro documentation',
-                            url: 'https://docs.astro.build/en/migrate/#new-default-script-behavior',
+                            name: 'Astro reference',
+                            url: 'https://docs.astro.build/en/reference/directives-reference/#isinline',
                         },
                     ],
                 },
@@ -87,8 +103,8 @@ exports.astroAttributes = (0, vscode_html_languageservice_1.newHTMLDataProvider)
                     description: 'Passes serializable server-side variables into a client-side style element',
                     references: [
                         {
-                            name: 'Astro documentation',
-                            url: 'https://docs.astro.build/en/guides/styling/#variables-in-scripts--styles',
+                            name: 'Astro reference',
+                            url: 'https://docs.astro.build/en/reference/directives-reference/#definevars',
                         },
                     ],
                 },
@@ -98,8 +114,8 @@ exports.astroAttributes = (0, vscode_html_languageservice_1.newHTMLDataProvider)
                     valueSet: 'v',
                     references: [
                         {
-                            name: 'Astro documentation',
-                            url: 'https://docs.astro.build/en/guides/styling/#global-styles',
+                            name: 'Astro reference',
+                            url: 'https://docs.astro.build/en/reference/directives-reference/#isglobal',
                         },
                     ],
                 },
@@ -109,8 +125,8 @@ exports.astroAttributes = (0, vscode_html_languageservice_1.newHTMLDataProvider)
                     valueSet: 'v',
                     references: [
                         {
-                            name: 'Astro documentation',
-                            url: 'https://docs.astro.build/en/guides/styling/#global-styles',
+                            name: 'Astro reference',
+                            url: 'https://docs.astro.build/en/reference/directives-reference/#isglobal',
                         },
                     ],
                 },
@@ -120,8 +136,8 @@ exports.astroAttributes = (0, vscode_html_languageservice_1.newHTMLDataProvider)
                     valueSet: 'v',
                     references: [
                         {
-                            name: 'Astro documentation',
-                            url: 'https://docs.astro.build/en/migrate/#new-default-script-behavior',
+                            name: 'Astro reference',
+                            url: 'https://docs.astro.build/en/reference/directives-reference/#isinline',
                         },
                     ],
                 },
@@ -138,8 +154,8 @@ exports.astroDirectives = (0, vscode_html_languageservice_1.newHTMLDataProvider)
             valueSet: 'v',
             references: [
                 {
-                    name: 'Astro documentation',
-                    url: 'https://docs.astro.build/en/core-concepts/component-hydration/#hydrate-interactive-components',
+                    name: 'Astro reference',
+                    url: 'https://docs.astro.build/en/reference/directives-reference/#clientload',
                 },
             ],
         },
@@ -149,8 +165,8 @@ exports.astroDirectives = (0, vscode_html_languageservice_1.newHTMLDataProvider)
             valueSet: 'v',
             references: [
                 {
-                    name: 'Astro documentation',
-                    url: 'https://docs.astro.build/en/core-concepts/component-hydration/#hydrate-interactive-components',
+                    name: 'Astro reference',
+                    url: 'https://docs.astro.build/en/reference/directives-reference/#clientidle',
                 },
             ],
         },
@@ -160,8 +176,8 @@ exports.astroDirectives = (0, vscode_html_languageservice_1.newHTMLDataProvider)
             valueSet: 'v',
             references: [
                 {
-                    name: 'Astro documentation',
-                    url: 'https://docs.astro.build/en/core-concepts/component-hydration/#hydrate-interactive-components',
+                    name: 'Astro reference',
+                    url: 'https://docs.astro.build/en/reference/directives-reference/#clientvisible',
                 },
             ],
         },
@@ -170,8 +186,8 @@ exports.astroDirectives = (0, vscode_html_languageservice_1.newHTMLDataProvider)
             description: 'Start importing the component JS as soon as the browser matches the given media query (uses matchMedia). Hydrate the component when import completes. Useful for sidebar toggles, or other elements that should only display on mobile or desktop devices.',
             references: [
                 {
-                    name: 'Astro documentation',
-                    url: 'https://docs.astro.build/en/core-concepts/component-hydration/#hydrate-interactive-components',
+                    name: 'Astro reference',
+                    url: 'https://docs.astro.build/en/reference/directives-reference/#clientmedia',
                 },
             ],
         },
@@ -181,8 +197,8 @@ exports.astroDirectives = (0, vscode_html_languageservice_1.newHTMLDataProvider)
             valueSet: 'v',
             references: [
                 {
-                    name: 'Astro documentation',
-                    url: 'https://docs.astro.build/en/core-concepts/component-hydration/#hydrate-interactive-components',
+                    name: 'Astro reference',
+                    url: 'https://docs.astro.build/en/reference/directives-reference/#clientonly',
                 },
             ],
         },

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/LanguageServiceManager.js

@@ -29,7 +29,7 @@ class LanguageServiceManager {
         const handleDocumentChange = (document) => {
             this.getSnapshot(document);
         };
-        docManager.on('documentChange', (0, utils_1.debounceSameArg)(handleDocumentChange, (newDoc, prevDoc) => newDoc.uri === (prevDoc === null || prevDoc === void 0 ? void 0 : prevDoc.uri), 1000));
+        docManager.on('documentChange', (0, utils_1.debounceSameArg)(handleDocumentChange, (newDoc, prevDoc) => newDoc.uri === prevDoc?.uri, 1000));
         docManager.on('documentOpen', handleDocumentChange);
     }
     async getSnapshot(pathOrDoc) {