@astrojs/language-server 0.15.0 → 0.17.0

package/dist/plugins/typescript/utils.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ensureRealFilePath = exports.ensureRealAstroFilePath = exports.toRealAstroFilePath = exports.toVirtualFilePath = exports.toVirtualAstroFilePath = exports.isVirtualFilePath = exports.isVirtualSvelteFilePath = exports.isVirtualVueFilePath = exports.isVirtualAstroFilePath = exports.isFrameworkFilePath = exports.isAstroFilePath = exports.isVirtualFrameworkFilePath = exports.getFrameworkFromFilePath = exports.removeAstroComponentSuffix = exports.ensureFrontmatterInsert = exports.convertToLocationRange = exports.convertRange = exports.mapSeverity = exports.getScriptKindFromFileName = exports.isSubPath = exports.findTsConfigPath = exports.getExtensionFromScriptKind = exports.getCommitCharactersForScriptElement = exports.scriptElementKindToCompletionItemKind = exports.symbolKindFromString = exports.getSemanticTokenLegend = void 0;
+exports.getScriptTagSnapshot = exports.ensureRealFilePath = exports.ensureRealAstroFilePath = exports.toRealAstroFilePath = exports.toVirtualFilePath = exports.toVirtualAstroFilePath = exports.isVirtualFilePath = exports.isVirtualSvelteFilePath = exports.isVirtualVueFilePath = exports.isVirtualAstroFilePath = exports.isFrameworkFilePath = exports.isAstroFilePath = exports.isVirtualFrameworkFilePath = exports.getFrameworkFromFilePath = exports.removeAstroComponentSuffix = exports.checkEndOfFileCodeInsert = exports.ensureFrontmatterInsert = exports.convertToLocationRange = exports.convertRange = exports.mapSeverity = exports.getScriptKindFromFileName = exports.isSubPath = exports.findTsConfigPath = exports.getExtensionFromScriptKind = exports.getCommitCharactersForScriptElement = exports.scriptElementKindToCompletionItemKind = exports.symbolKindFromString = exports.getSemanticTokenLegend = void 0;
 const typescript_1 = __importDefault(require("typescript"));
 const path_1 = require("path");
 const utils_1 = require("../../utils");
@@ -251,6 +251,18 @@ function ensureFrontmatterInsert(resultRange, document) {
     return resultRange;
 }
 exports.ensureFrontmatterInsert = ensureFrontmatterInsert;
+// Some code actions ill insert code at the end of the generated TSX file, so we'll manually
+// redirect it to the end of the frontmatter instead
+function checkEndOfFileCodeInsert(resultRange, document) {
+    if (resultRange.start.line > document.lineCount) {
+        if (document.astroMeta.frontmatter.state === 'closed') {
+            const position = document.positionAt(document.astroMeta.frontmatter.endOffset);
+            return vscode_languageserver_1.Range.create(position, position);
+        }
+    }
+    return resultRange;
+}
+exports.checkEndOfFileCodeInsert = checkEndOfFileCodeInsert;
 function removeAstroComponentSuffix(name) {
     return name.replace(/(\w+)__AstroComponent_/, '$1');
 }
@@ -334,3 +346,19 @@ function ensureRealFilePath(filePath) {
     }
 }
 exports.ensureRealFilePath = ensureRealFilePath;
+function getScriptTagSnapshot(snapshot, document, tagInfo, position) {
+    const index = document.scriptTags.findIndex((value) => value.container.start == tagInfo.start);
+    const scriptFilePath = snapshot.filePath + `.__script${index}.js`;
+    const scriptTagSnapshot = snapshot.scriptTagSnapshots[index];
+    let offset = 0;
+    if (position) {
+        offset = scriptTagSnapshot.offsetAt(scriptTagSnapshot.getGeneratedPosition(position));
+    }
+    return {
+        snapshot: scriptTagSnapshot,
+        filePath: scriptFilePath,
+        index,
+        offset,
+    };
+}
+exports.getScriptTagSnapshot = getScriptTagSnapshot;

package/dist/server.js

@@ -36,16 +36,17 @@ 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 TagCloseRequest = new vscode.RequestType('html/tag');
 // Start the language server
 function startLanguageServer(connection) {
     // Create our managers
-    const configManager = new ConfigManager_1.ConfigManager();
     const documentManager = new DocumentManager_1.DocumentManager();
     const pluginHost = new PluginHost_1.PluginHost(documentManager);
+    const configManager = new ConfigManager_1.ConfigManager(connection);
+    let hasConfigurationCapability = false;
     connection.onInitialize((params) => {
-        var _a, _b, _c, _d, _e, _f;
-        const workspaceUris = (_b = (_a = params.workspaceFolders) === null || _a === void 0 ? void 0 : _a.map((folder) => folder.uri.toString())) !== null && _b !== void 0 ? _b : [(_c = params.rootUri) !== null && _c !== void 0 ? _c : ''];
+        const workspaceUris = params.workspaceFolders?.map((folder) => folder.uri.toString()) ?? [params.rootUri ?? ''];
         workspaceUris.forEach((uri) => {
             uri = (0, utils_1.urlToPath)(uri);
             const astroVersion = (0, utils_1.getUserAstroVersion)(uri);
@@ -62,9 +63,10 @@ function startLanguageServer(connection) {
                 });
             }
         });
+        hasConfigurationCapability = !!(params.capabilities.workspace && !!params.capabilities.workspace.configuration);
         pluginHost.initialize({
-            filterIncompleteCompletions: !((_d = params.initializationOptions) === null || _d === void 0 ? void 0 : _d.dontFilterIncompleteCompletions),
-            definitionLinkSupport: !!((_f = (_e = params.capabilities.textDocument) === null || _e === void 0 ? void 0 : _e.definition) === null || _f === void 0 ? void 0 : _f.linkSupport),
+            filterIncompleteCompletions: !params.initializationOptions?.dontFilterIncompleteCompletions,
+            definitionLinkSupport: !!params.capabilities.textDocument?.definition?.linkSupport,
         });
         // Register plugins
         pluginHost.registerPlugin(new HTMLPlugin_1.HTMLPlugin(configManager));
@@ -74,15 +76,26 @@ function startLanguageServer(connection) {
             pluginHost.registerPlugin(new AstroPlugin_1.AstroPlugin(documentManager, configManager, workspaceUris));
             pluginHost.registerPlugin(new plugins_1.TypeScriptPlugin(documentManager, configManager, workspaceUris));
         }
-        // Update language-server config with what the user supplied to us at launch
-        configManager.updateConfig(params.initializationOptions.configuration.astro);
-        configManager.updateEmmetConfig(params.initializationOptions.configuration.emmet);
         return {
             capabilities: {
-                textDocumentSync: vscode.TextDocumentSyncKind.Incremental,
+                textDocumentSync: {
+                    openClose: true,
+                    change: vscode.TextDocumentSyncKind.Incremental,
+                    save: {
+                        includeText: true,
+                    },
+                },
                 foldingRangeProvider: true,
                 definitionProvider: true,
                 renameProvider: true,
+                codeActionProvider: {
+                    codeActionKinds: [
+                        vscode_languageserver_1.CodeActionKind.QuickFix,
+                        vscode_languageserver_1.CodeActionKind.SourceOrganizeImports,
+                        // VS Code specific
+                        CodeActionsProvider_1.sortImportKind,
+                    ],
+                },
                 completionProvider: {
                     resolveProvider: true,
                     triggerCharacters: [
@@ -127,10 +140,18 @@ function startLanguageServer(connection) {
             },
         };
     });
-    // On update of the user configuration of the language-server
-    connection.onDidChangeConfiguration(({ settings }) => {
-        configManager.updateConfig(settings.astro);
-        configManager.updateEmmetConfig(settings.emmet);
+    // The params don't matter here because in "pull mode" it's always null, it's intended that when the config is updated
+    // you should just reset "your internal cache" and get the config again for relevant documents, weird API design
+    connection.onDidChangeConfiguration(async (change) => {
+        if (hasConfigurationCapability) {
+            configManager.updateConfig();
+            documentManager.getAllOpenedByClient().forEach(async (document) => {
+                await configManager.getConfig('astro', document[1].uri);
+            });
+        }
+        else {
+            configManager.updateGlobalConfig(change.settings.astro || ConfigManager_1.defaultLSConfig);
+        }
     });
     // Documents
     connection.onDidOpenTextDocument((params) => {
@@ -157,6 +178,7 @@ function startLanguageServer(connection) {
     connection.onHover((params) => pluginHost.doHover(params.textDocument, params.position));
     connection.onDefinition((evt) => pluginHost.getDefinitions(evt.textDocument, evt.position));
     connection.onFoldingRanges((evt) => pluginHost.getFoldingRanges(evt.textDocument));
+    connection.onCodeAction((evt, cancellationToken) => pluginHost.getCodeActions(evt.textDocument, evt.range, evt.context, cancellationToken));
     connection.onCompletion(async (evt) => {
         const promise = pluginHost.getCompletions(evt.textDocument, evt.position, evt.context);
         return promise;
@@ -185,10 +207,17 @@ function startLanguageServer(connection) {
         updateAllDiagnostics();
     });
     documentManager.on('documentChange', (0, utils_1.debounceThrottle)(async (document) => diagnosticsManager.update(document), 1000));
-    documentManager.on('documentClose', (document) => diagnosticsManager.removeDiagnostics(document));
+    documentManager.on('documentClose', (document) => {
+        diagnosticsManager.removeDiagnostics(document);
+        configManager.removeDocument(document.uri);
+    });
     // Taking off 🚀
     connection.onInitialized(() => {
         connection.console.log('Successfully initialized! 🚀');
+        // Register for all configuration changes.
+        if (hasConfigurationCapability) {
+            connection.client.register(vscode_languageserver_1.DidChangeConfigurationNotification.type);
+        }
     });
     connection.listen();
 }

package/dist/utils.d.ts

@@ -20,6 +20,10 @@ export declare function getLastPartOfPath(path: string): string;
  * Transform a string into PascalCase
  */
 export declare function toPascalCase(string: string): string;
+/**
+ * Function to modify each line of a text, preserving the line break style (`\n` or `\r\n`)
+ */
+export declare function modifyLines(text: string, replacementFn: (line: string, lineIdx: number) => string): string;
 /**
  * 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

package/dist/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getUserAstroVersion = exports.debounceThrottle = exports.debounceSameArg = exports.getRegExpMatches = exports.isBeforeOrEqualToPosition = exports.isInRange = exports.isNotNullOrUndefined = exports.clamp = exports.flatten = exports.isPossibleComponent = exports.toPascalCase = exports.getLastPartOfPath = exports.pathToUrl = exports.urlToPath = exports.normalizePath = exports.normalizeUri = void 0;
+exports.getUserAstroVersion = exports.debounceThrottle = exports.debounceSameArg = exports.getRegExpMatches = exports.isBeforeOrEqualToPosition = exports.isInRange = exports.isNotNullOrUndefined = exports.clamp = exports.flatten = exports.isPossibleComponent = exports.modifyLines = exports.toPascalCase = exports.getLastPartOfPath = exports.pathToUrl = exports.urlToPath = exports.normalizePath = exports.normalizeUri = void 0;
 const vscode_uri_1 = require("vscode-uri");
 /** Normalizes a document URI */
 function normalizeUri(uri) {
@@ -48,13 +48,26 @@ function toPascalCase(string) {
         .replace(new RegExp(/\w/), (s) => s.toUpperCase());
 }
 exports.toPascalCase = toPascalCase;
+/**
+ * Function to modify each line of a text, preserving the line break style (`\n` or `\r\n`)
+ */
+function modifyLines(text, replacementFn) {
+    let idx = 0;
+    return text
+        .split('\r\n')
+        .map((l1) => l1
+        .split('\n')
+        .map((line) => replacementFn(line, idx++))
+        .join('\n'))
+        .join('\r\n');
+}
+exports.modifyLines = modifyLines;
 /**
  * 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
  */
 function isPossibleComponent(node) {
-    var _a, _b;
-    return !!((_a = node.tag) === null || _a === void 0 ? void 0 : _a[0].match(/[A-Z]/)) || !!((_b = node.tag) === null || _b === void 0 ? void 0 : _b.match(/.+[.][A-Z]/));
+    return !!node.tag?.[0].match(/[A-Z]/) || !!node.tag?.match(/.+[.][A-Z]/);
 }
 exports.isPossibleComponent = isPossibleComponent;
 /** Flattens an array */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/language-server",
-  "version": "0.15.0",
+  "version": "0.17.0",
   "author": "withastro",
   "license": "MIT",
   "type": "commonjs",
@@ -19,7 +19,7 @@
     "test": "cross-env TS_NODE_TRANSPILE_ONLY=true mocha --timeout 20000 --require ts-node/register \"test/**/*.ts\" --exclude \"test/**/*.d.ts\""
   },
   "dependencies": {
-    "@astrojs/svelte-language-integration": "^0.1.3",
+    "@astrojs/svelte-language-integration": "^0.1.4",
     "@vscode/emmet-helper": "^2.8.4",
     "lodash": "^4.17.21",
     "source-map": "^0.7.3",