typescript-language-server 1.0.0 → 1.1.2

package/CHANGELOG.md

@@ -1,6 +1,37 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [1.1.2](https://github.com/typescript-language-server/typescript-language-server/compare/v1.1.1...v1.1.2) (2022-08-25)
+
+
+### Bug Fixes
+
+* definition request crashing on getting span ([#574](https://github.com/typescript-language-server/typescript-language-server/issues/574)) ([4e1c82b](https://github.com/typescript-language-server/typescript-language-server/commit/4e1c82b82878316a12ff6b524d7dd5ab54b86acd))
+
+## [1.1.1](https://github.com/typescript-language-server/typescript-language-server/compare/v1.1.0...v1.1.1) (2022-08-22)
+
+
+### Bug Fixes
+
+* move deepmerge to dependencies ([06109d4](https://github.com/typescript-language-server/typescript-language-server/commit/06109d4646d94bdf1bbeb2768e18f1323ae1b630))
+
+## [1.1.0](https://github.com/typescript-language-server/typescript-language-server/compare/v1.0.0...v1.1.0) (2022-08-21)
+
+
+### Features
+
+* add "Go To Source Definition" command ([#560](https://github.com/typescript-language-server/typescript-language-server/issues/560)) ([9bcdaf2](https://github.com/typescript-language-server/typescript-language-server/commit/9bcdaf2b0b09da9aa4d7e6ed79bdcd742b3cfc17))
+* support `textDocument/inlayHint` request from 3.17.0 spec ([#566](https://github.com/typescript-language-server/typescript-language-server/issues/566)) ([9a2fd4e](https://github.com/typescript-language-server/typescript-language-server/commit/9a2fd4e34b6c50c57b974f617018dcefdb469788))
+* support LocationLink[] for textDocument/definition response ([#563](https://github.com/typescript-language-server/typescript-language-server/issues/563)) ([196f328](https://github.com/typescript-language-server/typescript-language-server/commit/196f328cd9fd7a06998151d59bed0b945cc68b40))
+
+
+### Bug Fixes
+
+* don't trigger error on empty Source Definition response ([#568](https://github.com/typescript-language-server/typescript-language-server/issues/568)) ([146a6ba](https://github.com/typescript-language-server/typescript-language-server/commit/146a6ba97f0792701ff8afcc431d3a1dfdb978a6))
+* make wording in the typescript lookup error more generic ([585a05e](https://github.com/typescript-language-server/typescript-language-server/commit/585a05e43a0b530f10e488aed634fac0436109ae)), closes [#554](https://github.com/typescript-language-server/typescript-language-server/issues/554)
+* snippet completions returned to clients that don't support them ([#556](https://github.com/typescript-language-server/typescript-language-server/issues/556)) ([050d335](https://github.com/typescript-language-server/typescript-language-server/commit/050d3350e16fe78b7c60d7443ed3ad6d2cc4730d))
+* update signature help feature to v3.15.0 LSP spec ([#555](https://github.com/typescript-language-server/typescript-language-server/issues/555)) ([da074a6](https://github.com/typescript-language-server/typescript-language-server/commit/da074a618ca6c29819834a0344682094d6ff08f6))
+
 ## [1.0.0](https://github.com/typescript-language-server/typescript-language-server/compare/v0.11.2...v1.0.0) (2022-08-06)
 
 

package/README.md

@@ -11,6 +11,33 @@ Based on concepts and ideas from https://github.com/prabirshrestha/typescript-la
 
 Maintained by a [community of contributors](https://github.com/typescript-language-server/typescript-language-server/graphs/contributors) like you
 
+<!-- MarkdownTOC -->
+
+- [Installing](#installing)
+- [Running the language server](#running-the-language-server)
+- [CLI Options](#cli-options)
+- [initializationOptions](#initializationoptions)
+- [workspace/didChangeConfiguration](#workspacedidchangeconfiguration)
+- [Code actions on save](#code-actions-on-save)
+- [Workspace commands \(`workspace/executeCommand`\)](#workspace-commands-workspaceexecutecommand)
+    - [Go to Source Definition](#go-to-source-definition)
+    - [Apply Workspace Edits](#apply-workspace-edits)
+    - [Apply Code Action](#apply-code-action)
+    - [Apply Refactoring](#apply-refactoring)
+    - [Organize Imports](#organize-imports)
+    - [Rename File](#rename-file)
+- [Inlay hints \(`typescript/inlayHints`\) \(experimental\)](#inlay-hints-typescriptinlayhints-experimental)
+- [Callers and callees \(`textDocument/calls`\) \(experimental\)](#callers-and-callees-textdocumentcalls-experimental)
+- [Supported Protocol features](#supported-protocol-features)
+    - [Experimental](#experimental)
+- [Development](#development)
+    - [Build](#build)
+    - [Test](#test)
+    - [Watch](#watch)
+    - [Publishing](#publishing)
+
+<!-- /MarkdownTOC -->
+
 ## Installing
 
 ```sh
@@ -247,38 +274,114 @@ The user can enable it with a setting similar to (can vary per-editor):
 
 ## Workspace commands (`workspace/executeCommand`)
 
-See [LSP specification](https://microsoft.github.io/language-server-protocol/specifications/specification-3-17/#workspace_executeCommand).
+See [LSP specification](https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#workspace_executeCommand).
 
 Most of the time, you'll execute commands with arguments retrieved from another request like `textDocument/codeAction`. There are some use cases for calling them manually.
 
-Supported commands:
+`lsp` refers to the language server protocol types, `tsp` refers to the typescript server protocol types.
+
+### Go to Source Definition
+
+- Request:
+    ```ts
+    {
+        command: `_typescript.goToSourceDefinition`
+        arguments: [
+            lsp.DocumentUri,  // String URI of the document
+            lsp.Position,     // Line and character position (zero-based)
+        ]
+    }
+    ```
+- Response:
+    ```ts
+    lsp.Location[] | null
+    ```
+
+(This command is supported from Typescript 4.7.)
+
+### Apply Workspace Edits
+
+- Request:
+    ```ts
+    {
+        command: `_typescript.applyWorkspaceEdit`
+        arguments: [lsp.WorkspaceEdit]
+    }
+    ```
+- Response:
+    ```ts
+    lsp.ApplyWorkspaceEditResult
+    ```
 
-`lsp` refers to the language server protocol, `tsp` refers to the typescript server protocol.
+### Apply Code Action
 
-* `_typescript.applyWorkspaceEdit`
+- Request:
+    ```ts
+    {
+        command: `_typescript.applyCodeAction`
+        arguments: [
+            tsp.CodeAction,  // TypeScript Code Action object
+        ]
+    }
+    ```
+- Response:
     ```ts
-    type Arguments = [lsp.WorkspaceEdit]
+    void
     ```
-* `_typescript.applyCodeAction`
+
+### Apply Refactoring
+
+- Request:
     ```ts
-    type Arguments = [tsp.CodeAction]
+    {
+        command: `_typescript.applyRefactoring`
+        arguments: [
+            tsp.GetEditsForRefactorRequestArgs,
+        ]
+    }
     ```
-* `_typescript.applyRefactoring`
+- Response:
     ```ts
-    type Arguments = [tsp.GetEditsForRefactorRequestArgs]
+    void
     ```
-* `_typescript.organizeImports`
+
+### Organize Imports
+
+- Request:
     ```ts
-    // The "skipDestructiveCodeActions" argument is supported from Typescript 4.4+
-    type Arguments = [string] | [string, { skipDestructiveCodeActions?: boolean }]
+    {
+        command: `_typescript.organizeImports`
+        arguments: [
+            // The "skipDestructiveCodeActions" argument is supported from Typescript 4.4+
+            [string] | [string, { skipDestructiveCodeActions?: boolean }],
+        ]
+    }
     ```
-* `_typescript.applyRenameFile`
+- Response:
     ```ts
-    type Arguments = [{ sourceUri: string; targetUri: string; }]
+    void
+    ```
+
+### Rename File
+
+- Request:
+    ```ts
+    {
+        command: `_typescript.applyRenameFile`
+        arguments: [
+            { sourceUri: string; targetUri: string; },
+        ]
+    }
+    ```
+- Response:
+    ```ts
+    void
     ```
 
 ## Inlay hints (`typescript/inlayHints`) (experimental)
 
+> !!! This implementation is deprecated. Use the spec-compliant `textDocument/inlayHint` request instead. !!!
+
 Supports experimental inline hints.
 
 ```ts
@@ -401,28 +504,32 @@ interface DefinitionSymbol {
 
 ## Supported Protocol features
 
+- [x] textDocument/codeAction
+- [x] textDocument/completion (incl. `completion/resolve`)
+- [x] textDocument/definition
 - [x] textDocument/didChange (incremental)
 - [x] textDocument/didClose
 - [x] textDocument/didOpen
 - [x] textDocument/didSave
-- [x] textDocument/codeAction
-- [x] textDocument/completion (incl. completion/resolve)
-- [x] textDocument/definition
 - [x] textDocument/documentHighlight
 - [x] textDocument/documentSymbol
 - [x] textDocument/executeCommand
 - [x] textDocument/formatting
-- [x] textDocument/rangeFormatting
 - [x] textDocument/hover
-- [x] textDocument/rename
+- [x] textDocument/inlayHint (no support for `inlayHint/resolve` or `workspace/inlayHint/refresh`)
+- [x] textDocument/rangeFormatting
 - [x] textDocument/references
+- [x] textDocument/rename
 - [x] textDocument/signatureHelp
-- [x] textDocument/calls (experimental)
-- [x] typescript/inlayHints (experimental, supported from Typescript v4.4.2)
 - [x] workspace/symbol
 - [x] workspace/didChangeConfiguration
 - [x] workspace/executeCommand
 
+### Experimental
+
+- [x] textDocument/calls (experimental)
+- [x] typescript/inlayHints (experimental, supported from Typescript v4.4.2) DEPRECATED (use  `textDocument/inlayHint` instead)
+
 ## Development
 
 ### Build

package/lib/calls.d.ts

@@ -1,7 +1,7 @@
 import * as lsp from 'vscode-languageserver';
+import { TextDocument } from 'vscode-languageserver-textdocument';
 import * as lspcalls from './lsp-protocol.calls.proposed.js';
 import { TspClient } from './tsp-client.js';
-import { TextDocument } from 'vscode-languageserver-textdocument';
 export declare function computeCallers(tspClient: TspClient, args: lsp.TextDocumentPositionParams): Promise<lspcalls.CallsResult>;
 export declare type DocumentProvider = (file: string) => TextDocument | undefined;
 export declare function computeCallees(tspClient: TspClient, args: lsp.TextDocumentPositionParams, documentProvider: DocumentProvider): Promise<lspcalls.CallsResult>;

package/lib/calls.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"calls.d.ts","sourceRoot":"","sources":["../src/calls.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,GAAG,MAAM,uBAAuB,CAAC;AAC7C,OAAO,KAAK,QAAQ,MAAM,kCAAkC,CAAC;AAC7D,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG5C,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAElE,wBAAsB,cAAc,CAAC,SAAS,EAAE,SAAS,EAAE,IAAI,EAAE,GAAG,CAAC,0BAA0B,GAAG,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,CAwB9H;AACD,oBAAY,gBAAgB,GAAG,CAAC,IAAI,EAAE,MAAM,KAAK,YAAY,GAAG,SAAS,CAAC;AAC1E,wBAAsB,cAAc,CAAC,SAAS,EAAE,SAAS,EAAE,IAAI,EAAE,GAAG,CAAC,0BAA0B,EAAE,gBAAgB,EAAE,gBAAgB,GAAG,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,CA6BlK"}
+{"version":3,"file":"calls.d.ts","sourceRoot":"","sources":["../src/calls.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,GAAG,MAAM,uBAAuB,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAClE,OAAO,KAAK,QAAQ,MAAM,kCAAkC,CAAC;AAC7D,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAK5C,wBAAsB,cAAc,CAAC,SAAS,EAAE,SAAS,EAAE,IAAI,EAAE,GAAG,CAAC,0BAA0B,GAAG,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,CAwB9H;AACD,oBAAY,gBAAgB,GAAG,CAAC,IAAI,EAAE,MAAM,KAAK,YAAY,GAAG,SAAS,CAAC;AAC1E,wBAAsB,cAAc,CAAC,SAAS,EAAE,SAAS,EAAE,IAAI,EAAE,GAAG,CAAC,0BAA0B,EAAE,gBAAgB,EAAE,gBAAgB,GAAG,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,CA6BlK"}

package/lib/calls.js

@@ -1,161 +1,143 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 import * as lsp from 'vscode-languageserver';
 import * as lspcalls from './lsp-protocol.calls.proposed.js';
-import { uriToPath, toLocation, asRange, Range, toSymbolKind, pathToUri } from './protocol-translation.js';
-export function computeCallers(tspClient, args) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const nullResult = { calls: [] };
-        const contextDefinition = yield getDefinition(tspClient, args);
-        if (!contextDefinition) {
-            return nullResult;
-        }
-        const contextSymbol = yield findEnclosingSymbol(tspClient, contextDefinition);
-        if (!contextSymbol) {
-            return nullResult;
-        }
-        const callerReferences = yield findNonDefinitionReferences(tspClient, contextDefinition);
-        const calls = [];
-        for (const callerReference of callerReferences) {
-            const symbol = yield findEnclosingSymbol(tspClient, callerReference);
-            if (!symbol) {
-                continue;
-            }
-            const location = toLocation(callerReference, undefined);
-            calls.push({
-                location,
-                symbol
-            });
+import { uriToPath, toLocation, toSymbolKind, pathToUri } from './protocol-translation.js';
+import { Range } from './utils/typeConverters.js';
+export async function computeCallers(tspClient, args) {
+    const nullResult = { calls: [] };
+    const contextDefinition = await getDefinition(tspClient, args);
+    if (!contextDefinition) {
+        return nullResult;
+    }
+    const contextSymbol = await findEnclosingSymbol(tspClient, contextDefinition);
+    if (!contextSymbol) {
+        return nullResult;
+    }
+    const callerReferences = await findNonDefinitionReferences(tspClient, contextDefinition);
+    const calls = [];
+    for (const callerReference of callerReferences) {
+        const symbol = await findEnclosingSymbol(tspClient, callerReference);
+        if (!symbol) {
+            continue;
         }
-        return { calls, symbol: contextSymbol };
-    });
+        const location = toLocation(callerReference, undefined);
+        calls.push({
+            location,
+            symbol,
+        });
+    }
+    return { calls, symbol: contextSymbol };
 }
-export function computeCallees(tspClient, args, documentProvider) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const nullResult = { calls: [] };
-        const contextDefinition = yield getDefinition(tspClient, args);
-        if (!contextDefinition) {
-            return nullResult;
-        }
-        const contextSymbol = yield findEnclosingSymbol(tspClient, contextDefinition);
-        if (!contextSymbol) {
-            return nullResult;
+export async function computeCallees(tspClient, args, documentProvider) {
+    const nullResult = { calls: [] };
+    const contextDefinition = await getDefinition(tspClient, args);
+    if (!contextDefinition) {
+        return nullResult;
+    }
+    const contextSymbol = await findEnclosingSymbol(tspClient, contextDefinition);
+    if (!contextSymbol) {
+        return nullResult;
+    }
+    const outgoingCallReferences = await findOutgoingCalls(tspClient, contextSymbol, documentProvider);
+    const calls = [];
+    for (const reference of outgoingCallReferences) {
+        const definitionReferences = await findDefinitionReferences(tspClient, reference);
+        const definitionReference = definitionReferences[0];
+        if (!definitionReference) {
+            continue;
         }
-        const outgoingCallReferences = yield findOutgoingCalls(tspClient, contextSymbol, documentProvider);
-        const calls = [];
-        for (const reference of outgoingCallReferences) {
-            const definitionReferences = yield findDefinitionReferences(tspClient, reference);
-            const definitionReference = definitionReferences[0];
-            if (!definitionReference) {
-                continue;
-            }
-            const definitionSymbol = yield findEnclosingSymbol(tspClient, definitionReference);
-            if (!definitionSymbol) {
-                continue;
-            }
-            const location = toLocation(reference, undefined);
-            calls.push({
-                location,
-                symbol: definitionSymbol
-            });
+        const definitionSymbol = await findEnclosingSymbol(tspClient, definitionReference);
+        if (!definitionSymbol) {
+            continue;
         }
-        return { calls, symbol: contextSymbol };
-    });
+        const location = toLocation(reference, undefined);
+        calls.push({
+            location,
+            symbol: definitionSymbol,
+        });
+    }
+    return { calls, symbol: contextSymbol };
 }
-function findOutgoingCalls(tspClient, contextSymbol, documentProvider) {
-    return __awaiter(this, void 0, void 0, function* () {
-        /**
-         * The TSP does not provide call references.
-         * As long as we are not able to access the AST in a tsserver plugin and return the information necessary as metadata to the reponse,
-         * we need to test possible calls.
-         */
-        const computeCallCandidates = (document, range) => {
-            const symbolText = document.getText(range);
-            const regex = /\W([$_a-zA-Z0-9\u{00C0}-\u{E007F}]+)(<.*>)?\(/gmu; // Example: matches `candidate` in " candidate()", "Foo.candidate<T>()", etc.
-            let match = regex.exec(symbolText);
-            const candidates = [];
-            while (match) {
-                const identifier = match[1];
-                if (identifier) {
-                    const start = match.index + match[0].indexOf(identifier);
-                    const end = start + identifier.length;
-                    candidates.push({ identifier, start, end });
-                }
-                match = regex.exec(symbolText);
+async function findOutgoingCalls(tspClient, contextSymbol, documentProvider) {
+    /**
+     * The TSP does not provide call references.
+     * As long as we are not able to access the AST in a tsserver plugin and return the information necessary as metadata to the reponse,
+     * we need to test possible calls.
+     */
+    const computeCallCandidates = (document, range) => {
+        const symbolText = document.getText(range);
+        const regex = /\W([$_a-zA-Z0-9\u{00C0}-\u{E007F}]+)(<.*>)?\(/gmu; // Example: matches `candidate` in " candidate()", "Foo.candidate<T>()", etc.
+        let match = regex.exec(symbolText);
+        const candidates = [];
+        while (match) {
+            const identifier = match[1];
+            if (identifier) {
+                const start = match.index + match[0].indexOf(identifier);
+                const end = start + identifier.length;
+                candidates.push({ identifier, start, end });
             }
-            const offset = document.offsetAt(range.start);
-            const candidateRanges = candidates.map(c => lsp.Range.create(document.positionAt(offset + c.start), document.positionAt(offset + c.end)));
-            return candidateRanges;
-        };
-        /**
-         * This function tests a candidate and returns a locaion for a valid call.
-         */
-        const validateCall = (file, candidateRange) => __awaiter(this, void 0, void 0, function* () {
-            const tspPosition = { line: candidateRange.start.line + 1, offset: candidateRange.start.character + 1 };
-            const references = yield findNonDefinitionReferences(tspClient, { file, start: tspPosition, end: tspPosition });
-            for (const reference of references) {
-                const tspPosition = { line: candidateRange.start.line + 1, offset: candidateRange.start.character + 1 };
-                if (tspPosition.line === reference.start.line) {
-                    return reference;
-                }
-            }
-        });
-        const calls = [];
-        const file = uriToPath(contextSymbol.location.uri);
-        const document = documentProvider(file);
-        if (!document) {
-            return calls;
+            match = regex.exec(symbolText);
         }
-        const candidateRanges = computeCallCandidates(document, contextSymbol.location.range);
-        for (const candidateRange of candidateRanges) {
-            const call = yield validateCall(file, candidateRange);
-            if (call) {
-                calls.push(call);
+        const offset = document.offsetAt(range.start);
+        const candidateRanges = candidates.map(c => lsp.Range.create(document.positionAt(offset + c.start), document.positionAt(offset + c.end)));
+        return candidateRanges;
+    };
+    /**
+     * This function tests a candidate and returns a locaion for a valid call.
+     */
+    const validateCall = async (file, candidateRange) => {
+        const tspPosition = { line: candidateRange.start.line + 1, offset: candidateRange.start.character + 1 };
+        const references = await findNonDefinitionReferences(tspClient, { file, start: tspPosition, end: tspPosition });
+        for (const reference of references) {
+            const tspPosition = { line: candidateRange.start.line + 1, offset: candidateRange.start.character + 1 };
+            if (tspPosition.line === reference.start.line) {
+                return reference;
             }
         }
+    };
+    const calls = [];
+    const file = uriToPath(contextSymbol.location.uri);
+    const document = documentProvider(file);
+    if (!document) {
         return calls;
-    });
-}
-function getDefinition(tspClient, args) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const file = uriToPath(args.textDocument.uri);
-        if (!file) {
-            return undefined;
+    }
+    const candidateRanges = computeCallCandidates(document, contextSymbol.location.range);
+    for (const candidateRange of candidateRanges) {
+        const call = await validateCall(file, candidateRange);
+        if (call) {
+            calls.push(call);
         }
-        const definitionResult = yield tspClient.request("definition" /* CommandTypes.Definition */, {
-            file,
-            line: args.position.line + 1,
-            offset: args.position.character + 1
-        });
-        return definitionResult.body ? definitionResult.body[0] : undefined;
-    });
+    }
+    return calls;
 }
-function findEnclosingSymbol(tspClient, args) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const file = args.file;
-        const response = yield tspClient.request("navtree" /* CommandTypes.NavTree */, { file });
-        const tree = response.body;
-        if (!tree || !tree.childItems) {
-            return undefined;
-        }
-        const pos = lsp.Position.create(args.start.line - 1, args.start.offset - 1);
-        const symbol = yield findEnclosingSymbolInTree(tree, lsp.Range.create(pos, pos));
-        if (!symbol) {
-            return undefined;
-        }
-        const uri = pathToUri(file, undefined);
-        return lspcalls.DefinitionSymbol.create(uri, symbol);
+async function getDefinition(tspClient, args) {
+    const file = uriToPath(args.textDocument.uri);
+    if (!file) {
+        return undefined;
+    }
+    const definitionResult = await tspClient.request("definition" /* CommandTypes.Definition */, {
+        file,
+        line: args.position.line + 1,
+        offset: args.position.character + 1,
     });
+    return definitionResult.body ? definitionResult.body[0] : undefined;
+}
+async function findEnclosingSymbol(tspClient, args) {
+    const file = args.file;
+    const response = await tspClient.request("navtree" /* CommandTypes.NavTree */, { file });
+    const tree = response.body;
+    if (!tree || !tree.childItems) {
+        return undefined;
+    }
+    const pos = lsp.Position.create(args.start.line - 1, args.start.offset - 1);
+    const symbol = findEnclosingSymbolInTree(tree, lsp.Range.create(pos, pos));
+    if (!symbol) {
+        return undefined;
+    }
+    const uri = pathToUri(file, undefined);
+    return lspcalls.DefinitionSymbol.create(uri, symbol);
 }
 function findEnclosingSymbolInTree(parent, range) {
-    const inSpan = (span) => !!Range.intersection(asRange(span), range);
+    const inSpan = (span) => !!Range.intersection(Range.fromTextSpan(span), range);
     const inTree = (tree) => tree.spans.some(span => inSpan(span));
     let candidate = inTree(parent) ? parent : undefined;
     outer: while (candidate) {
@@ -172,10 +154,10 @@ function findEnclosingSymbolInTree(parent, range) {
         return undefined;
     }
     const span = candidate.spans.find(span => inSpan(span));
-    const spanRange = asRange(span);
+    const spanRange = Range.fromTextSpan(span);
     let selectionRange = spanRange;
     if (candidate.nameSpan) {
-        const nameRange = asRange(candidate.nameSpan);
+        const nameRange = Range.fromTextSpan(candidate.nameSpan);
         if (Range.intersection(spanRange, nameRange)) {
             selectionRange = nameRange;
         }
@@ -184,31 +166,25 @@ function findEnclosingSymbolInTree(parent, range) {
         name: candidate.text,
         kind: toSymbolKind(candidate.kind),
         range: spanRange,
-        selectionRange: selectionRange
+        selectionRange: selectionRange,
     };
 }
-function findDefinitionReferences(tspClient, args) {
-    return __awaiter(this, void 0, void 0, function* () {
-        return (yield findReferences(tspClient, args)).filter(ref => ref.isDefinition);
-    });
+async function findDefinitionReferences(tspClient, args) {
+    return (await findReferences(tspClient, args)).filter(ref => ref.isDefinition);
 }
-function findNonDefinitionReferences(tspClient, args) {
-    return __awaiter(this, void 0, void 0, function* () {
-        return (yield findReferences(tspClient, args)).filter(ref => !ref.isDefinition);
-    });
+async function findNonDefinitionReferences(tspClient, args) {
+    return (await findReferences(tspClient, args)).filter(ref => !ref.isDefinition);
 }
-function findReferences(tspClient, args) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const file = args.file;
-        const result = yield tspClient.request("references" /* CommandTypes.References */, {
-            file,
-            line: args.start.line,
-            offset: args.start.offset
-        });
-        if (!result.body) {
-            return [];
-        }
-        return result.body.refs;
+async function findReferences(tspClient, args) {
+    const file = args.file;
+    const result = await tspClient.request("references" /* CommandTypes.References */, {
+        file,
+        line: args.start.line,
+        offset: args.start.offset,
     });
+    if (!result.body) {
+        return [];
+    }
+    return result.body.refs;
 }
 //# sourceMappingURL=calls.js.map

package/lib/calls.js.map

@@ -1 +1 @@
-{"version":3,"file":"calls.js","sourceRoot":"","sources":["../src/calls.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"calls.js","sourceRoot":"","sources":["../src/calls.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,GAAG,MAAM,uBAAuB,CAAC;AAE7C,OAAO,KAAK,QAAQ,MAAM,kCAAkC,CAAC;AAG7D,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAC3F,OAAO,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAC;AAElD,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,SAAoB,EAAE,IAAoC;IAC3F,MAAM,UAAU,GAAG,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC;IACjC,MAAM,iBAAiB,GAAG,MAAM,aAAa,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;IAC/D,IAAI,CAAC,iBAAiB,EAAE;QACpB,OAAO,UAAU,CAAC;KACrB;IACD,MAAM,aAAa,GAAG,MAAM,mBAAmB,CAAC,SAAS,EAAE,iBAAiB,CAAC,CAAC;IAC9E,IAAI,CAAC,aAAa,EAAE;QAChB,OAAO,UAAU,CAAC;KACrB;IACD,MAAM,gBAAgB,GAAG,MAAM,2BAA2B,CAAC,SAAS,EAAE,iBAAiB,CAAC,CAAC;IACzF,MAAM,KAAK,GAAoB,EAAE,CAAC;IAClC,KAAK,MAAM,eAAe,IAAI,gBAAgB,EAAE;QAC5C,MAAM,MAAM,GAAG,MAAM,mBAAmB,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC;QACrE,IAAI,CAAC,MAAM,EAAE;YACT,SAAS;SACZ;QACD,MAAM,QAAQ,GAAG,UAAU,CAAC,eAAe,EAAE,SAAS,CAAC,CAAC;QACxD,KAAK,CAAC,IAAI,CAAC;YACP,QAAQ;YACR,MAAM;SACT,CAAC,CAAC;KACN;IACD,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC;AAC5C,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,SAAoB,EAAE,IAAoC,EAAE,gBAAkC;IAC/H,MAAM,UAAU,GAAG,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC;IACjC,MAAM,iBAAiB,GAAG,MAAM,aAAa,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;IAC/D,IAAI,CAAC,iBAAiB,EAAE;QACpB,OAAO,UAAU,CAAC;KACrB;IACD,MAAM,aAAa,GAAG,MAAM,mBAAmB,CAAC,SAAS,EAAE,iBAAiB,CAAC,CAAC;IAC9E,IAAI,CAAC,aAAa,EAAE;QAChB,OAAO,UAAU,CAAC;KACrB;IACD,MAAM,sBAAsB,GAAG,MAAM,iBAAiB,CAAC,SAAS,EAAE,aAAa,EAAE,gBAAgB,CAAC,CAAC;IACnG,MAAM,KAAK,GAAoB,EAAE,CAAC;IAClC,KAAK,MAAM,SAAS,IAAI,sBAAsB,EAAE;QAC5C,MAAM,oBAAoB,GAAG,MAAM,wBAAwB,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;QAClF,MAAM,mBAAmB,GAAG,oBAAoB,CAAC,CAAC,CAAC,CAAC;QACpD,IAAI,CAAC,mBAAmB,EAAE;YACtB,SAAS;SACZ;QACD,MAAM,gBAAgB,GAAG,MAAM,mBAAmB,CAAC,SAAS,EAAE,mBAAmB,CAAC,CAAC;QACnF,IAAI,CAAC,gBAAgB,EAAE;YACnB,SAAS;SACZ;QACD,MAAM,QAAQ,GAAG,UAAU,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;QAClD,KAAK,CAAC,IAAI,CAAC;YACP,QAAQ;YACR,MAAM,EAAE,gBAAgB;SAC3B,CAAC,CAAC;KACN;IACD,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC;AAC5C,CAAC;AAED,KAAK,UAAU,iBAAiB,CAAC,SAAoB,EAAE,aAAwC,EAAE,gBAAkC;IAC/H;;;;OAIG;IACH,MAAM,qBAAqB,GAAG,CAAC,QAAsB,EAAE,KAAgB,EAAe,EAAE;QACpF,MAAM,UAAU,GAAG,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAC3C,MAAM,KAAK,GAAG,kDAAkD,CAAC,CAAC,6EAA6E;QAC/I,IAAI,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACnC,MAAM,UAAU,GAA0D,EAAE,CAAC;QAC7E,OAAO,KAAK,EAAE;YACV,MAAM,UAAU,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;YAC5B,IAAI,UAAU,EAAE;gBACZ,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;gBACzD,MAAM,GAAG,GAAG,KAAK,GAAG,UAAU,CAAC,MAAM,CAAC;gBACtC,UAAU,CAAC,IAAI,CAAC,EAAE,UAAU,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC;aAC/C;YACD,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;SAClC;QACD,MAAM,MAAM,GAAG,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAC9C,MAAM,eAAe,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,CAAC,EAAE,QAAQ,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QAC1I,OAAO,eAAe,CAAC;IAC3B,CAAC,CAAC;IAEF;;OAEG;IACH,MAAM,YAAY,GAAG,KAAK,EAAE,IAAY,EAAE,cAAyB,EAAqC,EAAE;QACtG,MAAM,WAAW,GAAG,EAAE,IAAI,EAAE,cAAc,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,EAAE,MAAM,EAAE,cAAc,CAAC,KAAK,CAAC,SAAS,GAAG,CAAC,EAAE,CAAC;QACxG,MAAM,UAAU,GAAG,MAAM,2BAA2B,CAAC,SAAS,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,WAAW,EAAE,GAAG,EAAE,WAAW,EAAE,CAAC,CAAC;QAChH,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE;YAChC,MAAM,WAAW,GAAG,EAAE,IAAI,EAAE,cAAc,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,EAAE,MAAM,EAAE,cAAc,CAAC,KAAK,CAAC,SAAS,GAAG,CAAC,EAAE,CAAC;YACxG,IAAI,WAAW,CAAC,IAAI,KAAK,SAAS,CAAC,KAAK,CAAC,IAAI,EAAE;gBAC3C,OAAO,SAAS,CAAC;aACpB;SACJ;IACL,CAAC,CAAC;IAEF,MAAM,KAAK,GAAmB,EAAE,CAAC;IACjC,MAAM,IAAI,GAAG,SAAS,CAAC,aAAa,CAAC,QAAQ,CAAC,GAAG,CAAE,CAAC;IACpD,MAAM,QAAQ,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC;IACxC,IAAI,CAAC,QAAQ,EAAE;QACX,OAAO,KAAK,CAAC;KAChB;IACD,MAAM,eAAe,GAAG,qBAAqB,CAAC,QAAQ,EAAE,aAAa,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACtF,KAAK,MAAM,cAAc,IAAI,eAAe,EAAE;QAC1C,MAAM,IAAI,GAAG,MAAM,YAAY,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;QACtD,IAAI,IAAI,EAAE;YACN,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SACpB;KACJ;IACD,OAAO,KAAK,CAAC;AACjB,CAAC;AAED,KAAK,UAAU,aAAa,CAAC,SAAoB,EAAE,IAAoC;IACnF,MAAM,IAAI,GAAG,SAAS,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;IAC9C,IAAI,CAAC,IAAI,EAAE;QACP,OAAO,SAAS,CAAC;KACpB;IACD,MAAM,gBAAgB,GAAG,MAAM,SAAS,CAAC,OAAO,6CAA0B;QACtE,IAAI;QACJ,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,GAAG,CAAC;QAC5B,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,SAAS,GAAG,CAAC;KACtC,CAAC,CAAC;IACH,OAAO,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;AACxE,CAAC;AAED,KAAK,UAAU,mBAAmB,CAAC,SAAoB,EAAE,IAAkB;IACvE,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;IACvB,MAAM,QAAQ,GAAG,MAAM,SAAS,CAAC,OAAO,uCAAuB,EAAE,IAAI,EAAE,CAAC,CAAC;IACzE,MAAM,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;IAC3B,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;QAC3B,OAAO,SAAS,CAAC;KACpB;IACD,MAAM,GAAG,GAAG,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAC5E,MAAM,MAAM,GAAG,yBAAyB,CAAC,IAAI,EAAE,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;IAC3E,IAAI,CAAC,MAAM,EAAE;QACT,OAAO,SAAS,CAAC;KACpB;IACD,MAAM,GAAG,GAAG,SAAS,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;IACvC,OAAO,QAAQ,CAAC,gBAAgB,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;AACzD,CAAC;AAED,SAAS,yBAAyB,CAAC,MAA0B,EAAE,KAAgB;IAC3E,MAAM,MAAM,GAAG,CAAC,IAAkB,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,YAAY,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC,CAAC;IAC7F,MAAM,MAAM,GAAG,CAAC,IAAwB,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;IAEnF,IAAI,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;IACpD,KAAK,EAAE,OAAO,SAAS,EAAE;QACrB,MAAM,QAAQ,GAAG,SAAS,CAAC,UAAU,IAAI,EAAE,CAAC;QAC5C,KAAK,MAAM,KAAK,IAAI,QAAQ,EAAE;YAC1B,IAAI,MAAM,CAAC,KAAK,CAAC,EAAE;gBACf,SAAS,GAAG,KAAK,CAAC;gBAClB,SAAS,KAAK,CAAC;aAClB;SACJ;QACD,MAAM;KACT;IACD,IAAI,CAAC,SAAS,EAAE;QACZ,OAAO,SAAS,CAAC;KACpB;IACD,MAAM,IAAI,GAAG,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAE,CAAC;IACzD,MAAM,SAAS,GAAG,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;IAC3C,IAAI,cAAc,GAAG,SAAS,CAAC;IAC/B,IAAI,SAAS,CAAC,QAAQ,EAAE;QACpB,MAAM,SAAS,GAAG,KAAK,CAAC,YAAY,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QACzD,IAAI,KAAK,CAAC,YAAY,CAAC,SAAS,EAAE,SAAS,CAAC,EAAE;YAC1C,cAAc,GAAG,SAAS,CAAC;SAC9B;KACJ;IACD,OAAO;QACH,IAAI,EAAE,SAAS,CAAC,IAAI;QACpB,IAAI,EAAE,YAAY,CAAC,SAAS,CAAC,IAAI,CAAC;QAClC,KAAK,EAAE,SAAS;QAChB,cAAc,EAAE,cAAc;KACjC,CAAC;AACN,CAAC;AAED,KAAK,UAAU,wBAAwB,CAAC,SAAoB,EAAE,IAAkB;IAC5E,OAAO,CAAC,MAAM,cAAc,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;AACnF,CAAC;AAED,KAAK,UAAU,2BAA2B,CAAC,SAAoB,EAAE,IAAkB;IAC/E,OAAO,CAAC,MAAM,cAAc,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;AACpF,CAAC;AAED,KAAK,UAAU,cAAc,CAAC,SAAoB,EAAE,IAAkB;IAClE,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;IACvB,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,OAAO,6CAA0B;QAC5D,IAAI;QACJ,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI;QACrB,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM;KAC5B,CAAC,CAAC;IACH,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE;QACd,OAAO,EAAE,CAAC;KACb;IACD,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC;AAC5B,CAAC"}

package/lib/cli.js

@@ -36,6 +36,6 @@ createLspConnection({
     tsserverPath: options.tsserverPath,
     tsserverLogFile: options.tsserverLogFile,
     tsserverLogVerbosity: options.tsserverLogVerbosity,
-    showMessageLevel: logLevel
+    showMessageLevel: logLevel,
 }).listen();
 //# sourceMappingURL=cli.js.map