typescript-language-server 2.0.1 → 2.2.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +31 -0
- package/README.md +73 -6
- package/lib/calls.d.ts +1 -1
- package/lib/calls.d.ts.map +1 -1
- package/lib/calls.js +4 -3
- package/lib/calls.js.map +1 -1
- package/lib/cli.js +4 -8
- package/lib/cli.js.map +1 -1
- package/lib/commands.d.ts +1 -0
- package/lib/commands.d.ts.map +1 -1
- package/lib/commands.js +1 -0
- package/lib/commands.js.map +1 -1
- package/lib/completion.d.ts +4 -4
- package/lib/completion.d.ts.map +1 -1
- package/lib/completion.js +22 -22
- package/lib/completion.js.map +1 -1
- package/lib/configuration-manager.d.ts +12 -4
- package/lib/configuration-manager.d.ts.map +1 -1
- package/lib/configuration-manager.js +18 -5
- package/lib/configuration-manager.js.map +1 -1
- package/lib/diagnostic-queue.d.ts +1 -2
- package/lib/diagnostic-queue.d.ts.map +1 -1
- package/lib/diagnostic-queue.js.map +1 -1
- package/lib/document-symbol.d.ts +1 -1
- package/lib/document-symbol.d.ts.map +1 -1
- package/lib/document-symbol.js +2 -2
- package/lib/document-symbol.js.map +1 -1
- package/lib/document.d.ts +4 -1
- package/lib/document.d.ts.map +1 -1
- package/lib/document.js +9 -0
- package/lib/document.js.map +1 -1
- package/lib/features/fix-all.d.ts.map +1 -1
- package/lib/features/fix-all.js +8 -6
- package/lib/features/fix-all.js.map +1 -1
- package/lib/features/inlay-hints.d.ts.map +1 -1
- package/lib/features/inlay-hints.js +2 -1
- package/lib/features/inlay-hints.js.map +1 -1
- package/lib/features/source-definition.js +2 -1
- package/lib/features/source-definition.js.map +1 -1
- package/lib/hover.d.ts +3 -2
- package/lib/hover.d.ts.map +1 -1
- package/lib/hover.js +13 -15
- package/lib/hover.js.map +1 -1
- package/lib/lsp-connection.d.ts +2 -2
- package/lib/lsp-connection.d.ts.map +1 -1
- package/lib/lsp-connection.js +3 -2
- package/lib/lsp-connection.js.map +1 -1
- package/lib/lsp-protocol.inlayHints.proposed.d.ts +5 -5
- package/lib/lsp-protocol.inlayHints.proposed.d.ts.map +1 -1
- package/lib/lsp-server.d.ts +9 -5
- package/lib/lsp-server.d.ts.map +1 -1
- package/lib/lsp-server.js +121 -92
- package/lib/lsp-server.js.map +1 -1
- package/lib/lsp-server.spec.js +4 -4
- package/lib/lsp-server.spec.js.map +1 -1
- package/lib/organize-imports.d.ts +1 -1
- package/lib/organize-imports.d.ts.map +1 -1
- package/lib/organize-imports.js.map +1 -1
- package/lib/organize-imports.spec.js.map +1 -1
- package/lib/protocol-translation.d.ts +1 -10
- package/lib/protocol-translation.d.ts.map +1 -1
- package/lib/protocol-translation.js +4 -80
- package/lib/protocol-translation.js.map +1 -1
- package/lib/quickfix.d.ts +1 -1
- package/lib/quickfix.d.ts.map +1 -1
- package/lib/quickfix.js.map +1 -1
- package/lib/refactor.d.ts +1 -2
- package/lib/refactor.d.ts.map +1 -1
- package/lib/refactor.js.map +1 -1
- package/lib/test-utils.js +1 -1
- package/lib/test-utils.js.map +1 -1
- package/lib/ts-protocol.d.ts +43 -15
- package/lib/ts-protocol.d.ts.map +1 -1
- package/lib/ts-protocol.js +50 -13
- package/lib/ts-protocol.js.map +1 -1
- package/lib/tsServer/callbackMap.d.ts +1 -1
- package/lib/tsServer/callbackMap.d.ts.map +1 -1
- package/lib/tsServer/callbackMap.js.map +1 -1
- package/lib/tsServer/requestQueue.d.ts +1 -1
- package/lib/tsServer/requestQueue.d.ts.map +1 -1
- package/lib/tsServer/requests.d.ts +4 -3
- package/lib/tsServer/requests.d.ts.map +1 -1
- package/lib/tsServer/requests.js +2 -0
- package/lib/tsServer/requests.js.map +1 -1
- package/lib/tsServer/server.d.ts +9 -4
- package/lib/tsServer/server.d.ts.map +1 -1
- package/lib/tsServer/server.js +7 -0
- package/lib/tsServer/server.js.map +1 -1
- package/lib/tsServer/serverError.d.ts +1 -1
- package/lib/tsServer/serverError.d.ts.map +1 -1
- package/lib/tsServer/serverError.js +4 -4
- package/lib/tsServer/serverError.js.map +1 -1
- package/lib/tsServer/serverProcess.d.ts.map +1 -1
- package/lib/tsServer/serverProcess.js +8 -1
- package/lib/tsServer/serverProcess.js.map +1 -1
- package/lib/tsServer/tracer.d.ts +2 -2
- package/lib/tsServer/tracer.d.ts.map +1 -1
- package/lib/tsServer/versionProvider.d.ts +3 -7
- package/lib/tsServer/versionProvider.d.ts.map +1 -1
- package/lib/tsServer/versionProvider.js +19 -21
- package/lib/tsServer/versionProvider.js.map +1 -1
- package/lib/tsp-client.d.ts +2 -2
- package/lib/tsp-client.d.ts.map +1 -1
- package/lib/tsp-client.js +18 -13
- package/lib/tsp-client.js.map +1 -1
- package/lib/tsp-client.spec.js +12 -10
- package/lib/tsp-client.spec.js.map +1 -1
- package/lib/utils/MarkdownString.d.ts +15 -0
- package/lib/utils/MarkdownString.d.ts.map +1 -0
- package/lib/utils/MarkdownString.js +45 -0
- package/lib/utils/MarkdownString.js.map +1 -0
- package/lib/utils/SnippetString.js +4 -4
- package/lib/utils/SnippetString.js.map +1 -1
- package/lib/utils/api.d.ts +2 -0
- package/lib/utils/api.d.ts.map +1 -1
- package/lib/utils/api.js +17 -15
- package/lib/utils/api.js.map +1 -1
- package/lib/utils/configuration.d.ts +2 -1
- package/lib/utils/configuration.d.ts.map +1 -1
- package/lib/utils/configuration.js +4 -1
- package/lib/utils/configuration.js.map +1 -1
- package/lib/utils/logger.d.ts +1 -1
- package/lib/utils/logger.d.ts.map +1 -1
- package/lib/utils/previewer.d.ts +15 -0
- package/lib/utils/previewer.d.ts.map +1 -0
- package/lib/utils/previewer.js +185 -0
- package/lib/utils/previewer.js.map +1 -0
- package/lib/utils/previewer.spec.d.ts +2 -0
- package/lib/utils/previewer.spec.d.ts.map +1 -0
- package/lib/utils/previewer.spec.js +123 -0
- package/lib/utils/previewer.spec.js.map +1 -0
- package/lib/utils/tsconfig.d.ts +4 -0
- package/lib/utils/tsconfig.d.ts.map +1 -0
- package/lib/utils/tsconfig.js +41 -0
- package/lib/utils/tsconfig.js.map +1 -0
- package/lib/utils/typeConverters.d.ts +1 -1
- package/lib/utils/typeConverters.d.ts.map +1 -1
- package/package.json +16 -16
- package/lib/tsp-command-types.d.ts +0 -188
- package/lib/tsp-command-types.d.ts.map +0 -1
- package/lib/tsp-command-types.js +0 -99
- package/lib/tsp-command-types.js.map +0 -1
|
@@ -1,11 +1,13 @@
|
|
|
1
1
|
import deepmerge from 'deepmerge';
|
|
2
2
|
import path from 'node:path';
|
|
3
|
+
import { tsp } from './ts-protocol.js';
|
|
3
4
|
import API from './utils/api.js';
|
|
4
5
|
const DEFAULT_TSSERVER_PREFERENCES = {
|
|
5
6
|
allowIncompleteCompletions: true,
|
|
6
7
|
allowRenameOfImportPath: true,
|
|
7
8
|
allowTextChangesInNewFiles: true,
|
|
8
9
|
autoImportFileExcludePatterns: [],
|
|
10
|
+
disableLineTextInReferences: true,
|
|
9
11
|
disableSuggestions: false,
|
|
10
12
|
displayPartsForJSDoc: true,
|
|
11
13
|
generateReturnInDocTemplate: true,
|
|
@@ -34,20 +36,31 @@ const DEFAULT_TSSERVER_PREFERENCES = {
|
|
|
34
36
|
quotePreference: 'auto',
|
|
35
37
|
useLabelDetailsInCompletionEntries: true,
|
|
36
38
|
};
|
|
39
|
+
const DEFAULT_IMPLICIT_PROJECT_CONFIGURATION = {
|
|
40
|
+
checkJs: false,
|
|
41
|
+
experimentalDecorators: false,
|
|
42
|
+
module: tsp.ModuleKind.ESNext,
|
|
43
|
+
strictFunctionTypes: true,
|
|
44
|
+
strictNullChecks: true,
|
|
45
|
+
target: tsp.ScriptTarget.ES2020,
|
|
46
|
+
};
|
|
47
|
+
const DEFAULT_WORKSPACE_CONFIGURATION = {
|
|
48
|
+
implicitProjectConfiguration: DEFAULT_IMPLICIT_PROJECT_CONFIGURATION,
|
|
49
|
+
};
|
|
37
50
|
export class ConfigurationManager {
|
|
38
51
|
constructor(documents) {
|
|
39
52
|
this.documents = documents;
|
|
40
53
|
this.tsPreferences = deepmerge({}, DEFAULT_TSSERVER_PREFERENCES);
|
|
41
|
-
this.workspaceConfiguration = {};
|
|
54
|
+
this.workspaceConfiguration = deepmerge({}, DEFAULT_WORKSPACE_CONFIGURATION);
|
|
42
55
|
this.tspClient = null;
|
|
43
56
|
}
|
|
44
57
|
mergeTsPreferences(preferences) {
|
|
45
58
|
this.tsPreferences = deepmerge(this.tsPreferences, preferences);
|
|
46
59
|
}
|
|
47
60
|
setWorkspaceConfiguration(configuration) {
|
|
48
|
-
this.workspaceConfiguration = deepmerge(
|
|
61
|
+
this.workspaceConfiguration = deepmerge(DEFAULT_WORKSPACE_CONFIGURATION, configuration);
|
|
49
62
|
}
|
|
50
|
-
|
|
63
|
+
setAndConfigureTspClient(workspaceFolder, client, hostInfo) {
|
|
51
64
|
this.tspClient = client;
|
|
52
65
|
const formatOptions = {
|
|
53
66
|
// We can use \n here since the editor should normalize later on to its line endings.
|
|
@@ -61,14 +74,14 @@ export class ConfigurationManager {
|
|
|
61
74
|
autoImportFileExcludePatterns: this.getAutoImportFileExcludePatternsPreference(workspaceFolder),
|
|
62
75
|
},
|
|
63
76
|
};
|
|
64
|
-
|
|
77
|
+
client.executeWithoutWaitingForResponse(tsp.CommandTypes.Configure, args);
|
|
65
78
|
}
|
|
66
79
|
async configureGloballyFromDocument(filename, formattingOptions) {
|
|
67
80
|
const args = {
|
|
68
81
|
formatOptions: this.getFormattingOptions(filename, formattingOptions),
|
|
69
82
|
preferences: this.getPreferences(filename),
|
|
70
83
|
};
|
|
71
|
-
await this.tspClient?.request(
|
|
84
|
+
await this.tspClient?.request(tsp.CommandTypes.Configure, args);
|
|
72
85
|
}
|
|
73
86
|
getPreferences(filename) {
|
|
74
87
|
if (this.tspClient?.apiVersion.lt(API.v290)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configuration-manager.js","sourceRoot":"","sources":["../src/configuration-manager.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,WAAW,CAAC;AAClC,OAAO,IAAI,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"configuration-manager.js","sourceRoot":"","sources":["../src/configuration-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
|
-
import type tsp from 'typescript/lib/protocol.d.js';
|
|
2
1
|
import * as lsp from 'vscode-languageserver';
|
|
3
2
|
import { Logger } from './utils/logger.js';
|
|
4
|
-
import { EventTypes } from './
|
|
3
|
+
import type { tsp, EventTypes } from './ts-protocol.js';
|
|
5
4
|
import { LspDocuments } from './document.js';
|
|
6
5
|
import { SupportedFeatures } from './ts-protocol.js';
|
|
7
6
|
declare class FileDiagnostics {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"diagnostic-queue.d.ts","sourceRoot":"","sources":["../src/diagnostic-queue.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,GAAG,MAAM,
|
|
1
|
+
{"version":3,"file":"diagnostic-queue.d.ts","sourceRoot":"","sources":["../src/diagnostic-queue.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,GAAG,MAAM,uBAAuB,CAAC;AAE7C,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAE3C,OAAO,KAAK,EAAE,GAAG,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAErD,cAAM,eAAe;IAIb,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,MAAM;IAC9B,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,CAAC,MAAM,EAAE,GAAG,CAAC,wBAAwB,KAAK,IAAI;IACrF,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,YAAY;IAC1C,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,iBAAiB;IANlD,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAA2C;gBAGvD,GAAG,EAAE,MAAM,EACX,kBAAkB,EAAE,CAAC,MAAM,EAAE,GAAG,CAAC,wBAAwB,KAAK,IAAI,EAClE,SAAS,EAAE,YAAY,EACvB,QAAQ,EAAE,iBAAiB;IAGlD,MAAM,CAAC,IAAI,EAAE,UAAU,EAAE,WAAW,EAAE,GAAG,CAAC,UAAU,EAAE,GAAG,IAAI;IAI7D,SAAS,CAAC,QAAQ,CAAC,sBAAsB,sBAGlC;IAEA,cAAc,IAAI,GAAG,CAAC,UAAU,EAAE;CAS5C;AAED,qBAAa,oBAAoB;IAKzB,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,CAAC,MAAM,EAAE,GAAG,CAAC,wBAAwB,KAAK,IAAI;IACrF,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,YAAY;IAC1C,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,iBAAiB;IAC9C,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM;IAPrC,SAAS,CAAC,QAAQ,CAAC,WAAW,+BAAsC;IACpE,OAAO,CAAC,sBAAsB,CAA0B;gBAGjC,kBAAkB,EAAE,CAAC,MAAM,EAAE,GAAG,CAAC,wBAAwB,KAAK,IAAI,EAClE,SAAS,EAAE,YAAY,EACvB,QAAQ,EAAE,iBAAiB,EAC3B,MAAM,EAAE,MAAM;IAGrC,iBAAiB,CAAC,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,GAAG,CAAC,eAAe,GAAG,IAAI;IAkBrE,4BAA4B,CAAC,YAAY,EAAE,SAAS,MAAM,EAAE,GAAG,IAAI;IAI5D,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,GAAG,CAAC,UAAU,EAAE;IAK5D,OAAO,CAAC,mBAAmB;CAG9B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"diagnostic-queue.js","sourceRoot":"","sources":["../src/diagnostic-queue.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;
|
|
1
|
+
{"version":3,"file":"diagnostic-queue.js","sourceRoot":"","sources":["../src/diagnostic-queue.ts"],"names":[],"mappings":"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"}
|
package/lib/document-symbol.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import * as lsp from 'vscode-languageserver';
|
|
2
|
-
import
|
|
2
|
+
import { tsp } from './ts-protocol.js';
|
|
3
3
|
export declare function collectDocumentSymbols(parent: tsp.NavigationTree, symbols: lsp.DocumentSymbol[]): boolean;
|
|
4
4
|
export declare function collectSymbolInformation(uri: string, current: tsp.NavigationTree, symbols: lsp.SymbolInformation[], containerName?: string): boolean;
|
|
5
5
|
export declare function shouldIncludeEntry(item: tsp.NavigationTree | tsp.NavigationBarItem): boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"document-symbol.d.ts","sourceRoot":"","sources":["../src/document-symbol.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,GAAG,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"document-symbol.d.ts","sourceRoot":"","sources":["../src/document-symbol.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,GAAG,MAAM,uBAAuB,CAAC;AAE7C,OAAO,EAAS,GAAG,EAAE,MAAM,kBAAkB,CAAC;AAG9C,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,GAAG,CAAC,cAAc,EAAE,OAAO,EAAE,GAAG,CAAC,cAAc,EAAE,GAAG,OAAO,CAEzG;AA2CD,wBAAgB,wBAAwB,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,CAAC,cAAc,EAAE,OAAO,EAAE,GAAG,CAAC,iBAAiB,EAAE,EAAE,aAAa,CAAC,EAAE,MAAM,GAAG,OAAO,CA6BpJ;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,GAAG,CAAC,cAAc,GAAG,GAAG,CAAC,iBAAiB,GAAG,OAAO,CAK5F"}
|
package/lib/document-symbol.js
CHANGED
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
* You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
|
|
6
6
|
*/
|
|
7
7
|
import { toSymbolKind } from './protocol-translation.js';
|
|
8
|
-
import {
|
|
8
|
+
import { tslib } from './ts-protocol.js';
|
|
9
9
|
import { Range } from './utils/typeConverters.js';
|
|
10
10
|
export function collectDocumentSymbols(parent, symbols) {
|
|
11
11
|
return collectDocumentSymbolsInRange(parent, symbols, { start: Range.fromTextSpan(parent.spans[0]).start, end: Range.fromTextSpan(parent.spans[parent.spans.length - 1]).end });
|
|
@@ -77,7 +77,7 @@ export function collectSymbolInformation(uri, current, symbols, containerName) {
|
|
|
77
77
|
return shouldInclude;
|
|
78
78
|
}
|
|
79
79
|
export function shouldIncludeEntry(item) {
|
|
80
|
-
if (item.kind === ScriptElementKind.alias) {
|
|
80
|
+
if (item.kind === tslib.ScriptElementKind.alias) {
|
|
81
81
|
return false;
|
|
82
82
|
}
|
|
83
83
|
return !!(item.text && item.text !== '<function>' && item.text !== '<class>');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"document-symbol.js","sourceRoot":"","sources":["../src/document-symbol.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;
|
|
1
|
+
{"version":3,"file":"document-symbol.js","sourceRoot":"","sources":["../src/document-symbol.ts"],"names":[],"mappings":"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"}
|
package/lib/document.d.ts
CHANGED
|
@@ -1,5 +1,7 @@
|
|
|
1
|
+
import vscodeUri from 'vscode-uri';
|
|
1
2
|
import * as lsp from 'vscode-languageserver';
|
|
2
3
|
import { TextDocument } from 'vscode-languageserver-textdocument';
|
|
4
|
+
import { IFilePathToResourceConverter } from './utils/previewer.js';
|
|
3
5
|
export declare class LspDocument implements TextDocument {
|
|
4
6
|
protected document: TextDocument;
|
|
5
7
|
constructor(doc: lsp.TextDocumentItem);
|
|
@@ -17,7 +19,7 @@ export declare class LspDocument implements TextDocument {
|
|
|
17
19
|
getLineStart(line: number): lsp.Position;
|
|
18
20
|
applyEdit(version: number, change: lsp.TextDocumentContentChangeEvent): void;
|
|
19
21
|
}
|
|
20
|
-
export declare class LspDocuments {
|
|
22
|
+
export declare class LspDocuments implements IFilePathToResourceConverter {
|
|
21
23
|
private readonly _files;
|
|
22
24
|
private readonly documents;
|
|
23
25
|
/**
|
|
@@ -27,5 +29,6 @@ export declare class LspDocuments {
|
|
|
27
29
|
get(file: string): LspDocument | undefined;
|
|
28
30
|
open(file: string, doc: lsp.TextDocumentItem): boolean;
|
|
29
31
|
close(file: string): LspDocument | undefined;
|
|
32
|
+
toResource(filepath: string): vscodeUri.URI;
|
|
30
33
|
}
|
|
31
34
|
//# sourceMappingURL=document.d.ts.map
|
package/lib/document.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"document.d.ts","sourceRoot":"","sources":["../src/document.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,GAAG,MAAM,uBAAuB,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;
|
|
1
|
+
{"version":3,"file":"document.d.ts","sourceRoot":"","sources":["../src/document.ts"],"names":[],"mappings":"AAOA,OAAO,SAAS,MAAM,YAAY,CAAC;AACnC,OAAO,KAAK,GAAG,MAAM,uBAAuB,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAClE,OAAO,EAAE,4BAA4B,EAAE,MAAM,sBAAsB,CAAC;AAEpE,qBAAa,WAAY,YAAW,YAAY;IAC5C,SAAS,CAAC,QAAQ,EAAE,YAAY,CAAC;gBAErB,GAAG,EAAE,GAAG,CAAC,gBAAgB;IAKrC,IAAI,GAAG,IAAI,MAAM,CAEhB;IAED,IAAI,UAAU,IAAI,MAAM,CAEvB;IAED,IAAI,OAAO,IAAI,MAAM,CAEpB;IAED,OAAO,CAAC,KAAK,CAAC,EAAE,GAAG,CAAC,KAAK,GAAG,MAAM;IAIlC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,GAAG,CAAC,QAAQ;IAIxC,QAAQ,CAAC,QAAQ,EAAE,GAAG,CAAC,QAAQ,GAAG,MAAM;IAIxC,IAAI,SAAS,IAAI,MAAM,CAEtB;IAED,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAK7B,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,GAAG,CAAC,KAAK;IAMrC,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,GAAG,CAAC,QAAQ;IAKtC,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAKnC,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,GAAG,CAAC,QAAQ;IAIxC,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,CAAC,8BAA8B,GAAG,IAAI;CAU/E;AAED,qBAAa,YAAa,YAAW,4BAA4B;IAC7D,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAgB;IACvC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAkC;IAE5D;;OAEG;IACH,IAAI,KAAK,IAAI,MAAM,EAAE,CAEpB;IAED,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,WAAW,GAAG,SAAS;IAY1C,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC,gBAAgB,GAAG,OAAO;IAStD,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,WAAW,GAAG,SAAS;IAYrC,UAAU,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC,GAAG;CAOrD"}
|
package/lib/document.js
CHANGED
|
@@ -4,6 +4,7 @@
|
|
|
4
4
|
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License.
|
|
5
5
|
* You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
|
|
6
6
|
*/
|
|
7
|
+
import vscodeUri from 'vscode-uri';
|
|
7
8
|
import * as lsp from 'vscode-languageserver';
|
|
8
9
|
import { TextDocument } from 'vscode-languageserver-textdocument';
|
|
9
10
|
export class LspDocument {
|
|
@@ -102,5 +103,13 @@ export class LspDocuments {
|
|
|
102
103
|
this._files.splice(this._files.indexOf(file), 1);
|
|
103
104
|
return document;
|
|
104
105
|
}
|
|
106
|
+
/* IFilePathToResourceConverter implementation */
|
|
107
|
+
toResource(filepath) {
|
|
108
|
+
const document = this.documents.get(filepath);
|
|
109
|
+
if (document) {
|
|
110
|
+
return vscodeUri.URI.parse(document.uri);
|
|
111
|
+
}
|
|
112
|
+
return vscodeUri.URI.file(filepath);
|
|
113
|
+
}
|
|
105
114
|
}
|
|
106
115
|
//# sourceMappingURL=document.js.map
|
package/lib/document.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"document.js","sourceRoot":"","sources":["../src/document.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,GAAG,MAAM,uBAAuB,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;
|
|
1
|
+
{"version":3,"file":"document.js","sourceRoot":"","sources":["../src/document.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fix-all.d.ts","sourceRoot":"","sources":["../../src/features/fix-all.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"fix-all.d.ts","sourceRoot":"","sources":["../../src/features/fix-all.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,GAAG,MAAM,uBAAuB,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAG9C,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAG7C,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAgLnD,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
CHANGED
|
@@ -4,10 +4,12 @@
|
|
|
4
4
|
*--------------------------------------------------------------------------------------------*/
|
|
5
5
|
import * as lsp from 'vscode-languageserver';
|
|
6
6
|
import { toTextDocumentEdit } from '../protocol-translation.js';
|
|
7
|
+
import { tsp } from '../ts-protocol.js';
|
|
7
8
|
import * as errorCodes from '../utils/errorCodes.js';
|
|
8
9
|
import * as fixNames from '../utils/fixNames.js';
|
|
9
10
|
import { CodeActionKind } from '../utils/types.js';
|
|
10
11
|
import { Range } from '../utils/typeConverters.js';
|
|
12
|
+
var CommandTypes = tsp.CommandTypes;
|
|
11
13
|
async function buildIndividualFixes(fixes, client, file, documents, diagnostics) {
|
|
12
14
|
const edits = [];
|
|
13
15
|
for (const diagnostic of diagnostics) {
|
|
@@ -19,7 +21,7 @@ async function buildIndividualFixes(fixes, client, file, documents, diagnostics)
|
|
|
19
21
|
...Range.toFileRangeRequestArgs(file, diagnostic.range),
|
|
20
22
|
errorCodes: [+diagnostic.code],
|
|
21
23
|
};
|
|
22
|
-
const response = await client.request(
|
|
24
|
+
const response = await client.request(CommandTypes.GetCodeFixes, args);
|
|
23
25
|
if (response.type !== 'response') {
|
|
24
26
|
continue;
|
|
25
27
|
}
|
|
@@ -43,7 +45,7 @@ async function buildCombinedFix(fixes, client, file, documents, diagnostics) {
|
|
|
43
45
|
...Range.toFileRangeRequestArgs(file, diagnostic.range),
|
|
44
46
|
errorCodes: [+diagnostic.code],
|
|
45
47
|
};
|
|
46
|
-
const response = await client.request(
|
|
48
|
+
const response = await client.request(CommandTypes.GetCodeFixes, args);
|
|
47
49
|
if (response.type !== 'response' || !response.body?.length) {
|
|
48
50
|
continue;
|
|
49
51
|
}
|
|
@@ -62,7 +64,7 @@ async function buildCombinedFix(fixes, client, file, documents, diagnostics) {
|
|
|
62
64
|
},
|
|
63
65
|
fixId: fix.fixId,
|
|
64
66
|
};
|
|
65
|
-
const combinedResponse = await client.request(
|
|
67
|
+
const combinedResponse = await client.request(CommandTypes.GetCombinedCodeFix, combinedArgs);
|
|
66
68
|
if (combinedResponse.type !== 'response' || !combinedResponse.body) {
|
|
67
69
|
return edits;
|
|
68
70
|
}
|
|
@@ -130,12 +132,12 @@ class SourceAddMissingImports extends SourceAction {
|
|
|
130
132
|
SourceAddMissingImports.kind = CodeActionKind.SourceAddMissingImportsTs;
|
|
131
133
|
//#endregion
|
|
132
134
|
export class TypeScriptAutoFixProvider {
|
|
133
|
-
constructor(client) {
|
|
134
|
-
this.client = client;
|
|
135
|
-
}
|
|
136
135
|
static get kinds() {
|
|
137
136
|
return TypeScriptAutoFixProvider.kindProviders.map(provider => provider.kind);
|
|
138
137
|
}
|
|
138
|
+
constructor(client) {
|
|
139
|
+
this.client = client;
|
|
140
|
+
}
|
|
139
141
|
async provideCodeActions(kinds, file, diagnostics, documents) {
|
|
140
142
|
const results = [];
|
|
141
143
|
for (const provider of TypeScriptAutoFixProvider.kindProviders) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fix-all.js","sourceRoot":"","sources":["../../src/features/fix-all.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;
|
|
1
|
+
{"version":3,"file":"fix-all.js","sourceRoot":"","sources":["../../src/features/fix-all.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inlay-hints.d.ts","sourceRoot":"","sources":["../../src/features/inlay-hints.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"inlay-hints.d.ts","sourceRoot":"","sources":["../../src/features/inlay-hints.ts"],"names":[],"mappings":"AAWA,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;AAEnD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAIlD,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"}
|
|
@@ -10,6 +10,7 @@
|
|
|
10
10
|
*--------------------------------------------------------------------------------------------*/
|
|
11
11
|
import * as lsp from 'vscode-languageserver';
|
|
12
12
|
import API from '../utils/api.js';
|
|
13
|
+
import { tsp } from '../ts-protocol.js';
|
|
13
14
|
import { Position } from '../utils/typeConverters.js';
|
|
14
15
|
import { uriToPath } from '../protocol-translation.js';
|
|
15
16
|
export class TypeScriptInlayHintsProvider {
|
|
@@ -34,7 +35,7 @@ export class TypeScriptInlayHintsProvider {
|
|
|
34
35
|
await configurationManager.configureGloballyFromDocument(file);
|
|
35
36
|
const start = document.offsetAt(range.start);
|
|
36
37
|
const length = document.offsetAt(range.end) - start;
|
|
37
|
-
const response = await tspClient.request(
|
|
38
|
+
const response = await tspClient.request(tsp.CommandTypes.ProvideInlayHints, { file, start, length });
|
|
38
39
|
if (response.type !== 'response' || !response.success || !response.body) {
|
|
39
40
|
return [];
|
|
40
41
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inlay-hints.js","sourceRoot":"","sources":["../../src/features/inlay-hints.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH;;;gGAGgG;
|
|
1
|
+
{"version":3,"file":"inlay-hints.js","sourceRoot":"","sources":["../../src/features/inlay-hints.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,6 +11,7 @@
|
|
|
11
11
|
import API from '../utils/api.js';
|
|
12
12
|
import { Position } from '../utils/typeConverters.js';
|
|
13
13
|
import { toLocation, uriToPath } from '../protocol-translation.js';
|
|
14
|
+
import { tsp } from '../ts-protocol.js';
|
|
14
15
|
export class SourceDefinitionCommand {
|
|
15
16
|
static async execute(uri, position, documents, tspClient, lspClient, reporter) {
|
|
16
17
|
if (tspClient.apiVersion.lt(SourceDefinitionCommand.minVersion)) {
|
|
@@ -36,7 +37,7 @@ export class SourceDefinitionCommand {
|
|
|
36
37
|
message: 'Finding source definitions…',
|
|
37
38
|
reporter,
|
|
38
39
|
}, async () => {
|
|
39
|
-
const response = await tspClient.request(
|
|
40
|
+
const response = await tspClient.request(tsp.CommandTypes.FindSourceDefinition, args);
|
|
40
41
|
if (response.type !== 'response' || !response.body) {
|
|
41
42
|
lspClient.showErrorMessage('No source definitions found.');
|
|
42
43
|
return;
|
|
@@ -1 +1 @@
|
|
|
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;
|
|
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;AAInE,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAExC,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,CAAC,GAAG,CAAC,YAAY,CAAC,oBAAoB,EAAE,IAAI,CAAC,CAAC;YACtF,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"}
|
package/lib/hover.d.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import * as lsp from 'vscode-languageserver';
|
|
2
|
-
import type tsp from '
|
|
3
|
-
|
|
2
|
+
import type { tsp } from './ts-protocol.js';
|
|
3
|
+
import { IFilePathToResourceConverter } from './utils/previewer.js';
|
|
4
|
+
export declare function asSignatureHelp(info: tsp.SignatureHelpItems, context: lsp.SignatureHelpContext | undefined, filePathConverter: IFilePathToResourceConverter): lsp.SignatureHelp;
|
|
4
5
|
export declare function toTsTriggerReason(context: lsp.SignatureHelpContext): tsp.SignatureHelpTriggerReason;
|
|
5
6
|
//# sourceMappingURL=hover.d.ts.map
|
package/lib/hover.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hover.d.ts","sourceRoot":"","sources":["../src/hover.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,GAAG,MAAM,uBAAuB,CAAC;AAC7C,OAAO,KAAK,GAAG,MAAM,
|
|
1
|
+
{"version":3,"file":"hover.d.ts","sourceRoot":"","sources":["../src/hover.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,GAAG,MAAM,uBAAuB,CAAC;AAC7C,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAC;AAE5C,OAAO,EAAE,4BAA4B,EAAE,MAAM,sBAAsB,CAAC;AAEpE,wBAAgB,eAAe,CAC3B,IAAI,EAAE,GAAG,CAAC,kBAAkB,EAC5B,OAAO,EAAE,GAAG,CAAC,oBAAoB,GAAG,SAAS,EAC7C,iBAAiB,EAAE,4BAA4B,GAChD,GAAG,CAAC,aAAa,CAOnB;AA6CD,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,GAAG,CAAC,oBAAoB,GAAG,GAAG,CAAC,0BAA0B,CAkBnG"}
|
package/lib/hover.js
CHANGED
|
@@ -9,9 +9,9 @@
|
|
|
9
9
|
* Licensed under the MIT License. See License.txt in the project root for license information.
|
|
10
10
|
*--------------------------------------------------------------------------------------------*/
|
|
11
11
|
import * as lsp from 'vscode-languageserver';
|
|
12
|
-
import
|
|
13
|
-
export function asSignatureHelp(info, context) {
|
|
14
|
-
const signatures = info.items.map(asSignatureInformation);
|
|
12
|
+
import * as Previewer from './utils/previewer.js';
|
|
13
|
+
export function asSignatureHelp(info, context, filePathConverter) {
|
|
14
|
+
const signatures = info.items.map(item => asSignatureInformation(item, filePathConverter));
|
|
15
15
|
return {
|
|
16
16
|
activeSignature: getActiveSignature(info, signatures, context),
|
|
17
17
|
activeParameter: getActiveParameter(info),
|
|
@@ -38,24 +38,22 @@ function getActiveParameter(info) {
|
|
|
38
38
|
}
|
|
39
39
|
return info.argumentIndex;
|
|
40
40
|
}
|
|
41
|
-
function asSignatureInformation(item) {
|
|
42
|
-
const parameters = item.parameters.map(asParameterInformation);
|
|
41
|
+
function asSignatureInformation(item, filePathConverter) {
|
|
42
|
+
const parameters = item.parameters.map(parameter => asParameterInformation(parameter, filePathConverter));
|
|
43
43
|
const signature = {
|
|
44
|
-
label:
|
|
45
|
-
documentation:
|
|
46
|
-
documentation: item.documentation,
|
|
47
|
-
tags: item.tags.filter(x => x.name !== 'param'),
|
|
48
|
-
}),
|
|
44
|
+
label: Previewer.plainWithLinks(item.prefixDisplayParts, filePathConverter),
|
|
45
|
+
documentation: Previewer.markdownDocumentation(item.documentation, item.tags.filter(x => x.name !== 'param'), filePathConverter),
|
|
49
46
|
parameters,
|
|
50
47
|
};
|
|
51
|
-
signature.label += parameters.map(parameter => parameter.label).join(
|
|
52
|
-
signature.label +=
|
|
48
|
+
signature.label += parameters.map(parameter => parameter.label).join(Previewer.plainWithLinks(item.separatorDisplayParts, filePathConverter));
|
|
49
|
+
signature.label += Previewer.plainWithLinks(item.suffixDisplayParts, filePathConverter);
|
|
53
50
|
return signature;
|
|
54
51
|
}
|
|
55
|
-
function asParameterInformation(parameter) {
|
|
52
|
+
function asParameterInformation(parameter, filePathConverter) {
|
|
53
|
+
const { displayParts, documentation } = parameter;
|
|
56
54
|
return {
|
|
57
|
-
label:
|
|
58
|
-
documentation:
|
|
55
|
+
label: Previewer.plainWithLinks(displayParts, filePathConverter),
|
|
56
|
+
documentation: Previewer.markdownDocumentation(documentation, undefined, filePathConverter),
|
|
59
57
|
};
|
|
60
58
|
}
|
|
61
59
|
export function toTsTriggerReason(context) {
|
package/lib/hover.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hover.js","sourceRoot":"","sources":["../src/hover.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH;;;gGAGgG;AAEhG,OAAO,KAAK,GAAG,MAAM,uBAAuB,CAAC;AAE7C,OAAO,
|
|
1
|
+
{"version":3,"file":"hover.js","sourceRoot":"","sources":["../src/hover.ts"],"names":[],"mappings":"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"}
|
package/lib/lsp-connection.d.ts
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import lsp from 'vscode-languageserver/node.js';
|
|
2
2
|
import type { TsServerLogLevel } from './utils/configuration.js';
|
|
3
3
|
export interface LspConnectionOptions {
|
|
4
|
-
|
|
5
|
-
|
|
4
|
+
cmdLineTsserverPath: string;
|
|
5
|
+
cmdLineTsserverLogVerbosity: TsServerLogLevel;
|
|
6
6
|
showMessageLevel: lsp.MessageType;
|
|
7
7
|
}
|
|
8
8
|
export declare function createLspConnection(options: LspConnectionOptions): lsp.Connection;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lsp-connection.d.ts","sourceRoot":"","sources":["../src/lsp-connection.ts"],"names":[],"mappings":"AAOA,OAAO,GAAG,MAAM,+BAA+B,CAAC;AAMhD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAEjE,MAAM,WAAW,oBAAoB;IACjC,
|
|
1
|
+
{"version":3,"file":"lsp-connection.d.ts","sourceRoot":"","sources":["../src/lsp-connection.ts"],"names":[],"mappings":"AAOA,OAAO,GAAG,MAAM,+BAA+B,CAAC;AAMhD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAEjE,MAAM,WAAW,oBAAoB;IACjC,mBAAmB,EAAE,MAAM,CAAC;IAC5B,2BAA2B,EAAE,gBAAgB,CAAC;IAC9C,gBAAgB,EAAE,GAAG,CAAC,WAAW,CAAC;CACrC;AAED,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,oBAAoB,GAAG,GAAG,CAAC,UAAU,CAgDjF"}
|
package/lib/lsp-connection.js
CHANGED
|
@@ -17,8 +17,8 @@ export function createLspConnection(options) {
|
|
|
17
17
|
const server = new LspServer({
|
|
18
18
|
logger,
|
|
19
19
|
lspClient,
|
|
20
|
-
tsserverPath: options.
|
|
21
|
-
tsserverLogVerbosity: options.
|
|
20
|
+
tsserverPath: options.cmdLineTsserverPath,
|
|
21
|
+
tsserverLogVerbosity: options.cmdLineTsserverLogVerbosity,
|
|
22
22
|
});
|
|
23
23
|
connection.onInitialize(server.initialize.bind(server));
|
|
24
24
|
connection.onDidChangeConfiguration(server.didChangeConfiguration.bind(server));
|
|
@@ -40,6 +40,7 @@ export function createLspConnection(options) {
|
|
|
40
40
|
connection.onHover(server.hover.bind(server));
|
|
41
41
|
connection.onReferences(server.references.bind(server));
|
|
42
42
|
connection.onRenameRequest(server.rename.bind(server));
|
|
43
|
+
connection.onPrepareRename(server.prepareRename.bind(server));
|
|
43
44
|
connection.onSignatureHelp(server.signatureHelp.bind(server));
|
|
44
45
|
connection.onWorkspaceSymbol(server.workspaceSymbol.bind(server));
|
|
45
46
|
connection.onFoldingRanges(server.foldingRanges.bind(server));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lsp-connection.js","sourceRoot":"","sources":["../src/lsp-connection.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,GAAG,MAAM,+BAA+B,CAAC;AAChD,OAAO,KAAK,QAAQ,MAAM,kCAAkC,CAAC;AAC7D,OAAO,KAAK,aAAa,MAAM,uCAAuC,CAAC;AACvE,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAShD,MAAM,UAAU,mBAAmB,CAAC,OAA6B;IAC7D,MAAM,UAAU,GAAG,GAAG,CAAC,gBAAgB,CAAC,GAAG,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC;IAClE,MAAM,SAAS,GAAG,IAAI,aAAa,CAAC,UAAU,CAAC,CAAC;IAChD,MAAM,MAAM,GAAG,IAAI,eAAe,CAAC,SAAS,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAC;IACxE,MAAM,MAAM,GAAc,IAAI,SAAS,CAAC;QACpC,MAAM;QACN,SAAS;QACT,YAAY,EAAE,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"lsp-connection.js","sourceRoot":"","sources":["../src/lsp-connection.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import * as lsp from 'vscode-languageserver';
|
|
2
|
-
import type tsp from 'typescript/lib/protocol.d.js';
|
|
3
2
|
import { RequestHandler } from 'vscode-jsonrpc';
|
|
4
|
-
|
|
3
|
+
import type { tsp } from './ts-protocol.js';
|
|
4
|
+
export type InlayHintsParams = {
|
|
5
5
|
/**
|
|
6
6
|
* The document to format.
|
|
7
7
|
*/
|
|
@@ -11,17 +11,17 @@ export declare type InlayHintsParams = {
|
|
|
11
11
|
*/
|
|
12
12
|
range?: lsp.Range;
|
|
13
13
|
};
|
|
14
|
-
|
|
14
|
+
type InlayHint = {
|
|
15
15
|
text: string;
|
|
16
16
|
position: lsp.Position;
|
|
17
17
|
kind: tsp.InlayHintKind;
|
|
18
18
|
whitespaceBefore?: boolean;
|
|
19
19
|
whitespaceAfter?: boolean;
|
|
20
20
|
};
|
|
21
|
-
export
|
|
21
|
+
export type InlayHintsResult = {
|
|
22
22
|
inlayHints: InlayHint[];
|
|
23
23
|
};
|
|
24
24
|
export declare const type: lsp.RequestType<InlayHintsParams, InlayHintsResult, lsp.TextDocumentRegistrationOptions>;
|
|
25
|
-
export
|
|
25
|
+
export type HandlerSignature = RequestHandler<InlayHintsParams, InlayHintsResult | null, void>;
|
|
26
26
|
export {};
|
|
27
27
|
//# sourceMappingURL=lsp-protocol.inlayHints.proposed.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lsp-protocol.inlayHints.proposed.d.ts","sourceRoot":"","sources":["../src/lsp-protocol.inlayHints.proposed.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,uBAAuB,CAAC;AAC7C,OAAO,
|
|
1
|
+
{"version":3,"file":"lsp-protocol.inlayHints.proposed.d.ts","sourceRoot":"","sources":["../src/lsp-protocol.inlayHints.proposed.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,uBAAuB,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAC;AAE5C,MAAM,MAAM,gBAAgB,GAAG;IAC3B;;OAEG;IACH,YAAY,EAAE,GAAG,CAAC,sBAAsB,CAAC;IACzC;;OAEG;IACH,KAAK,CAAC,EAAE,GAAG,CAAC,KAAK,CAAC;CACrB,CAAC;AAEF,KAAK,SAAS,GAAG;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,GAAG,CAAC,QAAQ,CAAC;IACvB,IAAI,EAAE,GAAG,CAAC,aAAa,CAAC;IACxB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,eAAe,CAAC,EAAE,OAAO,CAAC;CAC7B,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC3B,UAAU,EAAE,SAAS,EAAE,CAAC;CAC3B,CAAC;AAEF,eAAO,MAAM,IAAI,0FAAwH,CAAC;AAE1I,MAAM,MAAM,gBAAgB,GAAG,cAAc,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,IAAI,EAAE,IAAI,CAAC,CAAC"}
|