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

package/dist/core/parseHTML.js

@@ -96,7 +96,7 @@ function getHTMLVirtualFile(fileName, preprocessedHTML) {
             {
                 sourceRange: [0, preprocessedHTML.length],
                 generatedRange: [0, preprocessedHTML.length],
-                data: { ...language_core_1.FileRangeCapabilities.full, completion: { additional: true } },
+                data: language_core_1.FileRangeCapabilities.full,
             },
         ],
         capabilities: {

package/dist/plugins/html.d.ts

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

package/dist/plugins/html.js

@@ -7,12 +7,16 @@ 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");
 const html_data_js_1 = require("./html-data.js");
-exports.default = () => (context) => {
-    const htmlPlugin = (0, volar_service_html_1.default)()(context);
+exports.default = () => (context, modules) => {
+    const htmlPlugin = (0, volar_service_html_1.default)()(context, modules);
     if (!context) {
         return { triggerCharacters: htmlPlugin.triggerCharacters };
     }
-    htmlPlugin.updateCustomData([html_data_js_1.astroAttributes, html_data_js_1.astroElements, html_data_js_1.classListAttribute]);
+    htmlPlugin.provide['html/updateCustomData']?.([
+        html_data_js_1.astroAttributes,
+        html_data_js_1.astroElements,
+        html_data_js_1.classListAttribute,
+    ]);
     return {
         ...htmlPlugin,
         provideCompletionItems(document, position, completionContext, token) {

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

@@ -1,4 +1,4 @@
-import { CodeAction } from '@volar/language-service';
+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[];

package/dist/plugins/typescript/codeActions.js

@@ -1,14 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.enhancedProvideCodeActions = void 0;
-const language_service_1 = require("@volar/language-service");
+const language_server_1 = require("@volar/language-server");
 const utils_js_1 = require("../../utils.js");
 function enhancedProvideCodeActions(codeActions, file, document, newLine) {
     codeActions = codeActions.map((codeAction) => {
         if (!codeAction.edit)
             return codeAction;
         codeAction.edit.documentChanges = codeAction.edit.documentChanges?.map((change) => {
-            if (language_service_1.TextDocumentEdit.is(change)) {
+            if (language_server_1.TextDocumentEdit.is(change)) {
                 change.edits = change.edits.map((edit) => {
                     // Move code actions adding new imports to the frontmatter, as by default they'll be outside of it
                     // TODO: This is a bit brittle, but we're unfortunately too late into the process to be able to tell the `fixName`
@@ -30,7 +30,7 @@ function enhancedProvideCodeActions(codeActions, file, document, newLine) {
                                 return (0, utils_js_1.getOpenFrontmatterEdit)(edit, newLine);
                             case 'closed':
                                 const position = (0, utils_js_1.PointToPosition)(file.astroMeta.frontmatter.position.end);
-                                edit.range = language_service_1.Range.create(position, position);
+                                edit.range = language_server_1.Range.create(position, position);
                                 return edit;
                             case 'doesnt-exist':
                                 return (0, utils_js_1.getNewFrontmatterEdit)(edit, newLine);

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

@@ -1,3 +1,3 @@
-import { CompletionItem, CompletionList, ServiceContext } from '@volar/language-service';
+import { CompletionItem, CompletionList, ServiceContext } from '@volar/language-server';
 export declare function enhancedProvideCompletionItems(completions: CompletionList): CompletionList;
 export declare function enhancedResolveCompletionItem(resolvedCompletion: CompletionItem, originalItem: CompletionItem, context: ServiceContext): CompletionItem;

package/dist/plugins/typescript/completions.js

@@ -1,20 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.enhancedResolveCompletionItem = exports.enhancedProvideCompletionItems = void 0;
-const language_service_1 = require("@volar/language-service");
-const vscode_html_languageservice_1 = require("vscode-html-languageservice");
+const language_server_1 = require("@volar/language-server");
 const index_js_1 = require("../../core/index.js");
 const utils_js_1 = require("../../utils.js");
-const defaultHTMLProvider = (0, vscode_html_languageservice_1.getDefaultHTMLDataProvider)();
-const defaultTags = new Set(defaultHTMLProvider.provideTags().map((tag) => tag.name));
-const defaultAttributes = new Set(defaultHTMLProvider.provideTags().flatMap((tag) => tag.attributes.map((attr) => attr.name)));
 function enhancedProvideCompletionItems(completions) {
     completions.items = completions.items.filter(isValidCompletion).map((completion) => {
         const source = completion?.data?.originalItem?.source;
         if (source) {
             // For components import, use the file kind and sort them higher, as they're often what the user want over something else
             if (['.astro', '.svelte', '.vue'].some((ext) => source.endsWith(ext))) {
-                completion.kind = language_service_1.CompletionItemKind.File;
+                completion.kind = language_server_1.CompletionItemKind.File;
                 completion.detail = completion.detail + '\n\n' + source;
                 completion.sortText = '\0';
                 completion.data.isComponent = true;
@@ -72,8 +68,6 @@ const svelte2tsxTypes = new Set([
 ]);
 function isValidCompletion(completion) {
     const isSvelte2tsxCompletion = completion.label.startsWith('__sveltets_') || svelte2tsxTypes.has(completion.label);
-    if (defaultTags.has(completion.label) || defaultAttributes.has(completion.label))
-        return false;
     if (isSvelte2tsxCompletion)
         return false;
     return true;

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

@@ -1,4 +1,4 @@
-import type { Diagnostic } from '@volar/language-service';
+import type { Diagnostic } from '@volar/language-server';
 export declare enum DiagnosticCodes {
     IS_NOT_A_MODULE = 2306,
     CANNOT_FIND_MODULE = 2307,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/language-server",
-  "version": "2.0.0-next.0",
+  "version": "2.0.0-next.7",
   "author": "withastro",
   "license": "MIT",
   "repository": {
@@ -20,30 +20,33 @@
     "astro-ls": "./bin/nodeServer.js"
   },
   "dependencies": {
-    "@astrojs/compiler": "^1.4.1",
+    "@astrojs/compiler": "^1.4.2",
     "@jridgewell/sourcemap-codec": "^1.4.15",
-    "@volar/language-core": "^1.6.2",
-    "@volar/language-server": "^1.6.2",
-    "@volar/language-service": "^1.6.2",
-    "@volar/source-map": "^1.6.2",
+    "@volar/language-core": "^1.6.9",
+    "@volar/language-server": "^1.6.9",
+    "@volar/language-service": "^1.6.9",
+    "@volar/source-map": "^1.6.9",
+    "fast-glob": "^3.2.12",
     "muggle-string": "^0.3.1",
-    "volar-service-css": "^0.0.2",
-    "volar-service-emmet": "^0.0.2",
-    "volar-service-html": "^0.0.2",
-    "volar-service-prettier": "^0.0.1",
-    "volar-service-typescript": "^0.0.2",
-    "volar-service-typescript-twoslash-queries": "^0.0.2",
+    "prettier": "^2.8.8",
+    "prettier-plugin-astro": "^0.9.0",
+    "volar-service-css": "^0.0.4",
+    "volar-service-emmet": "^0.0.4",
+    "volar-service-html": "^0.0.4",
+    "volar-service-prettier": "^0.0.4",
+    "volar-service-typescript": "^0.0.4",
+    "volar-service-typescript-twoslash-queries": "^0.0.4",
     "vscode-html-languageservice": "^5.0.5",
-    "vscode-uri": "^3.0.7",
-    "fast-glob": "^3.2.12"
+    "vscode-uri": "^3.0.7"
   },
   "devDependencies": {
-    "@astrojs/svelte": "^2.1.1",
-    "@astrojs/vue": "^2.1.1",
+    "@astrojs/svelte": "^2.2.0",
+    "@astrojs/vue": "^2.2.0",
     "@types/chai": "^4.3.5",
     "@types/mocha": "^10.0.1",
     "@types/node": "^16.18.26",
-    "astro": "^2.4.4",
+    "@types/prettier": "^2.7.2",
+    "astro": "^2.5.4",
     "chai": "^4.3.7",
     "mocha": "^10.2.0",
     "tsx": "^3.12.7",