@astrojs/language-server 0.23.2 → 0.24.1

package/dist/server.js

@@ -27,20 +27,20 @@ exports.startLanguageServer = void 0;
 const vscode = __importStar(require("vscode-languageserver"));
 const vscode_languageserver_1 = require("vscode-languageserver");
 const ConfigManager_1 = require("./core/config/ConfigManager");
-const DocumentManager_1 = require("./core/documents/DocumentManager");
 const DiagnosticsManager_1 = require("./core/DiagnosticsManager");
+const DocumentManager_1 = require("./core/documents/DocumentManager");
+const plugins_1 = require("./plugins");
 const AstroPlugin_1 = require("./plugins/astro/AstroPlugin");
 const CSSPlugin_1 = require("./plugins/css/CSSPlugin");
 const HTMLPlugin_1 = require("./plugins/html/HTMLPlugin");
 const PluginHost_1 = require("./plugins/PluginHost");
-const plugins_1 = require("./plugins");
-const utils_1 = require("./utils");
-const utils_2 = require("./plugins/typescript/utils");
 const CodeActionsProvider_1 = require("./plugins/typescript/features/CodeActionsProvider");
 const LanguageServiceManager_1 = require("./plugins/typescript/LanguageServiceManager");
+const utils_1 = require("./plugins/typescript/utils");
+const utils_2 = require("./utils");
 const TagCloseRequest = new vscode.RequestType('html/tag');
 // Start the language server
-function startLanguageServer(connection) {
+function startLanguageServer(connection, env) {
     // Create our managers
     const documentManager = new DocumentManager_1.DocumentManager();
     const pluginHost = new PluginHost_1.PluginHost(documentManager);
@@ -51,13 +51,13 @@ function startLanguageServer(connection) {
         const environment = params.initializationOptions?.environment ?? 'node';
         const workspaceUris = params.workspaceFolders?.map((folder) => folder.uri.toString()) ?? [params.rootUri ?? ''];
         workspaceUris.forEach((uri) => {
-            uri = (0, utils_1.urlToPath)(uri);
+            uri = (0, utils_2.urlToPath)(uri);
             // If the workspace is not an Astro project, we shouldn't warn about not finding Astro
             // Unless the extension enabled itself in an untitled workspace, in which case the warning is valid
-            if (!(0, utils_1.isAstroWorkspace)(uri) && uri !== '/' && uri !== '') {
+            if (!(0, utils_2.isAstroWorkspace)(uri) && uri !== '/' && uri !== '') {
                 return;
             }
-            const astroInstall = (0, utils_1.getAstroInstall)([uri]);
+            const astroInstall = (0, utils_2.getAstroInstall)([uri]);
             if (!astroInstall) {
                 connection.sendNotification(vscode_languageserver_1.ShowMessageNotification.type, {
                     message: `Couldn't find Astro in workspace "${uri}". Experience might be degraded. For the best experience, please make sure Astro is installed and then restart the language server`,
@@ -76,10 +76,20 @@ function startLanguageServer(connection) {
         pluginHost.registerPlugin(new CSSPlugin_1.CSSPlugin(configManager));
         // We don't currently support running the TypeScript and Astro plugin in the browser
         if (environment === 'node') {
-            const languageServiceManager = new LanguageServiceManager_1.LanguageServiceManager(documentManager, workspaceUris.map(utils_1.normalizeUri), configManager);
-            typescriptPlugin = new plugins_1.TypeScriptPlugin(configManager, languageServiceManager);
-            pluginHost.registerPlugin(new AstroPlugin_1.AstroPlugin(configManager, languageServiceManager));
-            pluginHost.registerPlugin(typescriptPlugin);
+            const ts = env.loadTypescript(params.initializationOptions);
+            if (ts) {
+                const tsLocalized = env.loadTypescriptLocalized(params.initializationOptions);
+                const languageServiceManager = new LanguageServiceManager_1.LanguageServiceManager(documentManager, workspaceUris.map(utils_2.normalizeUri), configManager, ts, tsLocalized);
+                typescriptPlugin = new plugins_1.TypeScriptPlugin(configManager, languageServiceManager);
+                pluginHost.registerPlugin(new AstroPlugin_1.AstroPlugin(configManager, languageServiceManager));
+                pluginHost.registerPlugin(typescriptPlugin);
+            }
+            else {
+                connection.sendNotification(vscode_languageserver_1.ShowMessageNotification.type, {
+                    message: `Astro: Couldn't load TypeScript from path ${params?.initializationOptions?.typescript?.serverPath}. Only HTML and CSS features will be enabled`,
+                    type: vscode_languageserver_1.MessageType.Warning,
+                });
+            }
         }
         return {
             capabilities: {
@@ -137,7 +147,7 @@ function startLanguageServer(connection) {
                 documentSymbolProvider: true,
                 linkedEditingRangeProvider: true,
                 semanticTokensProvider: {
-                    legend: (0, utils_2.getSemanticTokenLegend)(),
+                    legend: (0, utils_1.getSemanticTokenLegend)(),
                     range: true,
                     full: true,
                 },
@@ -173,11 +183,11 @@ function startLanguageServer(connection) {
         documentManager.updateDocument(params.textDocument, params.contentChanges);
     });
     const diagnosticsManager = new DiagnosticsManager_1.DiagnosticsManager(connection.sendDiagnostics, documentManager, pluginHost.getDiagnostics.bind(pluginHost));
-    const updateAllDiagnostics = (0, utils_1.debounceThrottle)(() => diagnosticsManager.updateAll(), 1000);
+    const updateAllDiagnostics = (0, utils_2.debounceThrottle)(() => diagnosticsManager.updateAll(), 1000);
     connection.onDidChangeWatchedFiles((evt) => {
         const params = evt.changes
             .map((change) => ({
-            fileName: (0, utils_1.urlToPath)(change.uri),
+            fileName: (0, utils_2.urlToPath)(change.uri),
             changeType: change.type,
         }))
             .filter((change) => !!change.fileName);
@@ -214,7 +224,7 @@ function startLanguageServer(connection) {
     connection.onRenameRequest((evt) => pluginHost.rename(evt.textDocument, evt.position, evt.newName));
     connection.onDidSaveTextDocument(updateAllDiagnostics);
     connection.onNotification('$/onDidChangeNonAstroFile', async (e) => {
-        const path = (0, utils_1.urlToPath)(e.uri);
+        const path = (0, utils_2.urlToPath)(e.uri);
         if (path) {
             pluginHost.updateNonAstroFile(path, e.changes);
         }
@@ -230,7 +240,7 @@ function startLanguageServer(connection) {
             return tsxOutput.code;
         }
     });
-    documentManager.on('documentChange', (0, utils_1.debounceThrottle)(async (document) => diagnosticsManager.update(document), 1000));
+    documentManager.on('documentChange', (0, utils_2.debounceThrottle)(async (document) => diagnosticsManager.update(document), 1000));
     documentManager.on('documentClose', (document) => {
         diagnosticsManager.removeDiagnostics(document);
         configManager.removeDocument(document.uri);

package/dist/utils.d.ts

@@ -1,4 +1,4 @@
-import { Position, Range } from 'vscode-languageserver';
+import type { Position, Range } from 'vscode-languageserver';
 /** Normalizes a document URI */
 export declare function normalizeUri(uri: string): string;
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/language-server",
-  "version": "0.23.2",
+  "version": "0.24.1",
   "author": "withastro",
   "license": "MIT",
   "type": "commonjs",
@@ -20,10 +20,10 @@
   },
   "dependencies": {
     "@vscode/emmet-helper": "^2.8.4",
+    "events": "^3.3.0",
     "prettier": "^2.7.1",
     "prettier-plugin-astro": "^0.5.3",
     "source-map": "^0.7.3",
-    "typescript": "~4.6.4",
     "vscode-css-languageservice": "^6.0.1",
     "vscode-html-languageservice": "^5.0.0",
     "vscode-languageserver": "^8.0.1",
@@ -39,7 +39,7 @@
     "@types/mocha": "^9.1.0",
     "@types/prettier": "^2.7.0",
     "@types/sinon": "^10.0.11",
-    "astro": "^1.0.0-beta.72",
+    "astro": "^1.1.3",
     "astro-scripts": "0.0.1",
     "chai": "^4.3.6",
     "cross-env": "^7.0.3",
@@ -47,6 +47,7 @@
     "sinon": "^13.0.1",
     "svelte": "^3.49.0",
     "ts-node": "^10.7.0",
-    "vue": "^3.2.37"
+    "vue": "^3.2.37",
+    "typescript": "~4.8.2"
   }
 }