@astrojs/language-server 0.13.1 → 0.13.4

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # @astrojs/language-server
 
+## 0.13.4
+
+### Patch Changes
+
+- 5874655: Add support for Astro 0.26.0 attributes
+
+## 0.13.3
+
+### Patch Changes
+
+- 1fb21ff: Add support for folding CSS
+- 99d7536: Add support for semantic tokens
+- b363c00: Improve completions for components
+
+## 0.13.2
+
+### Patch Changes
+
+- aff8b76: Fix error caused by malformed Svelte components
+- Updated dependencies [aff8b76]
+  - @astrojs/svelte-language-integration@0.1.2
+
 ## 0.13.1
 
 ### Patch Changes

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

@@ -1,4 +1,4 @@
-import { Position, Range, CompletionItem, Hover, Diagnostic, ColorPresentation, SymbolInformation, LocationLink, TextDocumentEdit, CodeAction, SelectionRange, TextEdit, InsertReplaceEdit } from 'vscode-languageserver';
+import { Position, Range, CompletionItem, Hover, Diagnostic, ColorPresentation, SymbolInformation, LocationLink, TextDocumentEdit, CodeAction, SelectionRange, TextEdit, InsertReplaceEdit, FoldingRange } from 'vscode-languageserver';
 import { TagInformation } from './utils';
 import { SourceMapConsumer } from 'source-map';
 export interface DocumentMapper {
@@ -82,4 +82,5 @@ export declare function mapSymbolInformationToOriginal(fragment: Pick<DocumentMa
 export declare function mapLocationLinkToOriginal(fragment: DocumentMapper, def: LocationLink): LocationLink;
 export declare function mapTextDocumentEditToOriginal(fragment: DocumentMapper, edit: TextDocumentEdit): TextDocumentEdit;
 export declare function mapCodeActionToOriginal(fragment: DocumentMapper, codeAction: CodeAction): CodeAction;
+export declare function mapFoldingRangeToParent(fragment: DocumentMapper, foldingRange: FoldingRange): FoldingRange;
 export declare function mapSelectionRangeToParent(fragment: Pick<DocumentMapper, 'getOriginalPosition'>, selectionRange: SelectionRange): SelectionRange;

package/dist/core/documents/DocumentMapper.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mapSelectionRangeToParent = exports.mapCodeActionToOriginal = exports.mapTextDocumentEditToOriginal = exports.mapLocationLinkToOriginal = exports.mapSymbolInformationToOriginal = exports.mapColorPresentationToOriginal = exports.mapDiagnosticToGenerated = exports.mapEditToOriginal = exports.mapInsertReplaceEditToOriginal = exports.mapObjWithRangeToOriginal = exports.mapHoverToParent = exports.mapCompletionItemToOriginal = exports.mapRangeToGenerated = exports.mapRangeToOriginal = exports.SourceMapDocumentMapper = exports.FragmentMapper = exports.IdentityMapper = void 0;
+exports.mapSelectionRangeToParent = exports.mapFoldingRangeToParent = exports.mapCodeActionToOriginal = exports.mapTextDocumentEditToOriginal = exports.mapLocationLinkToOriginal = exports.mapSymbolInformationToOriginal = exports.mapColorPresentationToOriginal = exports.mapDiagnosticToGenerated = exports.mapEditToOriginal = exports.mapInsertReplaceEditToOriginal = exports.mapObjWithRangeToOriginal = exports.mapHoverToParent = exports.mapCompletionItemToOriginal = exports.mapRangeToGenerated = exports.mapRangeToOriginal = exports.SourceMapDocumentMapper = exports.FragmentMapper = exports.IdentityMapper = void 0;
 const vscode_languageserver_1 = require("vscode-languageserver");
 const utils_1 = require("./utils");
 /**
@@ -231,6 +231,13 @@ function mapCodeActionToOriginal(fragment, codeAction) {
     }, codeAction.kind);
 }
 exports.mapCodeActionToOriginal = mapCodeActionToOriginal;
+function mapFoldingRangeToParent(fragment, foldingRange) {
+    // Despite FoldingRange asking for a start and end line and a start and end character, FoldingRanges
+    // don't use the Range type, instead asking for 4 number. Not sure why, but it's not convenient
+    const range = mapRangeToOriginal(fragment, vscode_languageserver_1.Range.create(foldingRange.startLine, foldingRange.startCharacter || 0, foldingRange.endLine, foldingRange.endCharacter || 0));
+    return vscode_languageserver_1.FoldingRange.create(range.start.line, range.end.line, foldingRange.startCharacter ? range.start.character : undefined, foldingRange.endCharacter ? range.end.character : undefined, foldingRange.kind);
+}
+exports.mapFoldingRangeToParent = mapFoldingRangeToParent;
 function mapSelectionRangeToParent(fragment, selectionRange) {
     const { range, parent } = selectionRange;
     return vscode_languageserver_1.SelectionRange.create(mapRangeToOriginal(fragment, range), parent && mapSelectionRangeToParent(fragment, parent));

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

@@ -11,6 +11,7 @@ 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[];

package/dist/core/documents/utils.js

@@ -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,
         };
     }
 }

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 } 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 } from 'vscode-languageserver';
 import type { AppCompletionItem, Plugin } from './interfaces';
 import { DocumentManager } from '../core/documents/DocumentManager';
 interface PluginHostConfig {
@@ -19,6 +19,7 @@ export declare class PluginHost {
     doTagComplete(textDocument: TextDocumentIdentifier, position: Position): Promise<string | null>;
     getFoldingRanges(textDocument: TextDocumentIdentifier): Promise<FoldingRange[] | null>;
     getDocumentSymbols(textDocument: TextDocumentIdentifier, cancellationToken: CancellationToken): Promise<SymbolInformation[]>;
+    getSemanticTokens(textDocument: TextDocumentIdentifier, range?: Range, cancellationToken?: CancellationToken): Promise<SemanticTokens | null>;
     getDefinitions(textDocument: TextDocumentIdentifier, position: Position): Promise<DefinitionLink[] | Location[]>;
     rename(textDocument: TextDocumentIdentifier, position: Position, newName: string): Promise<WorkspaceEdit | null>;
     getDocumentColors(textDocument: TextDocumentIdentifier): Promise<ColorInformation[]>;

package/dist/plugins/PluginHost.js

@@ -57,6 +57,10 @@ class PluginHost {
         const document = this.getDocument(textDocument.uri);
         return (0, lodash_1.flatten)(await this.execute('getDocumentSymbols', [document, cancellationToken], ExecuteMode.Collect));
     }
+    async getSemanticTokens(textDocument, range, cancellationToken) {
+        const document = this.getDocument(textDocument.uri);
+        return await this.execute('getSemanticTokens', [document, range, cancellationToken], ExecuteMode.FirstNonNull);
+    }
     async getDefinitions(textDocument, position) {
         const document = this.getDocument(textDocument.uri);
         const definitions = (0, lodash_1.flatten)(await this.execute('getDefinitions', [document, position], ExecuteMode.Collect));

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,18 +1,17 @@
-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;
     constructor(docManager: DocumentManager, languageServiceManager: TypeScriptLanguageServiceManager);
     getCompletions(document: AstroDocument, position: Position, completionContext?: CompletionContext): Promise<AppCompletionList | null>;
-    private getClientHintCompletion;
     private getComponentScriptCompletion;
     private getPropCompletions;
     private getImportedSymbol;
     private getPropType;
-    private getCompletionItemForTypeMember;
-    private isComponentTag;
-    private isInsideFrontmatter;
+    private getCompletionItemForProperty;
+    private isAstroComponent;
 }

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

@@ -9,8 +9,15 @@ const typescript_1 = __importDefault(require("typescript"));
 const utils_1 = require("../../../core/documents/utils");
 const utils_2 = require("../../../utils");
 const utils_3 = require("../../typescript/utils");
+const vscode_html_languageservice_1 = require("vscode-html-languageservice");
+const astro_attributes_1 = require("../../html/features/astro-attributes");
+const utils_4 = require("../../html/utils");
 class CompletionsProviderImpl {
     constructor(docManager, languageServiceManager) {
+        this.directivesHTMLLang = (0, vscode_html_languageservice_1.getLanguageService)({
+            customDataProviders: [astro_attributes_1.astroDirectives],
+            useDefaultDataProvider: false,
+        });
         this.docManager = docManager;
         this.languageServiceManager = languageServiceManager;
     }
@@ -24,46 +31,22 @@ class CompletionsProviderImpl {
             if (frontmatter)
                 items.push(frontmatter);
         }
-        if ((completionContext === null || completionContext === void 0 ? void 0 : completionContext.triggerCharacter) === ':') {
-            const clientHint = this.getClientHintCompletion(doc, position, completionContext);
-            if (clientHint)
-                items.push(...clientHint);
-        }
-        if (!this.isInsideFrontmatter(document, position)) {
+        const html = document.html;
+        const offset = document.offsetAt(position);
+        if ((0, utils_1.isInComponentStartTag)(html, 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);
+                items.push(...directives);
+            }
         }
         return vscode_languageserver_1.CompletionList.create(items, true);
     }
-    getClientHintCompletion(document, position, completionContext) {
-        const node = document.html.findNodeAt(document.offsetAt(position));
-        if (!(0, utils_2.isPossibleClientComponent)(node))
-            return null;
-        return [
-            {
-                label: ':load',
-                insertText: 'load',
-                commitCharacters: ['l'],
-            },
-            {
-                label: ':idle',
-                insertText: 'idle',
-                commitCharacters: ['i'],
-            },
-            {
-                label: ':visible',
-                insertText: 'visible',
-                commitCharacters: ['v'],
-            },
-            {
-                label: ':media',
-                insertText: 'media',
-                commitCharacters: ['m'],
-            },
-        ];
-    }
     getComponentScriptCompletion(document, position, completionContext) {
         const base = {
             kind: vscode_languageserver_1.CompletionItemKind.Snippet,
@@ -96,11 +79,10 @@ class CompletionsProviderImpl {
         return null;
     }
     async getPropCompletions(document, position, completionContext) {
-        var _a, _b;
         const offset = document.offsetAt(position);
         const html = document.html;
         const node = html.findNodeAt(offset);
-        if (!this.isComponentTag(node)) {
+        if (!(0, utils_2.isPossibleComponent)(node)) {
             return [];
         }
         const inAttribute = node.start + node.tag.length < offset;
@@ -119,8 +101,7 @@ class CompletionsProviderImpl {
         const componentName = node.tag;
         const { lang, tsDoc } = await this.languageServiceManager.getLSAndTSDoc(document);
         // Get the source file
-        const filePath = (0, utils_2.urlToPath)(document.uri);
-        const tsFilePath = (0, utils_3.toVirtualAstroFilePath)(filePath);
+        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();
@@ -133,26 +114,22 @@ class CompletionsProviderImpl {
         if (!importType) {
             return [];
         }
-        // Get the import's type
+        // Get the component's props type
         const componentType = this.getPropType(importType, typeChecker);
         if (!componentType) {
             return [];
         }
-        const completionItems = [];
-        // Add completions for this types props
-        for (let baseType of componentType.getBaseTypes() || []) {
-            const members = ((_a = baseType.getSymbol()) === null || _a === void 0 ? void 0 : _a.members) || [];
-            members.forEach((mem) => {
-                let completionItem = this.getCompletionItemForTypeMember(mem, typeChecker);
-                completionItems.push(completionItem);
-            });
-        }
-        // Add completions for this types base members
-        const members = ((_b = componentType.getSymbol()) === null || _b === void 0 ? void 0 : _b.members) || [];
-        members.forEach((mem) => {
-            let completionItem = this.getCompletionItemForTypeMember(mem, typeChecker);
+        let completionItems = [];
+        // 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);
             completionItems.push(completionItem);
         });
+        // Ensure that props shows up first as a completion, despite this plugin being ran after the HTML one
+        completionItems = completionItems.map((item) => {
+            return { ...item, sortText: '_' };
+        });
         return completionItems;
     }
     getImportedSymbol(sourceFile, identifier) {
@@ -203,7 +180,7 @@ class CompletionsProviderImpl {
         }
         return null;
     }
-    getCompletionItemForTypeMember(mem, typeChecker) {
+    getCompletionItemForProperty(mem, typeChecker) {
         let item = {
             label: mem.name,
             insertText: mem.name,
@@ -223,15 +200,29 @@ class CompletionsProviderImpl {
         }
         return item;
     }
-    isComponentTag(node) {
-        if (!node.tag) {
+    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();
+        if (!sourceFile || !typeChecker) {
             return false;
         }
-        const firstChar = node.tag[0];
-        return /[A-Z]/.test(firstChar);
-    }
-    isInsideFrontmatter(document, position) {
-        return (0, utils_1.isInsideFrontmatter)(document.getText(), document.offsetAt(position));
+        const componentName = node.tag;
+        const imp = this.getImportedSymbol(sourceFile, componentName);
+        const importType = imp && typeChecker.getTypeAtLocation(imp);
+        if (!importType) {
+            return false;
+        }
+        const symbolDeclaration = (_a = importType.getSymbol()) === null || _a === void 0 ? void 0 : _a.declarations;
+        if (symbolDeclaration) {
+            const fileName = symbolDeclaration[0].getSourceFile().fileName;
+            return fileName.endsWith('.astro');
+        }
+        return false;
     }
 }
 exports.CompletionsProviderImpl = CompletionsProviderImpl;

package/dist/plugins/css/CSSPlugin.d.ts

@@ -1,4 +1,4 @@
-import { Color, ColorInformation, ColorPresentation, CompletionContext, CompletionList, Hover, Position, Range, SymbolInformation } from 'vscode-languageserver';
+import { Color, ColorInformation, ColorPresentation, CompletionContext, CompletionList, FoldingRange, Hover, Position, Range, SymbolInformation } from 'vscode-languageserver';
 import { ConfigManager } from '../../core/config/ConfigManager';
 import { AstroDocument } from '../../core/documents';
 import type { Plugin } from '../interfaces';
@@ -14,6 +14,7 @@ export declare class CSSPlugin implements Plugin {
     private getCompletionsInternal;
     getDocumentColors(document: AstroDocument): ColorInformation[];
     getColorPresentations(document: AstroDocument, range: Range, color: Color): ColorPresentation[];
+    getFoldingRanges(document: AstroDocument): FoldingRange[] | null;
     getDocumentSymbols(document: AstroDocument): SymbolInformation[];
     private inStyleAttributeWithoutInterpolation;
     /**

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) {
@@ -37,7 +43,8 @@ class CSSPlugin {
             return null;
         }
         const cssDocument = this.getCSSDocumentForStyleTag(styleTag, document);
-        if (shouldExcludeHover(cssDocument)) {
+        const cssLang = extractLanguage(cssDocument);
+        if (!isSupportedByLangService(cssLang)) {
             return null;
         }
         return this.doHoverInternal(cssDocument, position);
@@ -60,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) {
@@ -104,7 +113,7 @@ class CSSPlugin {
         const allColorInfo = this.getCSSDocumentsForDocument(document).map((cssDoc) => {
             const cssLang = extractLanguage(cssDoc);
             const langService = (0, language_service_1.getLanguageService)(cssLang);
-            if (shouldExcludeColor(cssLang)) {
+            if (!isSupportedByLangService(cssLang)) {
                 return [];
             }
             return langService
@@ -120,7 +129,8 @@ class CSSPlugin {
         const allColorPres = this.getCSSDocumentsForDocument(document).map((cssDoc) => {
             const cssLang = extractLanguage(cssDoc);
             const langService = (0, language_service_1.getLanguageService)(cssLang);
-            if ((!cssDoc.isInGenerated(range.start) && !cssDoc.isInGenerated(range.end)) || shouldExcludeColor(cssLang)) {
+            if ((!cssDoc.isInGenerated(range.start) && !cssDoc.isInGenerated(range.end)) ||
+                !isSupportedByLangService(cssLang)) {
                 return [];
             }
             return langService
@@ -129,6 +139,14 @@ class CSSPlugin {
         });
         return (0, lodash_1.flatten)(allColorPres);
     }
+    getFoldingRanges(document) {
+        const allFoldingRanges = this.getCSSDocumentsForDocument(document).map((cssDoc) => {
+            const cssLang = extractLanguage(cssDoc);
+            const langService = (0, language_service_1.getLanguageService)(cssLang);
+            return langService.getFoldingRanges(cssDoc).map((foldingRange) => (0, documents_1.mapFoldingRangeToParent)(cssDoc, foldingRange));
+        });
+        return (0, lodash_1.flatten)(allFoldingRanges);
+    }
     getDocumentSymbols(document) {
         if (!this.featureEnabled('documentSymbols')) {
             return [];
@@ -182,32 +200,13 @@ class CSSPlugin {
 }
 exports.CSSPlugin = CSSPlugin;
 /**
- * Exclude certain language when getting hover info
- * The CSS language service only supports CSS, LESS and SCSS,
- * which mean that we cannot support hover info in other languages
+ * Check is a CSSDocument's language is supported by the CSS language service
  */
-function shouldExcludeHover(document) {
-    const language = typeof document === 'string' ? document : extractLanguage(document);
+function isSupportedByLangService(language) {
     switch (language) {
-        case 'sass':
-        case 'stylus':
-        case 'styl':
-            return true;
-        default:
-            return false;
-    }
-}
-/**
- * Exclude certain language when getting colors
- * The CSS language service only supports CSS, LESS and SCSS,
- * which mean that we cannot support colors in other languages
- */
-function shouldExcludeColor(document) {
-    const language = typeof document === 'string' ? document : extractLanguage(document);
-    switch (language) {
-        case 'sass':
-        case 'stylus':
-        case 'styl':
+        case 'css':
+        case 'scss':
+        case 'less':
             return true;
         default:
             return false;

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/HTMLPlugin.d.ts

@@ -5,6 +5,7 @@ import { AstroDocument } from '../../core/documents/AstroDocument';
 export declare class HTMLPlugin implements Plugin {
     __name: string;
     private lang;
+    private attributeOnlyLang;
     private componentLang;
     private styleScriptTemplate;
     private configManager;

package/dist/plugins/html/HTMLPlugin.js

@@ -7,11 +7,16 @@ const vscode_html_languageservice_1 = require("vscode-html-languageservice");
 const utils_1 = require("../../core/documents/utils");
 const utils_2 = require("../../utils");
 const astro_attributes_1 = require("./features/astro-attributes");
+const utils_3 = require("./utils");
 class HTMLPlugin {
     constructor(configManager) {
         this.__name = 'html';
         this.lang = (0, vscode_html_languageservice_1.getLanguageService)({
+            customDataProviders: [astro_attributes_1.astroAttributes, astro_attributes_1.classListAttribute],
+        });
+        this.attributeOnlyLang = (0, vscode_html_languageservice_1.getLanguageService)({
             customDataProviders: [astro_attributes_1.astroAttributes],
+            useDefaultDataProvider: false,
         });
         this.componentLang = (0, vscode_html_languageservice_1.getLanguageService)({
             customDataProviders: [astro_attributes_1.astroAttributes, astro_attributes_1.astroDirectives],
@@ -66,9 +71,9 @@ class HTMLPlugin {
         // If we're in a component starting tag, we do not want HTML language completions
         // as HTML attributes are not valid for components
         const results = (0, utils_1.isInComponentStartTag)(html, document.offsetAt(position))
-            ? vscode_languageserver_1.CompletionList.create([])
-            : this.lang.doComplete(document, position, html);
-        return vscode_languageserver_1.CompletionList.create([...results.items, ...this.getLangCompletions(results.items), ...emmetResults.items], 
+            ? (0, utils_3.removeDataAttrCompletion)(this.attributeOnlyLang.doComplete(document, position, html).items)
+            : this.lang.doComplete(document, position, html).items;
+        return vscode_languageserver_1.CompletionList.create([...results, ...this.getLangCompletions(results), ...emmetResults.items], 
         // Emmet completions change on every keystroke, so they are never complete
         emmetResults.items.length > 0);
     }

package/dist/plugins/html/features/astro-attributes.d.ts

@@ -1,2 +1,3 @@
+export declare const classListAttribute: import("vscode-html-languageservice").IHTMLDataProvider;
 export declare const astroAttributes: import("vscode-html-languageservice").IHTMLDataProvider;
 export declare const astroDirectives: import("vscode-html-languageservice").IHTMLDataProvider;

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

@@ -1,14 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.astroDirectives = exports.astroAttributes = void 0;
+exports.astroDirectives = exports.astroAttributes = exports.classListAttribute = void 0;
 const vscode_html_languageservice_1 = require("vscode-html-languageservice");
-exports.astroAttributes = (0, vscode_html_languageservice_1.newHTMLDataProvider)('astro-attributes', {
+exports.classListAttribute = (0, vscode_html_languageservice_1.newHTMLDataProvider)('class-list', {
     version: 1,
     globalAttributes: [
         {
             name: 'class:list',
             description: 'Utility to provide a list of class',
         },
+    ],
+});
+exports.astroAttributes = (0, vscode_html_languageservice_1.newHTMLDataProvider)('astro-attributes', {
+    version: 1,
+    globalAttributes: [
         {
             name: 'set:html',
             description: 'Inject unescaped HTML into this tag',
@@ -38,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',
@@ -50,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',
+                        },
+                    ],
+                },
             ],
         },
         {
@@ -65,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',
+                        },
+                    ],
+                },
             ],
         },
     ],
@@ -75,6 +135,7 @@ exports.astroDirectives = (0, vscode_html_languageservice_1.newHTMLDataProvider)
         {
             name: 'client:load',
             description: 'Start importing the component JS at page load. Hydrate the component when import completes.',
+            valueSet: 'v',
             references: [
                 {
                     name: 'Astro documentation',
@@ -85,6 +146,7 @@ exports.astroDirectives = (0, vscode_html_languageservice_1.newHTMLDataProvider)
         {
             name: 'client:idle',
             description: 'Start importing the component JS as soon as main thread is free (uses requestIdleCallback()). Hydrate the component when import completes.',
+            valueSet: 'v',
             references: [
                 {
                     name: 'Astro documentation',
@@ -95,6 +157,7 @@ exports.astroDirectives = (0, vscode_html_languageservice_1.newHTMLDataProvider)
         {
             name: 'client:visible',
             description: 'Start importing the component JS as soon as the element enters the viewport (uses IntersectionObserver). Hydrate the component when import completes. Useful for content lower down on the page.',
+            valueSet: 'v',
             references: [
                 {
                     name: 'Astro documentation',
@@ -115,6 +178,7 @@ exports.astroDirectives = (0, vscode_html_languageservice_1.newHTMLDataProvider)
         {
             name: 'client:only',
             description: 'Start importing the component JS at page load and hydrate when the import completes, similar to client:load. The component will be skipped at build time, useful for components that are entirely dependent on client-side APIs. This is best avoided unless absolutely needed, in most cases it is best to render placeholder content on the server and delay any browser API calls until the component hydrates in the browser.',
+            valueSet: 'v',
             references: [
                 {
                     name: 'Astro documentation',

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

@@ -0,0 +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 completions
+ */
+export declare function removeDataAttrCompletion(items: CompletionItem[]): CompletionItem[];