@astrojs/language-server 0.12.0 → 0.12.1

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @astrojs/language-server
 
+## 0.12.1
+
+### Patch Changes
+
+- 49955c6: Add support for colors indicators and color picker
+
 ## 0.12.0
 
 ### Minor Changes

package/dist/plugins/PluginHost.d.ts

@@ -1,4 +1,4 @@
-import { CancellationToken, CompletionContext, CompletionItem, CompletionList, DefinitionLink, Diagnostic, FoldingRange, Hover, Position, Location, SignatureHelp, SignatureHelpContext, TextDocumentContentChangeEvent, TextDocumentIdentifier, WorkspaceEdit } from 'vscode-languageserver';
+import { CancellationToken, Color, ColorInformation, ColorPresentation, CompletionContext, CompletionItem, CompletionList, DefinitionLink, Diagnostic, FoldingRange, Hover, Position, Range, Location, SignatureHelp, SignatureHelpContext, TextDocumentContentChangeEvent, TextDocumentIdentifier, WorkspaceEdit } from 'vscode-languageserver';
 import type { AppCompletionItem, Plugin } from './interfaces';
 import { DocumentManager } from '../core/documents/DocumentManager';
 interface PluginHostConfig {
@@ -20,6 +20,8 @@ export declare class PluginHost {
     getFoldingRanges(textDocument: TextDocumentIdentifier): Promise<FoldingRange[] | null>;
     getDefinitions(textDocument: TextDocumentIdentifier, position: Position): Promise<DefinitionLink[] | Location[]>;
     rename(textDocument: TextDocumentIdentifier, position: Position, newName: string): Promise<WorkspaceEdit | null>;
+    getDocumentColors(textDocument: TextDocumentIdentifier): Promise<ColorInformation[]>;
+    getColorPresentations(textDocument: TextDocumentIdentifier, range: Range, color: Color): Promise<ColorPresentation[]>;
     getSignatureHelp(textDocument: TextDocumentIdentifier, position: Position, context: SignatureHelpContext | undefined, cancellationToken: CancellationToken): Promise<SignatureHelp | null>;
     onWatchFileChanges(onWatchFileChangesParams: any[]): void;
     updateNonAstroFile(fileName: string, changes: TextDocumentContentChangeEvent[]): void;

package/dist/plugins/PluginHost.js

@@ -67,6 +67,14 @@ class PluginHost {
         const document = this.getDocument(textDocument.uri);
         return this.execute('rename', [document, position, newName], ExecuteMode.FirstNonNull);
     }
+    async getDocumentColors(textDocument) {
+        const document = this.getDocument(textDocument.uri);
+        return (0, lodash_1.flatten)(await this.execute('getDocumentColors', [document], ExecuteMode.Collect));
+    }
+    async getColorPresentations(textDocument, range, color) {
+        const document = this.getDocument(textDocument.uri);
+        return (0, lodash_1.flatten)(await this.execute('getColorPresentations', [document, range, color], ExecuteMode.Collect));
+    }
     async getSignatureHelp(textDocument, position, context, cancellationToken) {
         const document = this.getDocument(textDocument.uri);
         if (!document) {

package/dist/plugins/css/CSSPlugin.d.ts

@@ -1,4 +1,4 @@
-import { CompletionContext, CompletionList, Position } from 'vscode-languageserver';
+import { Color, ColorInformation, ColorPresentation, CompletionContext, CompletionList, Position, Range } from 'vscode-languageserver';
 import { ConfigManager } from '../../core/config/ConfigManager';
 import { AstroDocument } from '../../core/documents';
 import type { Plugin } from '../interfaces';
@@ -10,6 +10,8 @@ export declare class CSSPlugin implements Plugin {
     constructor(configManager: ConfigManager);
     getCompletions(document: AstroDocument, position: Position, completionContext?: CompletionContext): CompletionList | null;
     private getCompletionsInternal;
+    getDocumentColors(document: AstroDocument): ColorInformation[];
+    getColorPresentations(document: AstroDocument, range: Range, color: Color): ColorPresentation[];
     private inStyleAttributeWithoutInterpolation;
     /**
      * Get the associated CSS Document for a style tag

package/dist/plugins/css/CSSPlugin.js

@@ -9,6 +9,7 @@ const language_service_1 = require("./language-service");
 const parseHtml_1 = require("../../core/documents/parseHtml");
 const StyleAttributeDocument_1 = require("./StyleAttributeDocument");
 const getIdClassCompletions_1 = require("./features/getIdClassCompletions");
+const lodash_1 = require("lodash");
 class CSSPlugin {
     constructor(configManager) {
         this.__name = 'css';
@@ -67,6 +68,38 @@ class CSSPlugin {
         // Emmet completions change on every keystroke, so they are never complete
         emmetResults.items.length > 0);
     }
+    getDocumentColors(document) {
+        if (!this.featureEnabled('documentColors')) {
+            return [];
+        }
+        const allColorInfo = this.getCSSDocumentsForDocument(document).map((cssDoc) => {
+            const cssLang = extractLanguage(cssDoc);
+            const langService = (0, language_service_1.getLanguageService)(cssLang);
+            if (shouldExcludeColor(cssLang)) {
+                return [];
+            }
+            return langService
+                .findDocumentColors(cssDoc, cssDoc.stylesheet)
+                .map((colorInfo) => (0, documents_1.mapObjWithRangeToOriginal)(cssDoc, colorInfo));
+        });
+        return (0, lodash_1.flatten)(allColorInfo);
+    }
+    getColorPresentations(document, range, color) {
+        if (!this.featureEnabled('colorPresentations')) {
+            return [];
+        }
+        const allColorPres = this.getCSSDocumentsForDocument(document).map((cssDoc) => {
+            const cssLang = extractLanguage(cssDoc);
+            const langService = (0, language_service_1.getLanguageService)(cssLang);
+            if ((!cssDoc.isInGenerated(range.start) && !cssDoc.isInGenerated(range.end)) || shouldExcludeColor(cssLang)) {
+                return [];
+            }
+            return langService
+                .getColorPresentations(cssDoc, cssDoc.stylesheet, color, (0, documents_1.mapRangeToGenerated)(cssDoc, range))
+                .map((colorPres) => (0, documents_1.mapColorPresentationToOriginal)(cssDoc, colorPres));
+        });
+        return (0, lodash_1.flatten)(allColorPres);
+    }
     inStyleAttributeWithoutInterpolation(attrContext, text) {
         return (attrContext.name === 'style' &&
             !!attrContext.valueRange &&
@@ -102,6 +135,22 @@ class CSSPlugin {
     }
 }
 exports.CSSPlugin = CSSPlugin;
+/**
+ * Exclude certain language when getting colors
+ * The CSS language service only supports CSS, LESS and SCSS,
+ * which mean that we cannot support colors in other languages
+ */
+function shouldExcludeColor(document) {
+    const language = typeof document === 'string' ? document : extractLanguage(document);
+    switch (language) {
+        case 'sass':
+        case 'stylus':
+        case 'styl':
+            return true;
+        default:
+            return false;
+    }
+}
 function isSASS(document) {
     switch (extractLanguage(document)) {
         case 'sass':

package/dist/plugins/typescript/language-service.js

@@ -168,26 +168,21 @@ async function createLanguageService(tsconfigPath, docContext) {
         snapshotManager.updateNonAstroFile(fileName, changes);
     }
     function getParsedTSConfig() {
-        var _a, _b, _c, _d;
+        var _a, _b, _c;
         let configJson = (tsconfigPath && typescript_1.default.readConfigFile(tsconfigPath, typescript_1.default.sys.readFile).config) || {};
         // If our user has types in their config but it doesn't include the types needed for Astro, add them to the config
         if (((_a = configJson.compilerOptions) === null || _a === void 0 ? void 0 : _a.types) && !((_b = configJson.compilerOptions) === null || _b === void 0 ? void 0 : _b.types.includes('astro/env'))) {
             configJson.compilerOptions.types.push('astro/env');
         }
         configJson.compilerOptions = Object.assign(getDefaultCompilerOptions(), configJson.compilerOptions);
-        // If the user supplied exclude, let's use theirs
-        (_c = configJson.exclude) !== null && _c !== void 0 ? _c : (configJson.exclude = getDefaultExclude());
         // Delete include so that .astro files don't get mistakenly excluded by the user
         delete configJson.include;
         // If the user supplied exclude, let's use theirs otherwise, use ours
-        (_d = configJson.exclude) !== null && _d !== void 0 ? _d : (configJson.exclude = getDefaultExclude());
+        (_c = configJson.exclude) !== null && _c !== void 0 ? _c : (configJson.exclude = getDefaultExclude());
         // Everything here will always, unconditionally, be in the resulting config
         const forcedCompilerOptions = {
             // Our TSX is currently not typed, which unfortunately means that we can't support `noImplicitAny`
             noImplicitAny: false,
-            // Most of the code people write in an .astro file is in the frontmatter which is executed server side
-            // Thus, we don't want the DOM lib. We'll need to overwrite this for script tags however
-            lib: ['ESNext'],
             noEmit: true,
             declaration: false,
             allowNonTsExtensions: true,

package/dist/server.js

@@ -94,6 +94,7 @@ function startLanguageServer(connection) {
                         ':',
                     ],
                 },
+                colorProvider: true,
                 hoverProvider: true,
                 signatureHelpProvider: {
                     triggerCharacters: ['(', ',', '<'],
@@ -143,6 +144,8 @@ function startLanguageServer(connection) {
         }
         return pluginHost.resolveCompletion(data, completionItem);
     });
+    connection.onDocumentColor((params) => pluginHost.getDocumentColors(params.textDocument));
+    connection.onColorPresentation((params) => pluginHost.getColorPresentations(params.textDocument, params.range, params.color));
     connection.onRequest(TagCloseRequest, (evt) => pluginHost.doTagComplete(evt.textDocument, evt.position));
     connection.onSignatureHelp((evt, cancellationToken) => pluginHost.getSignatureHelp(evt.textDocument, evt.position, evt.context, cancellationToken));
     connection.onRenameRequest((evt) => pluginHost.rename(evt.textDocument, evt.position, evt.newName));

package/package.json

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