@astrojs/language-server 0.12.1 → 0.13.2

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(),
     };
@@ -181,13 +189,13 @@ async function createLanguageService(tsconfigPath, docContext) {
         (_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,
             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

@@ -96,6 +96,7 @@ function startLanguageServer(connection) {
                 },
                 colorProvider: true,
                 hoverProvider: true,
+                documentSymbolProvider: true,
                 signatureHelpProvider: {
                     triggerCharacters: ['(', ',', '<'],
                     retriggerCharacters: [')'],
@@ -144,6 +145,7 @@ 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));

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.1",
+  "version": "0.13.2",
   "author": "withastro",
   "license": "MIT",
   "type": "commonjs",
@@ -19,7 +19,7 @@
     "test": "cross-env TS_NODE_TRANSPILE_ONLY=true mocha --require ts-node/register \"test/**/*.ts\" --exclude \"test/**/*.d.ts\""
   },
   "dependencies": {
-    "@astrojs/svelte-language-integration": "^0.1.0",
+    "@astrojs/svelte-language-integration": "^0.1.2",
     "@vscode/emmet-helper": "^2.8.4",
     "lodash": "^4.17.21",
     "source-map": "^0.7.3",