@astrojs/language-server 2.0.0-next.7 → 2.0.0-next.9

package/dist/check.d.ts

@@ -0,0 +1,24 @@
+import * as kit from '@volar/kit';
+export { DiagnosticSeverity, type Diagnostic } from '@volar/language-server';
+export interface CheckResult {
+    errors: kit.Diagnostic[];
+    fileUrl: URL;
+    fileContent: string;
+}
+export declare class AstroCheck {
+    private readonly workspacePath;
+    private readonly typescriptPath;
+    private ts;
+    private project;
+    private linter;
+    constructor(workspacePath: string, typescriptPath: string | undefined);
+    /**
+     * Lint a list of files or the entire project and optionally log the errors found
+     * @param fileNames List of files to lint, if undefined, all files included in the project will be linted
+     * @param logErrors Whether to log errors by itself. This is disabled by default.
+     * @return {CheckResult} The result of the lint, including a list of errors, the file's content and its file path.
+     */
+    lint(fileNames?: string[] | undefined, logErrors?: boolean): Promise<CheckResult[]>;
+    private initialize;
+    private getTsconfig;
+}

package/dist/check.js

@@ -0,0 +1,117 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AstroCheck = exports.DiagnosticSeverity = void 0;
+const kit = __importStar(require("@volar/kit"));
+const fast_glob_1 = __importDefault(require("fast-glob"));
+const node_url_1 = require("node:url");
+const index_js_1 = require("./core/index.js");
+const svelte_js_1 = require("./core/svelte.js");
+const utils_js_1 = require("./core/utils.js");
+const vue_js_1 = require("./core/vue.js");
+const astro_js_1 = __importDefault(require("./plugins/astro.js"));
+const index_js_2 = __importDefault(require("./plugins/typescript/index.js"));
+// Export those for downstream consumers
+var language_server_1 = require("@volar/language-server");
+Object.defineProperty(exports, "DiagnosticSeverity", { enumerable: true, get: function () { return language_server_1.DiagnosticSeverity; } });
+class AstroCheck {
+    constructor(workspacePath, typescriptPath) {
+        this.workspacePath = workspacePath;
+        this.typescriptPath = typescriptPath;
+        this.initialize();
+    }
+    /**
+     * Lint a list of files or the entire project and optionally log the errors found
+     * @param fileNames List of files to lint, if undefined, all files included in the project will be linted
+     * @param logErrors Whether to log errors by itself. This is disabled by default.
+     * @return {CheckResult} The result of the lint, including a list of errors, the file's content and its file path.
+     */
+    async lint(fileNames = undefined, logErrors = false) {
+        const files = fileNames !== undefined
+            ? fileNames
+            : this.project.languageServiceHost
+                .getScriptFileNames()
+                .filter((file) => file.endsWith('.astro'));
+        const errors = [];
+        for (const file of files) {
+            const fileErrors = await this.linter.check(file);
+            if (logErrors) {
+                this.linter.logErrors(file, fileErrors);
+            }
+            if (fileErrors.length > 0) {
+                const fileSnapshot = this.project.languageServiceHost.getScriptSnapshot(file);
+                const fileContent = fileSnapshot?.getText(0, fileSnapshot.getLength());
+                errors.push({
+                    errors: fileErrors,
+                    fileContent: fileContent ?? '',
+                    fileUrl: (0, node_url_1.pathToFileURL)(file),
+                });
+            }
+        }
+        return errors;
+    }
+    initialize() {
+        this.ts = this.typescriptPath ? require(this.typescriptPath) : require('typescript');
+        const tsconfigPath = this.getTsconfig();
+        const config = {
+            languages: {
+                astro: (0, index_js_1.getLanguageModule)((0, utils_js_1.getAstroInstall)([this.workspacePath]), this.ts),
+                svelte: (0, svelte_js_1.getSvelteLanguageModule)(),
+                vue: (0, vue_js_1.getVueLanguageModule)(),
+            },
+            services: {
+                typescript: (0, index_js_2.default)(),
+                astro: (0, astro_js_1.default)(),
+            },
+        };
+        if (tsconfigPath) {
+            this.project = kit.createProject(tsconfigPath, [
+                { extension: 'astro', isMixedContent: true, scriptKind: 7 },
+                { extension: 'vue', isMixedContent: true, scriptKind: 7 },
+                { extension: 'svelte', isMixedContent: true, scriptKind: 7 },
+            ]);
+        }
+        else {
+            this.project = kit.createInferredProject(this.workspacePath, () => {
+                return fast_glob_1.default.sync('**/*.astro', {
+                    cwd: this.workspacePath,
+                    ignore: ['node_modules'],
+                    absolute: true,
+                });
+            });
+        }
+        this.linter = kit.createLinter(config, this.project.languageServiceHost);
+    }
+    getTsconfig() {
+        const tsconfig = this.ts.findConfigFile(this.workspacePath, this.ts.sys.fileExists) ||
+            this.ts.findConfigFile(this.workspacePath, this.ts.sys.fileExists, 'jsconfig.json');
+        return tsconfig;
+    }
+}
+exports.AstroCheck = AstroCheck;
+//# sourceMappingURL=check.js.map

package/dist/core/index.d.ts

@@ -19,6 +19,7 @@ export declare class AstroFile implements VirtualFile {
     };
     compilerDiagnostics: DiagnosticMessage[];
     htmlDocument: HTMLDocument;
+    scriptFiles: string[];
     codegenStacks: never[];
     constructor(sourceFileName: string, snapshot: ts.IScriptSnapshot, ts: typeof import('typescript/lib/tsserverlibrary.js'));
     get hasCompilationErrors(): boolean;

package/dist/core/index.js

@@ -107,7 +107,9 @@ class AstroFile {
             ? this.astroMeta.frontmatter.position.end.offset
             : 0);
         this.htmlDocument = htmlDocument;
-        htmlVirtualFile.embeddedFiles.push(...(0, parseCSS_1.extractStylesheets)(this.fileName, this.snapshot, htmlDocument, this.astroMeta.ast), ...(0, parseJS_js_1.extractScriptTags)(this.fileName, this.snapshot, htmlDocument, this.astroMeta.ast));
+        const scriptTags = (0, parseJS_js_1.extractScriptTags)(this.fileName, this.snapshot, htmlDocument, this.astroMeta.ast);
+        this.scriptFiles = scriptTags.map((scriptTag) => scriptTag.fileName);
+        htmlVirtualFile.embeddedFiles.push(...(0, parseCSS_1.extractStylesheets)(this.fileName, this.snapshot, htmlDocument, this.astroMeta.ast), ...scriptTags);
         this.embeddedFiles = [];
         this.embeddedFiles.push(htmlVirtualFile);
         const tsx = (0, astro2tsx_1.astro2tsx)(this.snapshot.getText(0, this.snapshot.getLength()), this.fileName, this.ts, htmlDocument);

package/dist/core/parseCSS.d.ts

@@ -4,4 +4,5 @@ import type ts from 'typescript/lib/tsserverlibrary';
 import type { HTMLDocument } from 'vscode-html-languageservice';
 import { AttributeNodeWithPosition } from './compilerUtils.js';
 export declare function extractStylesheets(fileName: string, snapshot: ts.IScriptSnapshot, htmlDocument: HTMLDocument, ast: ParseResult['ast']): VirtualFile[];
+export declare function collectClassesAndIds(ast: ParseResult['ast']): string[];
 export declare function findInlineStyles(ast: ParseResult['ast']): AttributeNodeWithPosition[];

package/dist/core/parseCSS.js

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.findInlineStyles = exports.extractStylesheets = void 0;
+exports.findInlineStyles = exports.collectClassesAndIds = exports.extractStylesheets = void 0;
 const language_core_1 = require("@volar/language-core");
 const SourceMap = __importStar(require("@volar/source-map"));
 const muggle = __importStar(require("muggle-string"));
@@ -82,7 +82,7 @@ function extractStylesheets(fileName, snapshot, htmlDocument, ast) {
                 getLength: () => text.length,
                 getChangeRange: () => undefined,
             },
-            capabilities: {},
+            capabilities: { documentSymbol: true },
             embeddedFiles: [],
             kind: language_core_1.FileKind.TextFile,
             mappings,
@@ -91,6 +91,27 @@ function extractStylesheets(fileName, snapshot, htmlDocument, ast) {
     return embeddedCSSFiles;
 }
 exports.extractStylesheets = extractStylesheets;
+function collectClassesAndIds(ast) {
+    const classesAndIds = [];
+    function walkDown(parent) {
+        if (!parent.children)
+            return;
+        parent.children.forEach((child) => {
+            if (compilerUtils_js_1.is.element(child)) {
+                const classOrIDAttributes = child.attributes
+                    .filter((attr) => attr.kind === 'quoted' && (attr.name === 'class' || attr.name === 'id'))
+                    .flatMap((attr) => attr.value.split(' '));
+                classesAndIds.push(...classOrIDAttributes);
+            }
+            if (compilerUtils_js_1.is.parent(child)) {
+                walkDown(child);
+            }
+        });
+    }
+    walkDown(ast);
+    return classesAndIds;
+}
+exports.collectClassesAndIds = collectClassesAndIds;
 function findInlineStyles(ast) {
     const styleAttrs = [];
     // `@astrojs/compiler`'s `walk` method is async, so we can't use it here. Arf

package/dist/core/parseHTML.d.ts

@@ -5,3 +5,7 @@ export declare function parseHTML(fileName: string, snapshot: ts.IScriptSnapshot
     virtualFile: VirtualFile;
     htmlDocument: html.HTMLDocument;
 };
+/**
+ * scan the text and remove any `>` or `<` that cause the tag to end short
+ */
+export declare function preprocessHTML(text: string, frontmatterEnd?: number): string;

package/dist/core/parseHTML.js

@@ -23,13 +23,13 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseHTML = void 0;
+exports.preprocessHTML = exports.parseHTML = void 0;
 const language_core_1 = require("@volar/language-core");
 const html = __importStar(require("vscode-html-languageservice"));
 const utils_1 = require("../utils");
 const htmlLs = html.getLanguageService();
 function parseHTML(fileName, snapshot, frontmatterEnd) {
-    const htmlContent = preprocess(snapshot.getText(0, snapshot.getLength()), frontmatterEnd);
+    const htmlContent = preprocessHTML(snapshot.getText(0, snapshot.getLength()), frontmatterEnd);
     return {
         virtualFile: getHTMLVirtualFile(fileName, htmlContent),
         htmlDocument: getHTMLDocument(htmlContent),
@@ -40,7 +40,7 @@ const createScanner = htmlLs.createScanner;
 /**
  * scan the text and remove any `>` or `<` that cause the tag to end short
  */
-function preprocess(text, frontmatterEnd) {
+function preprocessHTML(text, frontmatterEnd) {
     let content = text.split('').fill(' ', 0, frontmatterEnd).join('');
     let scanner = createScanner(content);
     let token = scanner.scan();
@@ -82,6 +82,7 @@ function preprocess(text, frontmatterEnd) {
         scanner = createScanner(content, offset, state ?? html.ScannerState.WithinTag);
     }
 }
+exports.preprocessHTML = preprocessHTML;
 function getHTMLVirtualFile(fileName, preprocessedHTML) {
     return {
         fileName: fileName + `.html`,

package/dist/core/utils.js

@@ -82,7 +82,7 @@ function framework2tsx(fileName, filePath, sourceCode, framework) {
         return {
             fileName: fileName + '.tsx',
             capabilities: language_core_1.FileCapabilities.full,
-            kind: language_core_1.FileKind.TextFile,
+            kind: language_core_1.FileKind.TypeScriptHostFile,
             snapshot: {
                 getText: (start, end) => content.substring(start, end),
                 getLength: () => content.length,

package/dist/index.d.ts

@@ -1 +1,2 @@
 export * as protocol from '@volar/language-server/protocol';
+export { AstroCheck, CheckResult, Diagnostic, DiagnosticSeverity } from './check.js';

package/dist/index.js

@@ -23,6 +23,9 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.protocol = void 0;
+exports.DiagnosticSeverity = exports.AstroCheck = exports.protocol = void 0;
 exports.protocol = __importStar(require("@volar/language-server/protocol"));
+var check_js_1 = require("./check.js");
+Object.defineProperty(exports, "AstroCheck", { enumerable: true, get: function () { return check_js_1.AstroCheck; } });
+Object.defineProperty(exports, "DiagnosticSeverity", { enumerable: true, get: function () { return check_js_1.DiagnosticSeverity; } });
 //# sourceMappingURL=index.js.map

package/dist/languageServerPlugin.js

@@ -52,6 +52,11 @@ const plugin = (initOptions, modules) => ({
         config.services.astro ??= (0, astro_js_1.default)();
         config.services.prettier ??= (0, volar_service_prettier_1.default)({
             languages: ['astro'],
+            resolveConfigOptions: {
+                // Prettier's cache is a bit cumbersome, because you need to reload the config yourself on change
+                // TODO: Upstream a fix for this
+                useCache: false,
+            },
             additionalOptions: (resolvedConfig) => {
                 function getAstroPrettierPlugin() {
                     if (!ctx?.project.rootUri)
@@ -66,6 +71,7 @@ const plugin = (initOptions, modules) => ({
                 return {
                     plugins: [...getAstroPrettierPlugin(), ...(resolvedConfig.plugins ?? [])],
                     parser: 'astro',
+                    ...resolvedConfig,
                 };
             },
         });

package/dist/plugins/astro.js

@@ -48,7 +48,7 @@ exports.default = () => (context, modules) => {
         provideCodeLenses(document, token) {
             if (token.isCancellationRequested)
                 return;
-            if (!modules?.typescript || !context?.typescript || !(0, utils_js_1.isTsDocument)(document.languageId))
+            if (!modules?.typescript || !context?.typescript || !(0, utils_js_1.isJSDocument)(document.languageId))
                 return;
             const ts = modules?.typescript;
             const tsProgram = context.typescript.languageService.getProgram();

package/dist/plugins/html.d.ts

@@ -1,3 +1,3 @@
-import type { Service } from '@volar/language-server';
+import { Service } from '@volar/language-server';
 declare const _default: () => Service;
 export default _default;

package/dist/plugins/html.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const language_server_1 = require("@volar/language-server");
 const volar_service_html_1 = __importDefault(require("volar-service-html"));
 const index_js_1 = require("../core/index.js");
 const utils_js_1 = require("../utils.js");
@@ -19,7 +20,7 @@ exports.default = () => (context, modules) => {
     ]);
     return {
         ...htmlPlugin,
-        provideCompletionItems(document, position, completionContext, token) {
+        async provideCompletionItems(document, position, completionContext, token) {
             if (document.languageId !== 'html')
                 return;
             const [_, source] = context.documents.getVirtualFileByUri(document.uri);
@@ -30,7 +31,17 @@ exports.default = () => (context, modules) => {
             if ((0, utils_js_1.isInComponentStartTag)(rootVirtualFile.htmlDocument, document.offsetAt(position))) {
                 return null;
             }
-            return htmlPlugin.provideCompletionItems(document, position, completionContext, token);
+            const completions = await htmlPlugin.provideCompletionItems(document, position, completionContext, token);
+            if (!completions) {
+                return null;
+            }
+            // We don't want completions for file references, as they're mostly invalid for Astro
+            completions.items = completions.items.filter((completion) => completion.kind !== language_server_1.CompletionItemKind.File);
+            return completions;
+        },
+        // Document links provided by `vscode-html-languageservice` are invalid for Astro
+        provideDocumentLinks() {
+            return [];
         },
     };
 };

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

@@ -1,4 +1,4 @@
 import { CodeAction } from '@volar/language-server';
 import type { TextDocument } from 'vscode-html-languageservice';
 import type { AstroFile } from '../../core/index.js';
-export declare function enhancedProvideCodeActions(codeActions: CodeAction[], file: AstroFile, document: TextDocument, newLine: string): CodeAction[];
+export declare function enhancedProvideCodeActions(codeActions: CodeAction[], file: AstroFile, document: TextDocument, originalDocument: TextDocument, newLine: string): CodeAction[];

package/dist/plugins/typescript/codeActions.js

@@ -2,11 +2,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.enhancedProvideCodeActions = void 0;
 const language_server_1 = require("@volar/language-server");
+const vscode_uri_1 = require("vscode-uri");
 const utils_js_1 = require("../../utils.js");
-function enhancedProvideCodeActions(codeActions, file, document, newLine) {
+// Q: Why provideCodeActions instead of resolveCodeAction?
+// A: TypeScript actions are already fully resolved in provideCodeActions, so editors won't call resolveCodeAction at all.
+function enhancedProvideCodeActions(codeActions, file, document, originalDocument, newLine) {
     codeActions = codeActions.map((codeAction) => {
         if (!codeAction.edit)
             return codeAction;
+        if (file.scriptFiles.includes(vscode_uri_1.URI.parse(originalDocument.uri).path))
+            return codeAction;
         codeAction.edit.documentChanges = codeAction.edit.documentChanges?.map((change) => {
             if (language_server_1.TextDocumentEdit.is(change)) {
                 change.edits = change.edits.map((edit) => {

package/dist/plugins/typescript/completions.js

@@ -31,8 +31,16 @@ function enhancedResolveCompletionItem(resolvedCompletion, originalItem, context
     const file = source?.root;
     if (!(file instanceof index_js_1.AstroFile) || !context.host)
         return resolvedCompletion;
+    if (file.scriptFiles.includes(originalItem.data.fileName))
+        return resolvedCompletion;
     const newLine = context.host.getNewLine ? context.host.getNewLine() : '\n';
     resolvedCompletion.additionalTextEdits = resolvedCompletion.additionalTextEdits?.map((edit) => {
+        // HACK: There's a weird situation sometimes where some components (especially Svelte) will get imported as type imports
+        // for some unknown reason. This work around the problem by always ensuring a normal import for components
+        if (resolvedCompletion.data.isComponent && edit.newText.includes('import type')) {
+            edit.newText.replace('import type', 'import');
+        }
+        // Return a different edit depending on the state of the formatter
         if (file.astroMeta.frontmatter.status === 'doesnt-exist') {
             return (0, utils_js_1.getNewFrontmatterEdit)(edit, newLine);
         }
@@ -68,7 +76,11 @@ const svelte2tsxTypes = new Set([
 ]);
 function isValidCompletion(completion) {
     const isSvelte2tsxCompletion = completion.label.startsWith('__sveltets_') || svelte2tsxTypes.has(completion.label);
-    if (isSvelte2tsxCompletion)
+    // Filter out completions for the children prop, as it doesn't work in Astro
+    const isChildrenCompletion = completion.label === 'children?' &&
+        completion.kind === language_server_1.CompletionItemKind.Field &&
+        completion.filterText === 'children={$1}';
+    if (isSvelte2tsxCompletion || isChildrenCompletion)
         return false;
     return true;
 }

package/dist/plugins/typescript/index.js

@@ -11,7 +11,11 @@ const diagnostics_js_1 = require("./diagnostics.js");
 exports.default = () => (context, modules) => {
     const typeScriptPlugin = (0, volar_service_typescript_1.default)()(context, modules);
     if (!context) {
-        return { triggerCharacters: typeScriptPlugin.triggerCharacters };
+        return {
+            triggerCharacters: typeScriptPlugin.triggerCharacters,
+            signatureHelpTriggerCharacters: typeScriptPlugin.signatureHelpTriggerCharacters,
+            signatureHelpRetriggerCharacters: typeScriptPlugin.signatureHelpRetriggerCharacters,
+        };
     }
     return {
         ...typeScriptPlugin,
@@ -36,7 +40,7 @@ exports.default = () => (context, modules) => {
             if (!(file instanceof index_js_1.AstroFile) || !context.host)
                 return codeActions;
             const newLine = context.host.getNewLine ? context.host.getNewLine() : '\n';
-            return (0, codeActions_js_1.enhancedProvideCodeActions)(codeActions, file, context.documents.getDocumentByFileName(file.snapshot, file.sourceFileName), newLine);
+            return (0, codeActions_js_1.enhancedProvideCodeActions)(codeActions, file, context.documents.getDocumentByFileName(file.snapshot, file.sourceFileName), document, newLine);
         },
         async provideSemanticDiagnostics(document, token) {
             const [_, source] = context.documents.getVirtualFileByUri(document.uri);

package/dist/utils.d.ts

@@ -1,7 +1,7 @@
 import type { Point } from '@astrojs/compiler/types';
 import { HTMLDocument, Node, Position, Range, TextEdit } from 'vscode-html-languageservice';
 import type { FrontmatterStatus } from './core/parseAstro.js';
-export declare function isTsDocument(languageId: string): boolean;
+export declare function isJSDocument(languageId: string): boolean;
 /**
  * Return true if a specific node could be a component.
  * This is not a 100% sure test as it'll return false for any component that does not match the standard format for a component
@@ -24,7 +24,7 @@ export declare function isInsideFrontmatter(offset: number, frontmatter: Frontma
  */
 export declare function PointToPosition(point: Point): Position;
 /**
- * Force a range to be at the start of the frontmatter
+ * Force a range to be at the start of the frontmatter if it is outside
  */
 export declare function ensureRangeIsInFrontmatter(range: Range, frontmatter: FrontmatterStatus): Range;
 export declare function getNewFrontmatterEdit(edit: TextEdit, newLine: string): TextEdit;

package/dist/utils.js

@@ -3,16 +3,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getWorkspacePnpPath = exports.getOpenFrontmatterEdit = exports.getNewFrontmatterEdit = exports.ensureRangeIsInFrontmatter = exports.PointToPosition = exports.isInsideFrontmatter = exports.isInsideExpression = exports.isInComponentStartTag = exports.isPossibleComponent = exports.isTsDocument = void 0;
+exports.getWorkspacePnpPath = exports.getOpenFrontmatterEdit = exports.getNewFrontmatterEdit = exports.ensureRangeIsInFrontmatter = exports.PointToPosition = exports.isInsideFrontmatter = exports.isInsideExpression = exports.isInComponentStartTag = exports.isPossibleComponent = exports.isJSDocument = void 0;
 const node_path_1 = __importDefault(require("node:path"));
 const vscode_html_languageservice_1 = require("vscode-html-languageservice");
-function isTsDocument(languageId) {
+function isJSDocument(languageId) {
     return (languageId === 'javascript' ||
         languageId === 'typescript' ||
         languageId === 'javascriptreact' ||
         languageId === 'typescriptreact');
 }
-exports.isTsDocument = isTsDocument;
+exports.isJSDocument = isJSDocument;
 /**
  * Return true if a specific node could be a component.
  * This is not a 100% sure test as it'll return false for any component that does not match the standard format for a component
@@ -55,17 +55,25 @@ exports.isInsideFrontmatter = isInsideFrontmatter;
  * Transform a Point from the Astro compiler to an LSP Position
  */
 function PointToPosition(point) {
-    return vscode_html_languageservice_1.Position.create(point.line, point.column);
+    // Columns are 0-based in LSP, but the compiler's Point are 1 based.
+    return vscode_html_languageservice_1.Position.create(point.line, point.column - 1);
 }
 exports.PointToPosition = PointToPosition;
 /**
- * Force a range to be at the start of the frontmatter
+ * Force a range to be at the start of the frontmatter if it is outside
  */
 function ensureRangeIsInFrontmatter(range, frontmatter) {
     if (frontmatter.status === 'open' || frontmatter.status === 'closed') {
-        const position = PointToPosition(frontmatter.position.start);
-        position.line += 1;
-        return vscode_html_languageservice_1.Range.create(position, position);
+        const frontmatterStartPosition = PointToPosition(frontmatter.position.start);
+        const frontmatterEndPosition = frontmatter.position.end
+            ? PointToPosition(frontmatter.position.end)
+            : undefined;
+        // If the range start is outside the frontmatter, return a range at the start of the frontmatter
+        if (range.start.line < frontmatterStartPosition.line ||
+            (frontmatterEndPosition && range.start.line > frontmatterEndPosition.line)) {
+            return vscode_html_languageservice_1.Range.create(frontmatterStartPosition, frontmatterStartPosition);
+        }
+        return range;
     }
     return range;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/language-server",
-  "version": "2.0.0-next.7",
+  "version": "2.0.0-next.9",
   "author": "withastro",
   "license": "MIT",
   "repository": {
@@ -22,6 +22,7 @@
   "dependencies": {
     "@astrojs/compiler": "^1.4.2",
     "@jridgewell/sourcemap-codec": "^1.4.15",
+    "@volar/kit": "^1.6.9",
     "@volar/language-core": "^1.6.9",
     "@volar/language-server": "^1.6.9",
     "@volar/language-service": "^1.6.9",
@@ -29,7 +30,7 @@
     "fast-glob": "^3.2.12",
     "muggle-string": "^0.3.1",
     "prettier": "^2.8.8",
-    "prettier-plugin-astro": "^0.9.0",
+    "prettier-plugin-astro": "^0.9.1",
     "volar-service-css": "^0.0.4",
     "volar-service-emmet": "^0.0.4",
     "volar-service-html": "^0.0.4",
@@ -57,7 +58,7 @@
   "scripts": {
     "build": "tsc",
     "dev": "tsc --watch",
-    "test": "mocha --require tsx --require test/takedown.ts test/misc/init.test.ts test/**/*.test.ts",
+    "test": "mocha --timeout 10000 --require tsx --require test/takedown.ts test/misc/init.test.ts test/**/*.test.ts",
     "test:match": "pnpm run test -g"
   }
 }