@astrojs/language-server 0.19.2 → 0.19.3

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @astrojs/language-server
 
+## 0.19.3
+
+### Patch Changes
+
+- 49ff4ef: Fixed more bugs where nonexistent server settings would result in a crash
+- 14cbf05: Fix frontmatter completion not working when three dashes were already present
+
 ## 0.19.2
 
 ### Patch Changes

package/dist/core/config/ConfigManager.js

@@ -142,8 +142,15 @@ class ConfigManager {
      * Return true if a plugin and an optional feature is enabled
      */
     async isEnabled(document, plugin, feature) {
-        const config = await this.getConfig('astro', document.uri);
-        return feature ? config[plugin].enabled && config[plugin][feature].enabled : config[plugin].enabled;
+        const config = (await this.getConfig('astro', document.uri)) ?? {};
+        if (config[plugin]) {
+            let res = config[plugin].enabled;
+            if (feature && config[plugin][feature]) {
+                res = res && config[plugin][feature].enabled;
+            }
+            return res;
+        }
+        return false;
     }
     /**
      * Updating the global config should only be done in cases where the client doesn't support `workspace/configuration`

package/dist/plugins/astro/features/CompletionsProvider.js

@@ -23,15 +23,16 @@ class CompletionsProviderImpl {
     }
     async getCompletions(document, position, completionContext) {
         let items = [];
-        if (completionContext?.triggerCharacter === '-') {
+        const html = document.html;
+        const offset = document.offsetAt(position);
+        const node = html.findNodeAt(offset);
+        const insideExpression = (0, utils_1.isInsideExpression)(document.getText(), node.start, offset);
+        if (completionContext?.triggerCharacter === '-' && node.parent === undefined && !insideExpression) {
             const frontmatter = this.getComponentScriptCompletion(document, position);
             if (frontmatter)
                 items.push(frontmatter);
         }
-        const html = document.html;
-        const offset = document.offsetAt(position);
-        const node = html.findNodeAt(offset);
-        if ((0, utils_1.isInComponentStartTag)(html, offset) && !(0, utils_1.isInsideExpression)(document.getText(), node.start, offset)) {
+        if ((0, utils_1.isInComponentStartTag)(html, offset) && !insideExpression) {
             const { completions: props, componentFilePath } = await this.getPropCompletionsAndFilePath(document, position, completionContext);
             if (props.length) {
                 items.push(...props);
@@ -50,7 +51,7 @@ class CompletionsProviderImpl {
             label: '---',
             sortText: '\0',
             preselect: true,
-            detail: 'Component script',
+            detail: 'Create component script block',
             insertTextFormat: vscode_languageserver_1.InsertTextFormat.Snippet,
             commitCharacters: [],
         };
@@ -65,11 +66,18 @@ class CompletionsProviderImpl {
             };
         }
         if (document.astroMeta.frontmatter.state === 'open') {
+            let insertText = '---';
+            // If the current line is a full component script starter/ender, the user expects a full frontmatter
+            // completion and not just a completion for "---"  on the same line (which result in, well, nothing)
+            if (prefix === '---') {
+                insertText = '---\n$0\n---';
+            }
             return {
                 ...base,
-                insertText: '---',
+                insertText,
+                detail: insertText === '---' ? 'Close component script block' : 'Create component script block',
                 textEdit: prefix.match(/^\s*\-+/)
-                    ? vscode_languageserver_1.TextEdit.replace({ start: { ...position, character: 0 }, end: position }, '---')
+                    ? vscode_languageserver_1.TextEdit.replace({ start: { ...position, character: 0 }, end: position }, insertText)
                     : undefined,
             };
         }

package/dist/plugins/html/HTMLPlugin.js

@@ -63,8 +63,8 @@ class HTMLPlugin {
             items: [],
         };
         const emmetConfig = await this.configManager.getEmmetConfig(document);
-        const extensionConfig = await this.configManager.getConfig('astro', document.uri);
-        if (extensionConfig.html.completions.emmet) {
+        const extensionConfig = (await this.configManager.getConfig('astro', document.uri)) ?? {};
+        if (extensionConfig?.html?.completions?.emmet) {
             this.lang.setCompletionParticipants([
                 {
                     onHtmlContent: () => (emmetResults = (0, emmet_helper_1.doComplete)(document, position, 'html', emmetConfig) || emmetResults),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/language-server",
-  "version": "0.19.2",
+  "version": "0.19.3",
   "author": "withastro",
   "license": "MIT",
   "type": "commonjs",