@astrojs/language-server 0.12.0 → 0.13.1

package/dist/plugins/typescript/features/DocumentSymbolsProvider.js

@@ -0,0 +1,69 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DocumentSymbolsProviderImpl = void 0;
+const typescript_1 = require("typescript");
+const vscode_languageserver_types_1 = require("vscode-languageserver-types");
+const documents_1 = require("../../../core/documents");
+const utils_1 = require("../utils");
+const vscode_languageserver_types_2 = require("vscode-languageserver-types");
+class DocumentSymbolsProviderImpl {
+    constructor(languageServiceManager) {
+        this.languageServiceManager = languageServiceManager;
+    }
+    async getDocumentSymbols(document) {
+        var _a, _b, _c;
+        const { lang, tsDoc } = await this.languageServiceManager.getLSAndTSDoc(document);
+        const fragment = await tsDoc.createFragment();
+        const navTree = lang.getNavigationTree(tsDoc.filePath);
+        if (!navTree) {
+            return [];
+        }
+        const symbols = [];
+        this.collectSymbols(navTree, fragment, undefined, (symbol) => symbols.push(symbol));
+        const result = [];
+        // Add a "Frontmatter" namespace for the frontmatter if we have a closed one
+        if (document.astroMeta.frontmatter.state === 'closed') {
+            result.push(vscode_languageserver_types_1.SymbolInformation.create('Frontmatter', vscode_languageserver_types_1.SymbolKind.Namespace, vscode_languageserver_types_1.Range.create(document.positionAt(document.astroMeta.frontmatter.startOffset), document.positionAt(document.astroMeta.frontmatter.endOffset))));
+        }
+        // Add a "Template" namespace for everything under the frontmatter
+        result.push(vscode_languageserver_types_1.SymbolInformation.create('Template', vscode_languageserver_types_1.SymbolKind.Namespace, vscode_languageserver_types_1.Range.create(document.positionAt((_a = document.astroMeta.frontmatter.endOffset) !== null && _a !== void 0 ? _a : 0), document.positionAt(document.getTextLength()))));
+        for (let symbol of symbols.splice(1)) {
+            symbol = (0, documents_1.mapSymbolInformationToOriginal)(fragment, symbol);
+            if (document.offsetAt(symbol.location.range.end) >= ((_b = document.astroMeta.content.firstNonWhitespaceOffset) !== null && _b !== void 0 ? _b : 0)) {
+                symbol.containerName = 'Template';
+                // For some reason, it seems like TypeScript thinks that the "class" attribute is a real class, weird
+                if (symbol.kind === vscode_languageserver_types_1.SymbolKind.Class && symbol.name === '<class>') {
+                    const node = document.html.findNodeAt(document.offsetAt(symbol.location.range.start));
+                    if ((_c = node.attributes) === null || _c === void 0 ? void 0 : _c.class) {
+                        continue;
+                    }
+                }
+            }
+            // Remove the default function detected in our TSX output
+            if (symbol.kind === vscode_languageserver_types_1.SymbolKind.Function && symbol.name == 'default') {
+                continue;
+            }
+            result.push(symbol);
+        }
+        return result;
+    }
+    collectSymbols(item, fragment, container, cb) {
+        for (const span of item.spans) {
+            const symbol = vscode_languageserver_types_1.SymbolInformation.create(item.text, (0, utils_1.symbolKindFromString)(item.kind), vscode_languageserver_types_1.Range.create(fragment.positionAt(span.start), fragment.positionAt(span.start + span.length)), fragment.getURL(), container);
+            // TypeScript gives us kind modifiers as a string instead of an array
+            const kindModifiers = new Set(item.kindModifiers.split(/,|\s+/g));
+            if (kindModifiers.has(typescript_1.ScriptElementKindModifier.deprecatedModifier)) {
+                if (!symbol.tags)
+                    symbol.tags = [];
+                symbol.tags.push(vscode_languageserver_types_2.SymbolTag.Deprecated);
+            }
+            cb(symbol);
+        }
+        if (item.childItems) {
+            for (const child of item.childItems) {
+                this.collectSymbols(child, fragment, item.text, cb);
+            }
+        }
+    }
+}
+exports.DocumentSymbolsProviderImpl = DocumentSymbolsProviderImpl;

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

@@ -70,6 +70,14 @@ async function createLanguageService(tsconfigPath, docContext) {
     let projectVersion = 0;
     const snapshotManager = new SnapshotManager_1.SnapshotManager(docContext.globalSnapshotManager, files, fullConfig, workspaceRoot || process.cwd());
     const astroModuleLoader = (0, module_loader_1.createAstroModuleLoader)(getScriptSnapshot, compilerOptions);
+    let languageServerDirectory;
+    try {
+        languageServerDirectory = (0, path_1.dirname)(require.resolve('@astrojs/language-server'));
+    }
+    catch (e) {
+        languageServerDirectory = __dirname;
+    }
+    const astroTSXFile = typescript_1.default.sys.resolvePath((0, path_1.resolve)(languageServerDirectory, '../types/astro-jsx.d.ts'));
     const host = {
         getNewLine: () => typescript_1.default.sys.newLine,
         useCaseSensitiveFileNames: () => typescript_1.default.sys.useCaseSensitiveFileNames,
@@ -82,7 +90,7 @@ async function createLanguageService(tsconfigPath, docContext) {
         getCurrentDirectory: () => workspaceRoot,
         getDefaultLibFileName: typescript_1.default.getDefaultLibFilePath,
         getProjectVersion: () => projectVersion.toString(),
-        getScriptFileNames: () => Array.from(new Set([...snapshotManager.getProjectFileNames(), ...snapshotManager.getFileNames()])),
+        getScriptFileNames: () => Array.from(new Set([...snapshotManager.getProjectFileNames(), ...snapshotManager.getFileNames(), astroTSXFile])),
         getScriptSnapshot,
         getScriptVersion: (fileName) => getScriptSnapshot(fileName).version.toString(),
     };
@@ -168,31 +176,26 @@ 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,
             allowJs: true,
             jsx: typescript_1.default.JsxEmit.Preserve,
+            jsxImportSource: undefined,
+            jsxFactory: 'astroHTML',
             module: typescript_1.default.ModuleKind.ESNext,
             target: typescript_1.default.ScriptTarget.ESNext,
             moduleResolution: typescript_1.default.ModuleResolutionKind.NodeJs,

package/dist/plugins/typescript/snapshots/utils.js

@@ -77,7 +77,7 @@ function createFromFrameworkFilePath(filePath, framework) {
         code = (0, svelte_language_integration_1.toTSX)(originalText);
     }
     else {
-        code = 'export default function() {}';
+        code = 'export default function(props: Record<string, any>): any {<div></div>}';
     }
     return new DocumentSnapshot_1.TypeScriptDocumentSnapshot(0, filePath, code, typescript_1.default.ScriptKind.TSX);
 }

package/dist/plugins/typescript/utils.d.ts

@@ -1,6 +1,7 @@
 import ts from 'typescript';
-import { CompletionItemKind, DiagnosticSeverity, Position, Range } from 'vscode-languageserver';
+import { CompletionItemKind, DiagnosticSeverity, Position, Range, SymbolKind } from 'vscode-languageserver';
 import { SnapshotFragment } from './snapshots/DocumentSnapshot';
+export declare function symbolKindFromString(kind: string): SymbolKind;
 export declare function scriptElementKindToCompletionItemKind(kind: ts.ScriptElementKind): CompletionItemKind;
 export declare function getCommitCharactersForScriptElement(kind: ts.ScriptElementKind): string[] | undefined;
 export declare function getExtensionFromScriptKind(kind: ts.ScriptKind | undefined): ts.Extension;

package/dist/plugins/typescript/utils.js

@@ -3,12 +3,61 @@ 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.convertToLocationRange = exports.convertRange = exports.mapSeverity = exports.getScriptKindFromFileName = exports.isSubPath = exports.findTsConfigPath = exports.getExtensionFromScriptKind = exports.getCommitCharactersForScriptElement = exports.scriptElementKindToCompletionItemKind = void 0;
+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.convertToLocationRange = exports.convertRange = exports.mapSeverity = exports.getScriptKindFromFileName = exports.isSubPath = exports.findTsConfigPath = exports.getExtensionFromScriptKind = exports.getCommitCharactersForScriptElement = exports.scriptElementKindToCompletionItemKind = exports.symbolKindFromString = void 0;
 const typescript_1 = __importDefault(require("typescript"));
 const path_1 = require("path");
 const utils_1 = require("../../utils");
 const vscode_languageserver_1 = require("vscode-languageserver");
 const documents_1 = require("../../core/documents");
+function symbolKindFromString(kind) {
+    switch (kind) {
+        case 'module':
+            return vscode_languageserver_1.SymbolKind.Module;
+        case 'class':
+            return vscode_languageserver_1.SymbolKind.Class;
+        case 'local class':
+            return vscode_languageserver_1.SymbolKind.Class;
+        case 'interface':
+            return vscode_languageserver_1.SymbolKind.Interface;
+        case 'enum':
+            return vscode_languageserver_1.SymbolKind.Enum;
+        case 'enum member':
+            return vscode_languageserver_1.SymbolKind.Constant;
+        case 'var':
+            return vscode_languageserver_1.SymbolKind.Variable;
+        case 'local var':
+            return vscode_languageserver_1.SymbolKind.Variable;
+        case 'function':
+            return vscode_languageserver_1.SymbolKind.Function;
+        case 'local function':
+            return vscode_languageserver_1.SymbolKind.Function;
+        case 'method':
+            return vscode_languageserver_1.SymbolKind.Method;
+        case 'getter':
+            return vscode_languageserver_1.SymbolKind.Method;
+        case 'setter':
+            return vscode_languageserver_1.SymbolKind.Method;
+        case 'property':
+            return vscode_languageserver_1.SymbolKind.Property;
+        case 'constructor':
+            return vscode_languageserver_1.SymbolKind.Constructor;
+        case 'parameter':
+            return vscode_languageserver_1.SymbolKind.Variable;
+        case 'type parameter':
+            return vscode_languageserver_1.SymbolKind.Variable;
+        case 'alias':
+            return vscode_languageserver_1.SymbolKind.Variable;
+        case 'let':
+            return vscode_languageserver_1.SymbolKind.Variable;
+        case 'const':
+            return vscode_languageserver_1.SymbolKind.Constant;
+        case 'JSX attribute':
+            return vscode_languageserver_1.SymbolKind.Property;
+        default:
+            return vscode_languageserver_1.SymbolKind.Variable;
+    }
+}
+exports.symbolKindFromString = symbolKindFromString;
 function scriptElementKindToCompletionItemKind(kind) {
     switch (kind) {
         case typescript_1.default.ScriptElementKind.primitiveType:

package/dist/server.js

@@ -94,7 +94,9 @@ function startLanguageServer(connection) {
                         ':',
                     ],
                 },
+                colorProvider: true,
                 hoverProvider: true,
+                documentSymbolProvider: true,
                 signatureHelpProvider: {
                     triggerCharacters: ['(', ',', '<'],
                     retriggerCharacters: [')'],
@@ -143,6 +145,9 @@ function startLanguageServer(connection) {
         }
         return pluginHost.resolveCompletion(data, completionItem);
     });
+    connection.onDocumentSymbol((params, cancellationToken) => pluginHost.getDocumentSymbols(params.textDocument, cancellationToken));
+    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/dist/utils.d.ts

@@ -17,17 +17,13 @@ export declare function pathToUrl(path: string): string;
  */
 export declare function getLastPartOfPath(path: string): string;
 /**
- *
- * The language service is case insensitive, and would provide
- * hover info for Svelte components like `Option` which have
- * the same name like a html tag.
+ * 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
  */
 export declare function isPossibleComponent(node: Node): boolean;
 /**
- *
- * The language service is case insensitive, and would provide
- * hover info for Svelte components like `Option` which have
- * the same name like a html tag.
+ * Return true if a specific node could be a component with a client directive on it.
+ * 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
  */
 export declare function isPossibleClientComponent(node: Node): boolean;
 /** Flattens an array */

package/dist/utils.js

@@ -38,21 +38,17 @@ function getLastPartOfPath(path) {
 }
 exports.getLastPartOfPath = getLastPartOfPath;
 /**
- *
- * The language service is case insensitive, and would provide
- * hover info for Svelte components like `Option` which have
- * the same name like a html tag.
+ * 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;
-    return !!((_a = node.tag) === null || _a === void 0 ? void 0 : _a[0].match(/[A-Z]/));
+    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]/));
 }
 exports.isPossibleComponent = isPossibleComponent;
 /**
- *
- * The language service is case insensitive, and would provide
- * hover info for Svelte components like `Option` which have
- * the same name like a html tag.
+ * Return true if a specific node could be a component with a client directive on it.
+ * 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 isPossibleClientComponent(node) {
     if (isPossibleComponent(node) && node.attributes) {

package/package.json

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