@astrojs/language-server 2.8.3 → 2.8.4

package/dist/languageServerPlugin.js

@@ -73,16 +73,18 @@ function createServerOptions(connection, ts) {
     function getPrettierService() {
         let prettier;
         let prettierPluginPath;
+        let hasShownNotification = false;
         return (0, volar_service_prettier_1.create)((context) => {
             const workspaceUri = vscode_uri_1.URI.parse(context.env.workspaceFolder);
             if (workspaceUri.scheme === 'file') {
                 prettier = (0, importPackage_js_1.importPrettier)(workspaceUri.fsPath);
                 prettierPluginPath = (0, importPackage_js_1.getPrettierPluginPath)(workspaceUri.fsPath);
-                if (!prettier || !prettierPluginPath) {
+                if ((!prettier || !prettierPluginPath) && !hasShownNotification) {
                     connection.sendNotification(node_1.ShowMessageNotification.type, {
-                        message: "Couldn't load `prettier` or `prettier-plugin-astro`. Formatting will not work. Please make sure those two packages are installed into your project.",
+                        message: "Couldn't load `prettier` or `prettier-plugin-astro`. Formatting will not work. Please make sure those two packages are installed into your project and restart the language server.",
                         type: node_1.MessageType.Warning,
                     });
+                    hasShownNotification = true;
                 }
                 return prettier;
             }

package/dist/plugins/html.js

@@ -1,22 +1,61 @@
 "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;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.create = void 0;
 const language_server_1 = require("@volar/language-server");
 const volar_service_html_1 = require("volar-service-html");
+const html = __importStar(require("vscode-html-languageservice"));
+const vscode_uri_1 = require("vscode-uri");
 const index_js_1 = require("../core/index.js");
 const html_data_js_1 = require("./html-data.js");
 const utils_js_1 = require("./utils.js");
 const create = () => {
-    const htmlServicePlugin = (0, volar_service_html_1.create)();
+    const htmlServicePlugin = (0, volar_service_html_1.create)({
+        getCustomData: async (context) => {
+            const customData = (await context.env.getConfiguration?.('html.customData')) ?? [];
+            const newData = [];
+            for (const customDataPath of customData) {
+                const uri = vscode_uri_1.Utils.resolvePath(vscode_uri_1.URI.parse(context.env.workspaceFolder), customDataPath);
+                const json = await context.env.fs?.readFile?.(uri.toString());
+                if (json) {
+                    try {
+                        const data = JSON.parse(json);
+                        newData.push(html.newHTMLDataProvider(customDataPath, data));
+                    }
+                    catch (error) {
+                        console.error(error);
+                    }
+                }
+            }
+            return [...newData, html_data_js_1.astroAttributes, html_data_js_1.astroElements, html_data_js_1.classListAttribute];
+        },
+    });
     return {
         ...htmlServicePlugin,
         create(context) {
             const htmlPlugin = htmlServicePlugin.create(context);
-            htmlPlugin.provide['html/updateCustomData']?.([
-                html_data_js_1.astroAttributes,
-                html_data_js_1.astroElements,
-                html_data_js_1.classListAttribute,
-            ]);
             return {
                 ...htmlPlugin,
                 async provideCompletionItems(document, position, completionContext, token) {

package/dist/plugins/typescript/codeActions.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.enhancedResolveCodeAction = exports.enhancedProvideCodeActions = void 0;
 const language_server_1 = require("@volar/language-server");
 const index_js_1 = require("../../core/index.js");
-const utils_js_1 = require("../utils.js");
+const utils_js_1 = require("./utils.js");
 function enhancedProvideCodeActions(codeActions, context) {
     return codeActions.map((codeAction) => mapCodeAction(codeAction, context));
 }
@@ -26,13 +26,7 @@ function mapCodeAction(codeAction, context) {
             const code = source?.generated?.code;
             if (!virtualFile || !(code instanceof index_js_1.AstroVirtualCode))
                 return change;
-            change.edits = change.edits.map((edit) => {
-                const shouldModifyEdit = (0, utils_js_1.editShouldBeInFrontmatter)(edit.range, code.astroMeta);
-                if (shouldModifyEdit.itShould) {
-                    edit = (0, utils_js_1.ensureProperEditForFrontmatter)(edit, code.astroMeta, '\n');
-                }
-                return edit;
-            });
+            change.edits = change.edits.map((edit) => (0, utils_js_1.mapEdit)(edit, code, virtualFile.languageId));
         }
         return change;
     });

package/dist/plugins/typescript/completions.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.enhancedResolveCompletionItem = exports.enhancedProvideCompletionItems = void 0;
 const language_server_1 = require("@volar/language-server");
 const index_js_1 = require("../../core/index.js");
-const utils_js_1 = require("../utils.js");
+const utils_js_1 = require("./utils.js");
 function enhancedProvideCompletionItems(completions) {
     completions.items = completions.items.filter(isValidCompletion).map((completion) => {
         const source = completion?.data?.originalItem?.source;
@@ -35,12 +35,7 @@ function enhancedResolveCompletionItem(resolvedCompletion, context) {
         const code = source?.generated?.code;
         if (!virtualFile || !(code instanceof index_js_1.AstroVirtualCode))
             return resolvedCompletion;
-        resolvedCompletion.additionalTextEdits = resolvedCompletion.additionalTextEdits.map((edit) => {
-            if ((0, utils_js_1.editShouldBeInFrontmatter)(edit.range, code.astroMeta).itShould) {
-                edit = (0, utils_js_1.ensureProperEditForFrontmatter)(edit, code.astroMeta, '\n');
-            }
-            return edit;
-        });
+        resolvedCompletion.additionalTextEdits = resolvedCompletion.additionalTextEdits.map((edit) => (0, utils_js_1.mapEdit)(edit, code, virtualFile.languageId));
     }
     return resolvedCompletion;
 }

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

@@ -0,0 +1,3 @@
+import type { TextEdit } from 'vscode-html-languageservice';
+import type { AstroVirtualCode } from '../../core/index.js';
+export declare function mapEdit(edit: TextEdit, code: AstroVirtualCode, languageId: string): TextEdit;

package/dist/plugins/typescript/utils.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mapEdit = void 0;
+const utils_js_1 = require("../utils.js");
+function mapEdit(edit, code, languageId) {
+    // Don't attempt to move the edit to the frontmatter if the file isn't the root TSX file, it means it's a script tag
+    if (languageId === 'typescriptreact') {
+        if ((0, utils_js_1.editShouldBeInFrontmatter)(edit.range, code.astroMeta).itShould) {
+            edit = (0, utils_js_1.ensureProperEditForFrontmatter)(edit, code.astroMeta, '\n');
+        }
+    }
+    else {
+        // If the edit is at the start of the file, add a newline before it, otherwise we'll get `<script>text`
+        if (edit.range.start.line === 0 && edit.range.start.character === 0) {
+            edit.newText = '\n' + edit.newText;
+        }
+    }
+    return edit;
+}
+exports.mapEdit = mapEdit;
+//# sourceMappingURL=utils.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/language-server",
-  "version": "2.8.3",
+  "version": "2.8.4",
   "author": "withastro",
   "license": "MIT",
   "repository": {
@@ -22,11 +22,11 @@
   "dependencies": {
     "@astrojs/compiler": "^2.7.0",
     "@jridgewell/sourcemap-codec": "^1.4.15",
-    "@volar/kit": "~2.1.2",
-    "@volar/language-core": "~2.1.2",
-    "@volar/language-server": "~2.1.2",
-    "@volar/language-service": "~2.1.2",
-    "@volar/typescript": "~2.1.2",
+    "@volar/kit": "~2.1.5",
+    "@volar/language-core": "~2.1.5",
+    "@volar/language-server": "~2.1.5",
+    "@volar/language-service": "~2.1.5",
+    "@volar/typescript": "~2.1.5",
     "fast-glob": "^3.2.12",
     "volar-service-css": "0.0.34",
     "volar-service-emmet": "0.0.34",
@@ -44,7 +44,7 @@
     "@types/chai": "^4.3.5",
     "@types/mocha": "^10.0.1",
     "@types/node": "^18.17.8",
-    "@volar/test-utils": "~2.1.2",
+    "@volar/test-utils": "~2.1.5",
     "astro": "^4.3.5",
     "chai": "^4.3.7",
     "mocha": "^10.2.0",