typescript-language-server 1.0.0 → 1.1.0

package/lib/document-symbol.js

@@ -4,22 +4,23 @@
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
  */
-import { asRange, toSymbolKind, Range } from './protocol-translation.js';
+import { toSymbolKind } from './protocol-translation.js';
 import { ScriptElementKind } from './tsp-command-types.js';
+import { Range } from './utils/typeConverters.js';
 export function collectDocumentSymbols(parent, symbols) {
-    return collectDocumentSymbolsInRange(parent, symbols, { start: asRange(parent.spans[0]).start, end: asRange(parent.spans[parent.spans.length - 1]).end });
+    return collectDocumentSymbolsInRange(parent, symbols, { start: Range.fromTextSpan(parent.spans[0]).start, end: Range.fromTextSpan(parent.spans[parent.spans.length - 1]).end });
 }
 function collectDocumentSymbolsInRange(parent, symbols, range) {
     let shouldInclude = shouldIncludeEntry(parent);
     for (const span of parent.spans) {
-        const spanRange = asRange(span);
+        const spanRange = Range.fromTextSpan(span);
         if (!Range.intersection(range, spanRange)) {
             continue;
         }
         const children = [];
         if (parent.childItems) {
             for (const child of parent.childItems) {
-                if (child.spans.some(childSpan => !!Range.intersection(spanRange, asRange(childSpan)))) {
+                if (child.spans.some(childSpan => !!Range.intersection(spanRange, Range.fromTextSpan(childSpan)))) {
                     const includedChild = collectDocumentSymbolsInRange(child, children, spanRange);
                     shouldInclude = shouldInclude || includedChild;
                 }
@@ -27,7 +28,7 @@ function collectDocumentSymbolsInRange(parent, symbols, range) {
         }
         let selectionRange = spanRange;
         if (parent.nameSpan) {
-            const nameRange = asRange(parent.nameSpan);
+            const nameRange = Range.fromTextSpan(parent.nameSpan);
             // In the case of mergeable definitions, the nameSpan is only correct for the first definition.
             if (Range.intersection(spanRange, nameRange)) {
                 selectionRange = nameRange;
@@ -40,7 +41,7 @@ function collectDocumentSymbolsInRange(parent, symbols, range) {
                 kind: toSymbolKind(parent.kind),
                 range: spanRange,
                 selectionRange: selectionRange,
-                children
+                children,
             });
         }
     }
@@ -50,11 +51,11 @@ export function collectSymbolInformation(uri, current, symbols, containerName) {
     let shouldInclude = shouldIncludeEntry(current);
     const name = current.text;
     for (const span of current.spans) {
-        const range = asRange(span);
+        const range = Range.fromTextSpan(span);
         const children = [];
         if (current.childItems) {
             for (const child of current.childItems) {
-                if (child.spans.some(span => !!Range.intersection(range, asRange(span)))) {
+                if (child.spans.some(span => !!Range.intersection(range, Range.fromTextSpan(span)))) {
                     const includedChild = collectSymbolInformation(uri, child, children, name);
                     shouldInclude = shouldInclude || includedChild;
                 }
@@ -66,9 +67,9 @@ export function collectSymbolInformation(uri, current, symbols, containerName) {
                 kind: toSymbolKind(current.kind),
                 location: {
                     uri,
-                    range
+                    range,
                 },
-                containerName
+                containerName,
             });
             symbols.push(...children);
         }

package/lib/document-symbol.js.map

@@ -1 +1 @@
-{"version":3,"file":"document-symbol.js","sourceRoot":"","sources":["../src/document-symbol.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"document-symbol.js","sourceRoot":"","sources":["../src/document-symbol.ts"],"names":[],"mappings":"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"}

package/lib/features/fix-all.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fix-all.d.ts","sourceRoot":"","sources":["../../src/features/fix-all.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,GAAG,MAAM,uBAAuB,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAI7C,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AA6KnD,qBAAa,yBAAyB;IAWtB,OAAO,CAAC,QAAQ,CAAC,MAAM;IAVnC,OAAO,CAAC,MAAM,CAAC,aAAa,CAI1B;IAEF,WAAkB,KAAK,IAAI,cAAc,EAAE,CAE1C;gBAE4B,MAAM,EAAE,SAAS;IAEjC,kBAAkB,CAAC,KAAK,EAAE,cAAc,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,CAAC,UAAU,EAAE,EAAE,SAAS,EAAE,YAAY,GAAG,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC;CAS5J"}
+{"version":3,"file":"fix-all.d.ts","sourceRoot":"","sources":["../../src/features/fix-all.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,GAAG,MAAM,uBAAuB,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAI7C,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AA8KnD,qBAAa,yBAAyB;IAWtB,OAAO,CAAC,QAAQ,CAAC,MAAM;IAVnC,OAAO,CAAC,MAAM,CAAC,aAAa,CAI1B;IAEF,WAAkB,KAAK,IAAI,cAAc,EAAE,CAE1C;gBAE4B,MAAM,EAAE,SAAS;IAEjC,kBAAkB,CAAC,KAAK,EAAE,cAAc,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,CAAC,UAAU,EAAE,EAAE,SAAS,EAAE,YAAY,GAAG,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC;CAS5J"}

package/lib/features/fix-all.js

@@ -2,83 +2,75 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-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 { toFileRangeRequestArgs, toTextDocumentEdit } from '../protocol-translation.js';
+import { toTextDocumentEdit } from '../protocol-translation.js';
 import * as errorCodes from '../utils/errorCodes.js';
 import * as fixNames from '../utils/fixNames.js';
 import { CodeActionKind } from '../utils/types.js';
-function buildIndividualFixes(fixes, client, file, documents, diagnostics) {
-    var _a;
-    return __awaiter(this, void 0, void 0, function* () {
-        const edits = [];
-        for (const diagnostic of diagnostics) {
-            for (const { codes, fixName } of fixes) {
-                if (!codes.has(diagnostic.code)) {
-                    continue;
-                }
-                const args = Object.assign(Object.assign({}, toFileRangeRequestArgs(file, diagnostic.range)), { errorCodes: [+diagnostic.code] });
-                const response = yield client.request("getCodeFixes" /* CommandTypes.GetCodeFixes */, args);
-                if (response.type !== 'response') {
-                    continue;
-                }
-                const fix = (_a = response.body) === null || _a === void 0 ? void 0 : _a.find(fix => fix.fixName === fixName);
-                if (fix) {
-                    edits.push(...fix.changes.map(change => toTextDocumentEdit(change, documents)));
-                    break;
-                }
+import { Range } from '../utils/typeConverters.js';
+async function buildIndividualFixes(fixes, client, file, documents, diagnostics) {
+    const edits = [];
+    for (const diagnostic of diagnostics) {
+        for (const { codes, fixName } of fixes) {
+            if (!codes.has(diagnostic.code)) {
+                continue;
+            }
+            const args = {
+                ...Range.toFileRangeRequestArgs(file, diagnostic.range),
+                errorCodes: [+diagnostic.code],
+            };
+            const response = await client.request("getCodeFixes" /* CommandTypes.GetCodeFixes */, args);
+            if (response.type !== 'response') {
+                continue;
+            }
+            const fix = response.body?.find(fix => fix.fixName === fixName);
+            if (fix) {
+                edits.push(...fix.changes.map(change => toTextDocumentEdit(change, documents)));
+                break;
             }
         }
-        return edits;
-    });
+    }
+    return edits;
 }
-function buildCombinedFix(fixes, client, file, documents, diagnostics) {
-    var _a, _b;
-    return __awaiter(this, void 0, void 0, function* () {
-        const edits = [];
-        for (const diagnostic of diagnostics) {
-            for (const { codes, fixName } of fixes) {
-                if (!codes.has(diagnostic.code)) {
-                    continue;
-                }
-                const args = Object.assign(Object.assign({}, toFileRangeRequestArgs(file, diagnostic.range)), { errorCodes: [+diagnostic.code] });
-                const response = yield client.request("getCodeFixes" /* CommandTypes.GetCodeFixes */, args);
-                if (response.type !== 'response' || !((_a = response.body) === null || _a === void 0 ? void 0 : _a.length)) {
-                    continue;
-                }
-                const fix = (_b = response.body) === null || _b === void 0 ? void 0 : _b.find(fix => fix.fixName === fixName);
-                if (!fix) {
-                    continue;
-                }
-                if (!fix.fixId) {
-                    edits.push(...fix.changes.map(change => toTextDocumentEdit(change, documents)));
-                    return edits;
-                }
-                const combinedArgs = {
-                    scope: {
-                        type: 'file',
-                        args: { file }
-                    },
-                    fixId: fix.fixId
-                };
-                const combinedResponse = yield client.request("getCombinedCodeFix" /* CommandTypes.GetCombinedCodeFix */, combinedArgs);
-                if (combinedResponse.type !== 'response' || !combinedResponse.body) {
-                    return edits;
-                }
-                edits.push(...combinedResponse.body.changes.map(change => toTextDocumentEdit(change, documents)));
+async function buildCombinedFix(fixes, client, file, documents, diagnostics) {
+    const edits = [];
+    for (const diagnostic of diagnostics) {
+        for (const { codes, fixName } of fixes) {
+            if (!codes.has(diagnostic.code)) {
+                continue;
+            }
+            const args = {
+                ...Range.toFileRangeRequestArgs(file, diagnostic.range),
+                errorCodes: [+diagnostic.code],
+            };
+            const response = await client.request("getCodeFixes" /* CommandTypes.GetCodeFixes */, args);
+            if (response.type !== 'response' || !response.body?.length) {
+                continue;
+            }
+            const fix = response.body?.find(fix => fix.fixName === fixName);
+            if (!fix) {
+                continue;
+            }
+            if (!fix.fixId) {
+                edits.push(...fix.changes.map(change => toTextDocumentEdit(change, documents)));
+                return edits;
+            }
+            const combinedArgs = {
+                scope: {
+                    type: 'file',
+                    args: { file },
+                },
+                fixId: fix.fixId,
+            };
+            const combinedResponse = await client.request("getCombinedCodeFix" /* CommandTypes.GetCombinedCodeFix */, combinedArgs);
+            if (combinedResponse.type !== 'response' || !combinedResponse.body) {
                 return edits;
             }
+            edits.push(...combinedResponse.body.changes.map(change => toTextDocumentEdit(change, documents)));
+            return edits;
         }
-        return edits;
-    });
+    }
+    return edits;
 }
 // #region Source Actions
 class SourceAction {
@@ -88,21 +80,19 @@ class SourceFixAll extends SourceAction {
         super(...arguments);
         this.title = 'Fix all';
     }
-    build(client, file, documents, diagnostics) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const edits = [];
-            edits.push(...yield buildIndividualFixes([
-                { codes: errorCodes.incorrectlyImplementsInterface, fixName: fixNames.classIncorrectlyImplementsInterface },
-                { codes: errorCodes.asyncOnlyAllowedInAsyncFunctions, fixName: fixNames.awaitInSyncFunction }
-            ], client, file, documents, diagnostics));
-            edits.push(...yield buildCombinedFix([
-                { codes: errorCodes.unreachableCode, fixName: fixNames.unreachableCode }
-            ], client, file, documents, diagnostics));
-            if (!edits.length) {
-                return null;
-            }
-            return lsp.CodeAction.create(this.title, { documentChanges: edits }, SourceFixAll.kind.value);
-        });
+    async build(client, file, documents, diagnostics) {
+        const edits = [];
+        edits.push(...await buildIndividualFixes([
+            { codes: errorCodes.incorrectlyImplementsInterface, fixName: fixNames.classIncorrectlyImplementsInterface },
+            { codes: errorCodes.asyncOnlyAllowedInAsyncFunctions, fixName: fixNames.awaitInSyncFunction },
+        ], client, file, documents, diagnostics));
+        edits.push(...await buildCombinedFix([
+            { codes: errorCodes.unreachableCode, fixName: fixNames.unreachableCode },
+        ], client, file, documents, diagnostics));
+        if (!edits.length) {
+            return null;
+        }
+        return lsp.CodeAction.create(this.title, { documentChanges: edits }, SourceFixAll.kind.value);
     }
 }
 SourceFixAll.kind = CodeActionKind.SourceFixAllTs;
@@ -111,16 +101,14 @@ class SourceRemoveUnused extends SourceAction {
         super(...arguments);
         this.title = 'Remove all unused code';
     }
-    build(client, file, documents, diagnostics) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const edits = yield buildCombinedFix([
-                { codes: errorCodes.variableDeclaredButNeverUsed, fixName: fixNames.unusedIdentifier }
-            ], client, file, documents, diagnostics);
-            if (!edits.length) {
-                return null;
-            }
-            return lsp.CodeAction.create(this.title, { documentChanges: edits }, SourceRemoveUnused.kind.value);
-        });
+    async build(client, file, documents, diagnostics) {
+        const edits = await buildCombinedFix([
+            { codes: errorCodes.variableDeclaredButNeverUsed, fixName: fixNames.unusedIdentifier },
+        ], client, file, documents, diagnostics);
+        if (!edits.length) {
+            return null;
+        }
+        return lsp.CodeAction.create(this.title, { documentChanges: edits }, SourceRemoveUnused.kind.value);
     }
 }
 SourceRemoveUnused.kind = CodeActionKind.SourceRemoveUnusedTs;
@@ -129,16 +117,14 @@ class SourceAddMissingImports extends SourceAction {
         super(...arguments);
         this.title = 'Add all missing imports';
     }
-    build(client, file, documents, diagnostics) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const edits = yield buildCombinedFix([
-                { codes: errorCodes.cannotFindName, fixName: fixNames.fixImport }
-            ], client, file, documents, diagnostics);
-            if (!edits.length) {
-                return null;
-            }
-            return lsp.CodeAction.create(this.title, { documentChanges: edits }, SourceAddMissingImports.kind.value);
-        });
+    async build(client, file, documents, diagnostics) {
+        const edits = await buildCombinedFix([
+            { codes: errorCodes.cannotFindName, fixName: fixNames.fixImport },
+        ], client, file, documents, diagnostics);
+        if (!edits.length) {
+            return null;
+        }
+        return lsp.CodeAction.create(this.title, { documentChanges: edits }, SourceAddMissingImports.kind.value);
     }
 }
 SourceAddMissingImports.kind = CodeActionKind.SourceAddMissingImportsTs;
@@ -150,21 +136,19 @@ export class TypeScriptAutoFixProvider {
     static get kinds() {
         return TypeScriptAutoFixProvider.kindProviders.map(provider => provider.kind);
     }
-    provideCodeActions(kinds, file, diagnostics, documents) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const results = [];
-            for (const provider of TypeScriptAutoFixProvider.kindProviders) {
-                if (kinds.some(kind => kind.contains(provider.kind))) {
-                    results.push((new provider).build(this.client, file, documents, diagnostics));
-                }
+    async provideCodeActions(kinds, file, diagnostics, documents) {
+        const results = [];
+        for (const provider of TypeScriptAutoFixProvider.kindProviders) {
+            if (kinds.some(kind => kind.contains(provider.kind))) {
+                results.push((new provider).build(this.client, file, documents, diagnostics));
             }
-            return (yield Promise.all(results)).flatMap(result => result || []);
-        });
+        }
+        return (await Promise.all(results)).flatMap(result => result || []);
     }
 }
 TypeScriptAutoFixProvider.kindProviders = [
     SourceFixAll,
     SourceRemoveUnused,
-    SourceAddMissingImports
+    SourceAddMissingImports,
 ];
 //# sourceMappingURL=fix-all.js.map

package/lib/features/fix-all.js.map

@@ -1 +1 @@
-{"version":3,"file":"fix-all.js","sourceRoot":"","sources":["../../src/features/fix-all.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"fix-all.js","sourceRoot":"","sources":["../../src/features/fix-all.ts"],"names":[],"mappings":"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"}

package/lib/features/inlay-hints.d.ts

@@ -0,0 +1,11 @@
+import * as lsp from 'vscode-languageserver';
+import API from '../utils/api.js';
+import type { ConfigurationManager } from '../configuration-manager.js';
+import type { LspDocuments } from '../document.js';
+import type { TspClient } from '../tsp-client.js';
+import type { LspClient } from '../lsp-client.js';
+export declare class TypeScriptInlayHintsProvider {
+    static readonly minVersion: API;
+    static provideInlayHints(uri: lsp.DocumentUri, range: lsp.Range, documents: LspDocuments, tspClient: TspClient, lspClient: LspClient, configurationManager: ConfigurationManager): Promise<lsp.InlayHint[]>;
+}
+//# sourceMappingURL=inlay-hints.d.ts.map

package/lib/features/inlay-hints.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"inlay-hints.d.ts","sourceRoot":"","sources":["../../src/features/inlay-hints.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,GAAG,MAAM,uBAAuB,CAAC;AAC7C,OAAO,GAAG,MAAM,iBAAiB,CAAC;AAClC,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACxE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AACnD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAKlD,qBAAa,4BAA4B;IACrC,gBAAuB,UAAU,MAAY;WAEzB,iBAAiB,CACjC,GAAG,EAAE,GAAG,CAAC,WAAW,EACpB,KAAK,EAAE,GAAG,CAAC,KAAK,EAChB,SAAS,EAAE,YAAY,EACvB,SAAS,EAAE,SAAS,EACpB,SAAS,EAAE,SAAS,EACpB,oBAAoB,EAAE,oBAAoB,GAC3C,OAAO,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC;CA4C9B"}

package/lib/features/inlay-hints.js

@@ -0,0 +1,70 @@
+/*
+ * Copyright (C) 2022 TypeFox and others.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+ */
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+import * as lsp from 'vscode-languageserver';
+import API from '../utils/api.js';
+import { Position } from '../utils/typeConverters.js';
+import { uriToPath } from '../protocol-translation.js';
+export class TypeScriptInlayHintsProvider {
+    static async provideInlayHints(uri, range, documents, tspClient, lspClient, configurationManager) {
+        if (tspClient.apiVersion.lt(TypeScriptInlayHintsProvider.minVersion)) {
+            lspClient.showErrorMessage('Inlay Hints request failed. Requires TypeScript 4.4+.');
+            return [];
+        }
+        const file = uriToPath(uri);
+        if (!file) {
+            lspClient.showErrorMessage('Inlay Hints request failed. No resource provided.');
+            return [];
+        }
+        const document = documents.get(file);
+        if (!document) {
+            lspClient.showErrorMessage('Inlay Hints request failed. File not opened in the editor.');
+            return [];
+        }
+        if (!areInlayHintsEnabledForFile(configurationManager, file)) {
+            return [];
+        }
+        await configurationManager.configureGloballyFromDocument(file);
+        const start = document.offsetAt(range.start);
+        const length = document.offsetAt(range.end) - start;
+        const response = await tspClient.request("provideInlayHints" /* CommandTypes.ProvideInlayHints */, { file, start, length });
+        if (response.type !== 'response' || !response.success || !response.body) {
+            return [];
+        }
+        return response.body.map(hint => {
+            const inlayHint = lsp.InlayHint.create(Position.fromLocation(hint.position), hint.text, fromProtocolInlayHintKind(hint.kind));
+            hint.whitespaceBefore && (inlayHint.paddingLeft = true);
+            hint.whitespaceAfter && (inlayHint.paddingRight = true);
+            return inlayHint;
+        });
+    }
+}
+TypeScriptInlayHintsProvider.minVersion = API.v440;
+function areInlayHintsEnabledForFile(configurationManager, filename) {
+    const preferences = configurationManager.getPreferences(filename);
+    // Doesn't need to include `includeInlayVariableTypeHintsWhenTypeMatchesName` as it depends
+    // on `includeInlayVariableTypeHints` being enabled.
+    return preferences.includeInlayParameterNameHints === 'literals' ||
+        preferences.includeInlayParameterNameHints === 'all' ||
+        preferences.includeInlayEnumMemberValueHints ||
+        preferences.includeInlayFunctionLikeReturnTypeHints ||
+        preferences.includeInlayFunctionParameterTypeHints ||
+        preferences.includeInlayPropertyDeclarationTypeHints ||
+        preferences.includeInlayVariableTypeHints;
+}
+function fromProtocolInlayHintKind(kind) {
+    switch (kind) {
+        case 'Parameter': return lsp.InlayHintKind.Parameter;
+        case 'Type': return lsp.InlayHintKind.Type;
+        case 'Enum': return undefined;
+        default: return undefined;
+    }
+}
+//# sourceMappingURL=inlay-hints.js.map

package/lib/features/inlay-hints.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"inlay-hints.js","sourceRoot":"","sources":["../../src/features/inlay-hints.ts"],"names":[],"mappings":"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"}

package/lib/features/source-definition.d.ts

@@ -0,0 +1,11 @@
+import * as lsp from 'vscode-languageserver';
+import API from '../utils/api.js';
+import type { LspDocuments } from '../document.js';
+import type { TspClient } from '../tsp-client.js';
+import type { LspClient } from '../lsp-client.js';
+export declare class SourceDefinitionCommand {
+    static readonly id = "_typescript.goToSourceDefinition";
+    static readonly minVersion: API;
+    static execute(uri: lsp.DocumentUri | undefined, position: lsp.Position | undefined, documents: LspDocuments, tspClient: TspClient, lspClient: LspClient, reporter: lsp.WorkDoneProgressReporter): Promise<lsp.Location[] | void>;
+}
+//# sourceMappingURL=source-definition.d.ts.map

package/lib/features/source-definition.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"source-definition.d.ts","sourceRoot":"","sources":["../../src/features/source-definition.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,GAAG,MAAM,uBAAuB,CAAC;AAC7C,OAAO,GAAG,MAAM,iBAAiB,CAAC;AAGlC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AACnD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAGlD,qBAAa,uBAAuB;IAChC,gBAAuB,EAAE,sCAAsC;IAC/D,gBAAuB,UAAU,MAAY;WAEzB,OAAO,CACvB,GAAG,EAAE,GAAG,CAAC,WAAW,GAAG,SAAS,EAChC,QAAQ,EAAE,GAAG,CAAC,QAAQ,GAAG,SAAS,EAClC,SAAS,EAAE,YAAY,EACvB,SAAS,EAAE,SAAS,EACpB,SAAS,EAAE,SAAS,EACpB,QAAQ,EAAE,GAAG,CAAC,wBAAwB,GACvC,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,GAAG,IAAI,CAAC;CAsCpC"}

package/lib/features/source-definition.js

@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2022 TypeFox and others.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+ */
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+import API from '../utils/api.js';
+import { Position } from '../utils/typeConverters.js';
+import { toLocation, uriToPath } from '../protocol-translation.js';
+export class SourceDefinitionCommand {
+    static async execute(uri, position, documents, tspClient, lspClient, reporter) {
+        if (tspClient.apiVersion.lt(SourceDefinitionCommand.minVersion)) {
+            lspClient.showErrorMessage('Go to Source Definition failed. Requires TypeScript 4.7+.');
+            return;
+        }
+        if (!position || typeof position.character !== 'number' || typeof position.line !== 'number') {
+            lspClient.showErrorMessage('Go to Source Definition failed. Invalid position.');
+            return;
+        }
+        let file;
+        if (!uri || typeof uri !== 'string' || !(file = uriToPath(uri))) {
+            lspClient.showErrorMessage('Go to Source Definition failed. No resource provided.');
+            return;
+        }
+        const document = documents.get(file);
+        if (!document) {
+            lspClient.showErrorMessage('Go to Source Definition failed. File not opened in the editor.');
+            return;
+        }
+        const args = Position.toFileLocationRequestArgs(file, position);
+        return await lspClient.withProgress({
+            message: 'Finding source definitions…',
+            reporter,
+        }, async () => {
+            const response = await tspClient.request("findSourceDefinition" /* CommandTypes.FindSourceDefinition */, args);
+            if (response.type !== 'response' || !response.body) {
+                lspClient.showErrorMessage('No source definitions found.');
+                return;
+            }
+            return response.body.map(reference => toLocation(reference, documents));
+        });
+    }
+}
+SourceDefinitionCommand.id = '_typescript.goToSourceDefinition';
+SourceDefinitionCommand.minVersion = API.v470;
+//# sourceMappingURL=source-definition.js.map

package/lib/features/source-definition.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"source-definition.js","sourceRoot":"","sources":["../../src/features/source-definition.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH;;;gGAGgG;AAGhG,OAAO,GAAG,MAAM,iBAAiB,CAAC;AAClC,OAAO,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAMnE,MAAM,OAAO,uBAAuB;IAIzB,MAAM,CAAC,KAAK,CAAC,OAAO,CACvB,GAAgC,EAChC,QAAkC,EAClC,SAAuB,EACvB,SAAoB,EACpB,SAAoB,EACpB,QAAsC;QAEtC,IAAI,SAAS,CAAC,UAAU,CAAC,EAAE,CAAC,uBAAuB,CAAC,UAAU,CAAC,EAAE;YAC7D,SAAS,CAAC,gBAAgB,CAAC,2DAA2D,CAAC,CAAC;YACxF,OAAO;SACV;QAED,IAAI,CAAC,QAAQ,IAAI,OAAO,QAAQ,CAAC,SAAS,KAAK,QAAQ,IAAI,OAAO,QAAQ,CAAC,IAAI,KAAK,QAAQ,EAAE;YAC1F,SAAS,CAAC,gBAAgB,CAAC,mDAAmD,CAAC,CAAC;YAChF,OAAO;SACV;QAED,IAAI,IAAwB,CAAC;QAE7B,IAAI,CAAC,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,CAAC,CAAC,IAAI,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,EAAE;YAC7D,SAAS,CAAC,gBAAgB,CAAC,uDAAuD,CAAC,CAAC;YACpF,OAAO;SACV;QAED,MAAM,QAAQ,GAAG,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAErC,IAAI,CAAC,QAAQ,EAAE;YACX,SAAS,CAAC,gBAAgB,CAAC,gEAAgE,CAAC,CAAC;YAC7F,OAAO;SACV;QAED,MAAM,IAAI,GAAG,QAAQ,CAAC,yBAAyB,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QAChE,OAAO,MAAM,SAAS,CAAC,YAAY,CAAwB;YACvD,OAAO,EAAE,6BAA6B;YACtC,QAAQ;SACX,EAAE,KAAK,IAAI,EAAE;YACV,MAAM,QAAQ,GAAG,MAAM,SAAS,CAAC,OAAO,iEAAoC,IAAI,CAAC,CAAC;YAClF,IAAI,QAAQ,CAAC,IAAI,KAAK,UAAU,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE;gBAChD,SAAS,CAAC,gBAAgB,CAAC,8BAA8B,CAAC,CAAC;gBAC3D,OAAO;aACV;YACD,OAAO,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,UAAU,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC;QAC5E,CAAC,CAAC,CAAC;IACP,CAAC;;AA/CsB,0BAAE,GAAG,kCAAkC,CAAC;AACxC,kCAAU,GAAG,GAAG,CAAC,IAAI,CAAC"}