@astrojs/language-server 0.23.0 → 0.23.1

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @astrojs/language-server
 
+## 0.23.1
+
+### Patch Changes
+
+- 422376e: Load settings from the Prettier VS Code extension when available
+
 ## 0.23.0
 
 ### Minor Changes

package/dist/core/config/ConfigManager.d.ts

@@ -23,6 +23,7 @@ export declare class ConfigManager {
     removeDocument(scopeUri: string): void;
     getConfig<T>(section: string, scopeUri: string): Promise<T | Record<string, any>>;
     getEmmetConfig(document: TextDocument): Promise<VSCodeEmmetConfig>;
+    getPrettierVSConfig(document: TextDocument): Promise<Record<string, any>>;
     getTSFormatConfig(document: TextDocument, vscodeOptions?: FormattingOptions): Promise<FormatCodeSettings>;
     getTSPreferences(document: TextDocument): Promise<UserPreferences>;
     getTSInlayHintsPreferences(document: TextDocument): Promise<InlayHintsOptions>;

package/dist/core/config/ConfigManager.js

@@ -90,6 +90,10 @@ class ConfigManager {
             showSuggestionsAsSnippets: emmetConfig.showSuggestionsAsSnippets ?? false,
         };
     }
+    async getPrettierVSConfig(document) {
+        const prettierVSConfig = (await this.getConfig('prettier', document.uri)) ?? {};
+        return prettierVSConfig;
+    }
     async getTSFormatConfig(document, vscodeOptions) {
         const formatConfig = (await this.getConfig('typescript.format', document.uri)) ?? {};
         return {

package/dist/plugins/astro/AstroPlugin.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AstroPlugin = void 0;
 const vscode_languageserver_1 = require("vscode-languageserver");
 const importPackage_1 = require("../../importPackage");
-const utils_1 = require("../../utils");
 const CompletionsProvider_1 = require("./features/CompletionsProvider");
 class AstroPlugin {
     constructor(configManager, languageServiceManager) {
@@ -22,14 +21,19 @@ class AstroPlugin {
             return [];
         }
         const prettier = (0, importPackage_1.importPrettier)(filePath);
-        const prettierConfig = await prettier.resolveConfig(filePath, { editorconfig: true, useCache: false });
-        const editorFormatConfig = options !== undefined
+        const prettierConfig = (await prettier.resolveConfig(filePath, { editorconfig: true, useCache: false })) ?? {};
+        const prettierVSConfig = await this.configManager.getPrettierVSConfig(document);
+        const editorFormatConfig = options !== undefined // We need to check for options existing here because some editors might not have it
             ? {
-                tabWidth: prettierConfig?.tabWidth ?? options.tabSize,
-                useTabs: prettierConfig?.useTabs ?? !options.insertSpaces,
+                tabWidth: options.tabSize,
+                useTabs: !options.insertSpaces,
             }
             : {};
-        const resultConfig = (0, utils_1.mergeDeep)(prettierConfig ?? {}, editorFormatConfig);
+        // Return a config with the following cascade:
+        // - Prettier config file should always win if it exists, if it doesn't:
+        // - Prettier config from the VS Code extension is used, if it doesn't exist:
+        // - Use the editor's basic configuration settings
+        const resultConfig = returnObjectIfHasKeys(prettierConfig) || returnObjectIfHasKeys(prettierVSConfig) || editorFormatConfig;
         const fileInfo = await prettier.getFileInfo(filePath, { ignorePath: '.prettierignore' });
         if (fileInfo.ignored) {
             return [];
@@ -74,3 +78,8 @@ class AstroPlugin {
     }
 }
 exports.AstroPlugin = AstroPlugin;
+function returnObjectIfHasKeys(obj) {
+    if (Object.keys(obj || {}).length > 0) {
+        return obj;
+    }
+}

package/package.json

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