typescript-language-server 1.0.0 → 1.1.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 +17 -0
- package/README.md +128 -21
- package/lib/calls.d.ts +1 -1
- package/lib/calls.d.ts.map +1 -1
- package/lib/calls.js +140 -164
- package/lib/calls.js.map +1 -1
- package/lib/cli.js +1 -1
- package/lib/commands.d.ts +1 -0
- package/lib/commands.d.ts.map +1 -1
- package/lib/commands.js +3 -1
- package/lib/commands.js.map +1 -1
- package/lib/completion.d.ts +4 -7
- package/lib/completion.d.ts.map +1 -1
- package/lib/completion.js +64 -66
- package/lib/completion.js.map +1 -1
- package/lib/configuration-manager.d.ts +47 -0
- package/lib/configuration-manager.d.ts.map +1 -0
- package/lib/configuration-manager.js +105 -0
- package/lib/configuration-manager.js.map +1 -0
- package/lib/diagnostic-queue.d.ts +5 -4
- package/lib/diagnostic-queue.d.ts.map +1 -1
- package/lib/diagnostic-queue.js +7 -8
- package/lib/diagnostic-queue.js.map +1 -1
- package/lib/document-symbol.d.ts.map +1 -1
- package/lib/document-symbol.js +11 -10
- package/lib/document-symbol.js.map +1 -1
- package/lib/features/fix-all.d.ts.map +1 -1
- package/lib/features/fix-all.js +96 -112
- package/lib/features/fix-all.js.map +1 -1
- package/lib/features/inlay-hints.d.ts +11 -0
- package/lib/features/inlay-hints.d.ts.map +1 -0
- package/lib/features/inlay-hints.js +70 -0
- package/lib/features/inlay-hints.js.map +1 -0
- package/lib/features/source-definition.d.ts +11 -0
- package/lib/features/source-definition.d.ts.map +1 -0
- package/lib/features/source-definition.js +50 -0
- package/lib/features/source-definition.js.map +1 -0
- package/lib/file-lsp-server.spec.js +16 -25
- package/lib/file-lsp-server.spec.js.map +1 -1
- package/lib/hover.d.ts +2 -1
- package/lib/hover.d.ts.map +1 -1
- package/lib/hover.js +47 -7
- package/lib/hover.js.map +1 -1
- package/lib/logger.js +1 -1
- package/lib/logger.js.map +1 -1
- package/lib/lsp-client.d.ts +11 -15
- package/lib/lsp-client.d.ts.map +1 -1
- package/lib/lsp-client.js +29 -61
- package/lib/lsp-client.js.map +1 -1
- 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 +0 -9
- package/lib/lsp-protocol.inlayHints.proposed.d.ts.map +1 -1
- package/lib/lsp-server.d.ts +15 -20
- package/lib/lsp-server.d.ts.map +1 -1
- package/lib/lsp-server.js +806 -901
- package/lib/lsp-server.js.map +1 -1
- package/lib/lsp-server.spec.js +772 -495
- package/lib/lsp-server.spec.js.map +1 -1
- package/lib/organize-imports.spec.js +8 -8
- package/lib/protocol-translation.d.ts +2 -7
- package/lib/protocol-translation.d.ts.map +1 -1
- package/lib/protocol-translation.js +19 -106
- package/lib/protocol-translation.js.map +1 -1
- package/lib/quickfix.js +1 -1
- package/lib/refactor.js +5 -1
- package/lib/refactor.js.map +1 -1
- package/lib/test-utils.d.ts +4 -3
- package/lib/test-utils.d.ts.map +1 -1
- package/lib/test-utils.js +103 -77
- package/lib/test-utils.js.map +1 -1
- package/lib/ts-protocol.d.ts +4 -19
- package/lib/ts-protocol.d.ts.map +1 -1
- package/lib/ts-protocol.js.map +1 -1
- package/lib/tsp-client.d.ts +36 -32
- package/lib/tsp-client.d.ts.map +1 -1
- package/lib/tsp-client.js +9 -7
- package/lib/tsp-client.js.map +1 -1
- package/lib/tsp-client.spec.js +26 -33
- package/lib/tsp-client.spec.js.map +1 -1
- package/lib/tsp-command-types.d.ts +1 -0
- package/lib/tsp-command-types.d.ts.map +1 -1
- package/lib/tsp-command-types.js +1 -1
- package/lib/tsp-command-types.js.map +1 -1
- package/lib/utils/typeConverters.d.ts +19 -1
- package/lib/utils/typeConverters.d.ts.map +1 -1
- package/lib/utils/typeConverters.js +103 -4
- package/lib/utils/typeConverters.js.map +1 -1
- package/lib/utils/versionProvider.js +17 -19
- package/lib/utils/versionProvider.js.map +1 -1
- package/lib/utils.d.ts.map +1 -1
- package/lib/utils.js +2 -0
- package/lib/utils.js.map +1 -1
- package/package.json +10 -7
|
@@ -4,25 +4,16 @@
|
|
|
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
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
8
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
9
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
10
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
11
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
12
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
13
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
14
|
-
});
|
|
15
|
-
};
|
|
16
7
|
import chai from 'chai';
|
|
17
8
|
import { uri, createServer, lastPosition, filePath, readContents, positionAfter } from './test-utils.js';
|
|
18
9
|
const assert = chai.assert;
|
|
19
10
|
let server;
|
|
20
|
-
before(() =>
|
|
21
|
-
server =
|
|
11
|
+
before(async () => {
|
|
12
|
+
server = await createServer({
|
|
22
13
|
rootUri: uri(),
|
|
23
|
-
publishDiagnostics: () => { }
|
|
14
|
+
publishDiagnostics: () => { },
|
|
24
15
|
});
|
|
25
|
-
})
|
|
16
|
+
});
|
|
26
17
|
beforeEach(() => {
|
|
27
18
|
server.closeAll();
|
|
28
19
|
});
|
|
@@ -31,43 +22,43 @@ after(() => {
|
|
|
31
22
|
server.shutdown();
|
|
32
23
|
});
|
|
33
24
|
describe('documentHighlight', () => {
|
|
34
|
-
it('simple test', () =>
|
|
25
|
+
it('simple test', async () => {
|
|
35
26
|
const doc = {
|
|
36
27
|
uri: uri('module2.ts'),
|
|
37
28
|
languageId: 'typescript',
|
|
38
29
|
version: 1,
|
|
39
|
-
text: readContents(filePath('module2.ts'))
|
|
30
|
+
text: readContents(filePath('module2.ts')),
|
|
40
31
|
};
|
|
41
32
|
server.didOpenTextDocument({
|
|
42
|
-
textDocument: doc
|
|
33
|
+
textDocument: doc,
|
|
43
34
|
});
|
|
44
|
-
const result =
|
|
35
|
+
const result = await server.documentHighlight({
|
|
45
36
|
textDocument: doc,
|
|
46
|
-
position: lastPosition(doc, 'doStuff')
|
|
37
|
+
position: lastPosition(doc, 'doStuff'),
|
|
47
38
|
});
|
|
48
39
|
assert.equal(2, result.length, JSON.stringify(result, undefined, 2));
|
|
49
|
-
})
|
|
40
|
+
});
|
|
50
41
|
});
|
|
51
42
|
describe('completions', () => {
|
|
52
|
-
it('receives completion that auto-imports from another module', () =>
|
|
43
|
+
it('receives completion that auto-imports from another module', async () => {
|
|
53
44
|
const doc = {
|
|
54
45
|
uri: uri('completion.ts'),
|
|
55
46
|
languageId: 'typescript',
|
|
56
47
|
version: 1,
|
|
57
|
-
text: readContents(filePath('completion.ts'))
|
|
48
|
+
text: readContents(filePath('completion.ts')),
|
|
58
49
|
};
|
|
59
50
|
server.didOpenTextDocument({ textDocument: doc });
|
|
60
|
-
const proposals =
|
|
51
|
+
const proposals = await server.completion({
|
|
61
52
|
textDocument: doc,
|
|
62
|
-
position: positionAfter(doc, 'doStuff')
|
|
53
|
+
position: positionAfter(doc, 'doStuff'),
|
|
63
54
|
});
|
|
64
55
|
assert.isNotNull(proposals);
|
|
65
56
|
const completion = proposals.items.find(item => item.label === 'doStuff');
|
|
66
57
|
assert.isDefined(completion);
|
|
67
|
-
const resolvedCompletion =
|
|
58
|
+
const resolvedCompletion = await server.completionResolve(completion);
|
|
68
59
|
assert.isDefined(resolvedCompletion.additionalTextEdits);
|
|
69
60
|
assert.isUndefined(resolvedCompletion.command);
|
|
70
61
|
server.didCloseTextDocument({ textDocument: doc });
|
|
71
|
-
})
|
|
62
|
+
});
|
|
72
63
|
});
|
|
73
64
|
//# sourceMappingURL=file-lsp-server.spec.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-lsp-server.spec.js","sourceRoot":"","sources":["../src/file-lsp-server.spec.ts"],"names":[],"mappings":"AAAA;;;;;GAKG
|
|
1
|
+
{"version":3,"file":"file-lsp-server.spec.js","sourceRoot":"","sources":["../src/file-lsp-server.spec.ts"],"names":[],"mappings":"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"}
|
package/lib/hover.d.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import * as lsp from 'vscode-languageserver';
|
|
2
2
|
import type tsp from 'typescript/lib/protocol.d.js';
|
|
3
|
-
export declare function asSignatureHelp(info: tsp.SignatureHelpItems): lsp.SignatureHelp;
|
|
3
|
+
export declare function asSignatureHelp(info: tsp.SignatureHelpItems, context?: lsp.SignatureHelpContext): lsp.SignatureHelp;
|
|
4
|
+
export declare function toTsTriggerReason(context: lsp.SignatureHelpContext): tsp.SignatureHelpTriggerReason;
|
|
4
5
|
//# 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":"
|
|
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,8BAA8B,CAAC;AAGpD,wBAAgB,eAAe,CAAC,IAAI,EAAE,GAAG,CAAC,kBAAkB,EAAE,OAAO,CAAC,EAAE,GAAG,CAAC,oBAAoB,GAAG,GAAG,CAAC,aAAa,CAOnH;AA+CD,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,GAAG,CAAC,oBAAoB,GAAG,GAAG,CAAC,0BAA0B,CAkBnG"}
|
package/lib/hover.js
CHANGED
|
@@ -4,17 +4,36 @@
|
|
|
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
|
+
/*---------------------------------------------------------------------------------------------
|
|
8
|
+
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
9
|
+
* Licensed under the MIT License. See License.txt in the project root for license information.
|
|
10
|
+
*--------------------------------------------------------------------------------------------*/
|
|
11
|
+
import * as lsp from 'vscode-languageserver';
|
|
7
12
|
import { asDocumentation, asPlainText } from './protocol-translation.js';
|
|
8
|
-
export function asSignatureHelp(info) {
|
|
13
|
+
export function asSignatureHelp(info, context) {
|
|
14
|
+
const signatures = info.items.map(asSignatureInformation);
|
|
9
15
|
return {
|
|
10
|
-
activeSignature: info
|
|
16
|
+
activeSignature: getActiveSignature(info, signatures, context),
|
|
11
17
|
activeParameter: getActiveParameter(info),
|
|
12
|
-
signatures
|
|
18
|
+
signatures,
|
|
13
19
|
};
|
|
14
20
|
}
|
|
21
|
+
function getActiveSignature(info, signatures, context) {
|
|
22
|
+
// Try matching the previous active signature's label to keep it selected
|
|
23
|
+
if (context?.activeSignatureHelp?.activeSignature !== undefined) {
|
|
24
|
+
const previouslyActiveSignature = context.activeSignatureHelp.signatures[context.activeSignatureHelp.activeSignature];
|
|
25
|
+
if (previouslyActiveSignature && context.isRetrigger) {
|
|
26
|
+
const existingIndex = signatures.findIndex(other => other.label === previouslyActiveSignature.label);
|
|
27
|
+
if (existingIndex !== -1) {
|
|
28
|
+
return existingIndex;
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
}
|
|
32
|
+
return info.selectedItemIndex;
|
|
33
|
+
}
|
|
15
34
|
function getActiveParameter(info) {
|
|
16
35
|
const activeSignature = info.items[info.selectedItemIndex];
|
|
17
|
-
if (activeSignature
|
|
36
|
+
if (activeSignature?.isVariadic) {
|
|
18
37
|
return Math.min(info.argumentIndex, activeSignature.parameters.length - 1);
|
|
19
38
|
}
|
|
20
39
|
return info.argumentIndex;
|
|
@@ -25,9 +44,9 @@ function asSignatureInformation(item) {
|
|
|
25
44
|
label: asPlainText(item.prefixDisplayParts),
|
|
26
45
|
documentation: asDocumentation({
|
|
27
46
|
documentation: item.documentation,
|
|
28
|
-
tags: item.tags.filter(x => x.name !== 'param')
|
|
47
|
+
tags: item.tags.filter(x => x.name !== 'param'),
|
|
29
48
|
}),
|
|
30
|
-
parameters
|
|
49
|
+
parameters,
|
|
31
50
|
};
|
|
32
51
|
signature.label += parameters.map(parameter => parameter.label).join(asPlainText(item.separatorDisplayParts));
|
|
33
52
|
signature.label += asPlainText(item.suffixDisplayParts);
|
|
@@ -36,7 +55,28 @@ function asSignatureInformation(item) {
|
|
|
36
55
|
function asParameterInformation(parameter) {
|
|
37
56
|
return {
|
|
38
57
|
label: asPlainText(parameter.displayParts),
|
|
39
|
-
documentation: asDocumentation(parameter)
|
|
58
|
+
documentation: asDocumentation(parameter),
|
|
40
59
|
};
|
|
41
60
|
}
|
|
61
|
+
export function toTsTriggerReason(context) {
|
|
62
|
+
switch (context.triggerKind) {
|
|
63
|
+
case lsp.SignatureHelpTriggerKind.TriggerCharacter:
|
|
64
|
+
if (context.triggerCharacter) {
|
|
65
|
+
if (context.isRetrigger) {
|
|
66
|
+
return { kind: 'retrigger', triggerCharacter: context.triggerCharacter };
|
|
67
|
+
}
|
|
68
|
+
else {
|
|
69
|
+
return { kind: 'characterTyped', triggerCharacter: context.triggerCharacter };
|
|
70
|
+
}
|
|
71
|
+
}
|
|
72
|
+
else {
|
|
73
|
+
return { kind: 'invoked' };
|
|
74
|
+
}
|
|
75
|
+
case lsp.SignatureHelpTriggerKind.ContentChange:
|
|
76
|
+
return context.isRetrigger ? { kind: 'retrigger' } : { kind: 'invoked' };
|
|
77
|
+
case lsp.SignatureHelpTriggerKind.Invoked:
|
|
78
|
+
default:
|
|
79
|
+
return { kind: 'invoked' };
|
|
80
|
+
}
|
|
81
|
+
}
|
|
42
82
|
//# sourceMappingURL=hover.js.map
|
package/lib/hover.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hover.js","sourceRoot":"","sources":["../src/hover.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;
|
|
1
|
+
{"version":3,"file":"hover.js","sourceRoot":"","sources":["../src/hover.ts"],"names":[],"mappings":"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"}
|
package/lib/logger.js
CHANGED
package/lib/logger.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,KAAK,GAAG,MAAM,uBAAuB,CAAC;AAY7C,MAAM,OAAO,eAAe;IACxB,YAAsB,MAAiB,EAAY,KAAsB;QAAnD,WAAM,GAAN,MAAM,CAAW;QAAY,UAAK,GAAL,KAAK,CAAiB;IAAI,CAAC;IAEpE,WAAW,CAAC,QAAyB,EAAE,cAAqB;QAClE,IAAI,IAAI,CAAC,KAAK,IAAI,QAAQ,EAAE;YACxB,MAAM,OAAO,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;gBACnC,IAAI,OAAO,CAAC,KAAK,QAAQ,EAAE;oBACvB,OAAO,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;iBACrC;qBAAM;oBACH,OAAO,CAAC,CAAC;iBACZ;YACL,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAEb,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC;gBACnB,IAAI,EAAE,QAAQ;gBACd,OAAO,EAAE,OAAO;aACnB,CAAC,CAAC;SACN;IACL,CAAC;IAED,KAAK,CAAC,GAAG,GAAU;QACf,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,WAAW,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IACjD,CAAC;IAED,IAAI,CAAC,GAAG,GAAU;QACd,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,WAAW,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;IACnD,CAAC;IAED,IAAI,CAAC,GAAG,GAAU;QACd,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAChD,CAAC;IAED,GAAG,CAAC,GAAG,GAAU;QACb,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,WAAW,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IAC/C,CAAC;CACJ;AAED,MAAM,CAAN,IAAY,eAKX;AALD,WAAY,eAAe;IACvB,kCAAe,CAAA;IACf,gCAAa,CAAA;IACb,gCAAa,CAAA;IACb,sCAAmB,CAAA;AACvB,CAAC,EALW,eAAe,GAAf,eAAe,KAAf,eAAe,QAK1B;AAED,MAAM,OAAO,aAAa;IACtB,YAAoB,QAAyB,GAAG,CAAC,WAAW,CAAC,IAAI;QAA7C,UAAK,GAAL,KAAK,CAAwC;IAAG,CAAC;IAErE,MAAM,CAAC,kBAAkB,CAAC,IAAa;QACnC,QAAQ,IAAI,EAAE;YACV,KAAK,OAAO;gBACR,OAAO,GAAG,CAAC,WAAW,CAAC,KAAK,CAAC;YACjC,KAAK,MAAM;gBACP,OAAO,GAAG,CAAC,WAAW,CAAC,OAAO,CAAC;YACnC,KAAK,KAAK;gBACN,OAAO,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC;YAC/B,KAAK,MAAM,CAAC;YACZ;gBACI,OAAO,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC;SACnC;IACL,CAAC;IAEO,KAAK,CAAC,IAAkB,EAAE,KAAsB,EAAE,GAAG,GAAU;QACnE,IAAI,IAAI,CAAC,KAAK,IAAI,KAAK,EAAE;YACrB,sCAAsC;YACtC,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC;SACzC;IACL,CAAC;IAEO,SAAS,CAAC,GAAG,
|
|
1
|
+
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"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"}
|
package/lib/lsp-client.d.ts
CHANGED
|
@@ -1,30 +1,26 @@
|
|
|
1
1
|
import * as lsp from 'vscode-languageserver';
|
|
2
|
-
export interface
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
end(): void;
|
|
2
|
+
export interface WithProgressOptions {
|
|
3
|
+
message: string;
|
|
4
|
+
reporter: lsp.WorkDoneProgressReporter;
|
|
6
5
|
}
|
|
7
6
|
export interface LspClient {
|
|
8
|
-
|
|
9
|
-
|
|
7
|
+
createProgressReporter(token?: lsp.CancellationToken, workDoneProgress?: lsp.WorkDoneProgressReporter): Promise<lsp.WorkDoneProgressReporter>;
|
|
8
|
+
withProgress<R>(options: WithProgressOptions, task: (progress: lsp.WorkDoneProgressReporter) => Promise<R>): Promise<R>;
|
|
10
9
|
publishDiagnostics(args: lsp.PublishDiagnosticsParams): void;
|
|
11
|
-
|
|
10
|
+
showErrorMessage(message: string): void;
|
|
12
11
|
logMessage(args: lsp.LogMessageParams): void;
|
|
13
12
|
applyWorkspaceEdit(args: lsp.ApplyWorkspaceEditParams): Promise<lsp.ApplyWorkspaceEditResult>;
|
|
14
|
-
telemetry(args: any): void;
|
|
15
13
|
rename(args: lsp.TextDocumentPositionParams): Promise<any>;
|
|
16
14
|
}
|
|
17
15
|
export declare class LspClientImpl implements LspClient {
|
|
18
16
|
protected connection: lsp.Connection;
|
|
19
|
-
private clientCapabilities?;
|
|
20
17
|
constructor(connection: lsp.Connection);
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
publishDiagnostics(
|
|
24
|
-
|
|
18
|
+
createProgressReporter(_?: lsp.CancellationToken, workDoneProgress?: lsp.WorkDoneProgressReporter): Promise<lsp.WorkDoneProgressReporter>;
|
|
19
|
+
withProgress<R = unknown>(options: WithProgressOptions, task: (progress: lsp.WorkDoneProgressReporter) => Promise<R>): Promise<R>;
|
|
20
|
+
publishDiagnostics(params: lsp.PublishDiagnosticsParams): void;
|
|
21
|
+
showErrorMessage(message: string): void;
|
|
25
22
|
logMessage(args: lsp.LogMessageParams): void;
|
|
26
|
-
|
|
27
|
-
applyWorkspaceEdit(args: lsp.ApplyWorkspaceEditParams): Promise<lsp.ApplyWorkspaceEditResult>;
|
|
23
|
+
applyWorkspaceEdit(params: lsp.ApplyWorkspaceEditParams): Promise<lsp.ApplyWorkspaceEditResult>;
|
|
28
24
|
rename(args: lsp.TextDocumentPositionParams): Promise<any>;
|
|
29
25
|
}
|
|
30
26
|
//# sourceMappingURL=lsp-client.d.ts.map
|
package/lib/lsp-client.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lsp-client.d.ts","sourceRoot":"","sources":["../src/lsp-client.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,GAAG,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"lsp-client.d.ts","sourceRoot":"","sources":["../src/lsp-client.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,GAAG,MAAM,uBAAuB,CAAC;AAK7C,MAAM,WAAW,mBAAmB;IAChC,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,GAAG,CAAC,wBAAwB,CAAC;CAC1C;AAED,MAAM,WAAW,SAAS;IACtB,sBAAsB,CAAC,KAAK,CAAC,EAAE,GAAG,CAAC,iBAAiB,EAAE,gBAAgB,CAAC,EAAE,GAAG,CAAC,wBAAwB,GAAG,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC;IAC9I,YAAY,CAAC,CAAC,EAAE,OAAO,EAAE,mBAAmB,EAAE,IAAI,EAAE,CAAC,QAAQ,EAAE,GAAG,CAAC,wBAAwB,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;IACxH,kBAAkB,CAAC,IAAI,EAAE,GAAG,CAAC,wBAAwB,GAAG,IAAI,CAAC;IAC7D,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACxC,UAAU,CAAC,IAAI,EAAE,GAAG,CAAC,gBAAgB,GAAG,IAAI,CAAC;IAC7C,kBAAkB,CAAC,IAAI,EAAE,GAAG,CAAC,wBAAwB,GAAG,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC;IAC9F,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,0BAA0B,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;CAC9D;AAKD,qBAAa,aAAc,YAAW,SAAS;IAC/B,SAAS,CAAC,UAAU,EAAE,GAAG,CAAC,UAAU;gBAA1B,UAAU,EAAE,GAAG,CAAC,UAAU;IAE1C,sBAAsB,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,iBAAiB,EAAE,gBAAgB,CAAC,EAAE,GAAG,CAAC,wBAAwB,GAAG,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC;IAUzI,YAAY,CAAC,CAAC,GAAG,OAAO,EAAE,OAAO,EAAE,mBAAmB,EAAE,IAAI,EAAE,CAAC,QAAQ,EAAE,GAAG,CAAC,wBAAwB,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;IASvI,kBAAkB,CAAC,MAAM,EAAE,GAAG,CAAC,wBAAwB,GAAG,IAAI;IAI9D,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAIvC,UAAU,CAAC,IAAI,EAAE,GAAG,CAAC,gBAAgB,GAAG,IAAI;IAItC,kBAAkB,CAAC,MAAM,EAAE,GAAG,CAAC,wBAAwB,GAAG,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC;IAI/F,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,0BAA0B,GAAG,OAAO,CAAC,GAAG,CAAC;CAGnE"}
|
package/lib/lsp-client.js
CHANGED
|
@@ -4,80 +4,48 @@
|
|
|
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
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
8
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
9
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
10
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
11
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
12
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
13
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
14
|
-
});
|
|
15
|
-
};
|
|
16
7
|
import * as lsp from 'vscode-languageserver';
|
|
8
|
+
import { MessageType } from 'vscode-languageserver';
|
|
9
|
+
import { attachWorkDone } from 'vscode-languageserver/lib/common/progress.js';
|
|
17
10
|
import { TypeScriptRenameRequest } from './ts-protocol.js';
|
|
11
|
+
// Hack around the LSP library that makes it otherwise impossible to differentiate between Null and Client-initiated reporter.
|
|
12
|
+
const nullProgressReporter = attachWorkDone(undefined, /* params */ undefined);
|
|
18
13
|
export class LspClientImpl {
|
|
19
14
|
constructor(connection) {
|
|
20
15
|
this.connection = connection;
|
|
21
16
|
}
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
report: (message) => {
|
|
40
|
-
if (workDoneProgress) {
|
|
41
|
-
workDoneProgress
|
|
42
|
-
.then((progress) => {
|
|
43
|
-
progress.report(message);
|
|
44
|
-
})
|
|
45
|
-
.catch(() => { });
|
|
46
|
-
}
|
|
47
|
-
},
|
|
48
|
-
end: () => {
|
|
49
|
-
if (workDoneProgress) {
|
|
50
|
-
workDoneProgress
|
|
51
|
-
.then((progress) => {
|
|
52
|
-
progress.done();
|
|
53
|
-
})
|
|
54
|
-
.catch(() => { });
|
|
55
|
-
workDoneProgress = undefined;
|
|
56
|
-
}
|
|
57
|
-
}
|
|
58
|
-
};
|
|
17
|
+
async createProgressReporter(_, workDoneProgress) {
|
|
18
|
+
let reporter;
|
|
19
|
+
if (workDoneProgress && workDoneProgress.constructor !== nullProgressReporter.constructor) {
|
|
20
|
+
reporter = workDoneProgress;
|
|
21
|
+
}
|
|
22
|
+
else {
|
|
23
|
+
reporter = workDoneProgress || await this.connection.window.createWorkDoneProgress();
|
|
24
|
+
}
|
|
25
|
+
return reporter;
|
|
26
|
+
}
|
|
27
|
+
async withProgress(options, task) {
|
|
28
|
+
const { message, reporter } = options;
|
|
29
|
+
reporter.begin(message);
|
|
30
|
+
return task(reporter).then(result => {
|
|
31
|
+
reporter.done();
|
|
32
|
+
return result;
|
|
33
|
+
});
|
|
59
34
|
}
|
|
60
|
-
publishDiagnostics(
|
|
61
|
-
this.connection.
|
|
35
|
+
publishDiagnostics(params) {
|
|
36
|
+
this.connection.sendDiagnostics(params);
|
|
62
37
|
}
|
|
63
|
-
|
|
64
|
-
this.connection.sendNotification(lsp.ShowMessageNotification.type,
|
|
38
|
+
showErrorMessage(message) {
|
|
39
|
+
this.connection.sendNotification(lsp.ShowMessageNotification.type, { type: MessageType.Error, message });
|
|
65
40
|
}
|
|
66
41
|
logMessage(args) {
|
|
67
42
|
this.connection.sendNotification(lsp.LogMessageNotification.type, args);
|
|
68
43
|
}
|
|
69
|
-
|
|
70
|
-
this.connection.
|
|
44
|
+
async applyWorkspaceEdit(params) {
|
|
45
|
+
return this.connection.workspace.applyEdit(params);
|
|
71
46
|
}
|
|
72
|
-
|
|
73
|
-
return
|
|
74
|
-
return this.connection.sendRequest(lsp.ApplyWorkspaceEditRequest.type, args);
|
|
75
|
-
});
|
|
76
|
-
}
|
|
77
|
-
rename(args) {
|
|
78
|
-
return __awaiter(this, void 0, void 0, function* () {
|
|
79
|
-
return this.connection.sendRequest(TypeScriptRenameRequest.type, args);
|
|
80
|
-
});
|
|
47
|
+
async rename(args) {
|
|
48
|
+
return this.connection.sendRequest(TypeScriptRenameRequest.type, args);
|
|
81
49
|
}
|
|
82
50
|
}
|
|
83
51
|
//# sourceMappingURL=lsp-client.js.map
|
package/lib/lsp-client.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lsp-client.js","sourceRoot":"","sources":["../src/lsp-client.ts"],"names":[],"mappings":"AAAA;;;;;GAKG
|
|
1
|
+
{"version":3,"file":"lsp-client.js","sourceRoot":"","sources":["../src/lsp-client.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,GAAG,MAAM,uBAAuB,CAAC;AAC7C,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,8CAA8C,CAAC;AAC9E,OAAO,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAC;AAiB3D,8HAA8H;AAC9H,MAAM,oBAAoB,GAAG,cAAc,CAAC,SAAgB,EAAE,YAAY,CAAC,SAAS,CAAC,CAAC;AAEtF,MAAM,OAAO,aAAa;IACtB,YAAsB,UAA0B;QAA1B,eAAU,GAAV,UAAU,CAAgB;IAAG,CAAC;IAEpD,KAAK,CAAC,sBAAsB,CAAC,CAAyB,EAAE,gBAA+C;QACnG,IAAI,QAAsC,CAAC;QAC3C,IAAI,gBAAgB,IAAI,gBAAgB,CAAC,WAAW,KAAK,oBAAoB,CAAC,WAAW,EAAE;YACvF,QAAQ,GAAG,gBAAgB,CAAC;SAC/B;aAAM;YACH,QAAQ,GAAG,gBAAgB,IAAI,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,sBAAsB,EAAE,CAAC;SACxF;QACD,OAAO,QAAQ,CAAC;IACpB,CAAC;IAED,KAAK,CAAC,YAAY,CAAc,OAA4B,EAAE,IAA4D;QACtH,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;QACtC,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QACxB,OAAO,IAAI,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;YAChC,QAAQ,CAAC,IAAI,EAAE,CAAC;YAChB,OAAO,MAAM,CAAC;QAClB,CAAC,CAAC,CAAC;IACP,CAAC;IAED,kBAAkB,CAAC,MAAoC;QACnD,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;IAC5C,CAAC;IAED,gBAAgB,CAAC,OAAe;QAC5B,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,GAAG,CAAC,uBAAuB,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,WAAW,CAAC,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC;IAC7G,CAAC;IAED,UAAU,CAAC,IAA0B;QACjC,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,GAAG,CAAC,sBAAsB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAC5E,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,MAAoC;QACzD,OAAO,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IACvD,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,IAAoC;QAC7C,OAAO,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,uBAAuB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAC3E,CAAC;CACJ"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lsp-connection.d.ts","sourceRoot":"","sources":["../src/lsp-connection.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,GAAG,MAAM,+BAA+B,CAAC;AAOrD,MAAM,WAAW,cAAc;IAC3B,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,gBAAgB,EAAE,GAAG,CAAC,WAAW,CAAC;CACrC;AAED,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,cAAc,GAAG,GAAG,CAAC,UAAU,
|
|
1
|
+
{"version":3,"file":"lsp-connection.d.ts","sourceRoot":"","sources":["../src/lsp-connection.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,GAAG,MAAM,+BAA+B,CAAC;AAOrD,MAAM,WAAW,cAAc;IAC3B,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,gBAAgB,EAAE,GAAG,CAAC,WAAW,CAAC;CACrC;AAED,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,cAAc,GAAG,GAAG,CAAC,UAAU,CAgD3E"}
|
package/lib/lsp-connection.js
CHANGED
|
@@ -19,7 +19,7 @@ export function createLspConnection(options) {
|
|
|
19
19
|
lspClient,
|
|
20
20
|
tsserverPath: options.tsserverPath,
|
|
21
21
|
tsserverLogFile: options.tsserverLogFile,
|
|
22
|
-
tsserverLogVerbosity: options.tsserverLogVerbosity
|
|
22
|
+
tsserverLogVerbosity: options.tsserverLogVerbosity,
|
|
23
23
|
});
|
|
24
24
|
connection.onInitialize(server.initialize.bind(server));
|
|
25
25
|
connection.onDidChangeConfiguration(server.didChangeConfiguration.bind(server));
|
|
@@ -44,9 +44,10 @@ export function createLspConnection(options) {
|
|
|
44
44
|
connection.onSignatureHelp(server.signatureHelp.bind(server));
|
|
45
45
|
connection.onWorkspaceSymbol(server.workspaceSymbol.bind(server));
|
|
46
46
|
connection.onFoldingRanges(server.foldingRanges.bind(server));
|
|
47
|
+
connection.languages.inlayHint.on(server.inlayHints.bind(server));
|
|
47
48
|
// proposed `textDocument/calls` request
|
|
48
49
|
connection.onRequest(lspcalls.CallsRequest.type, server.calls.bind(server));
|
|
49
|
-
connection.onRequest(lspinlayHints.type, server.
|
|
50
|
+
connection.onRequest(lspinlayHints.type, server.inlayHintsLegacy.bind(server));
|
|
50
51
|
connection.onRequest(lsp.SemanticTokensRequest.type, server.semanticTokensFull.bind(server));
|
|
51
52
|
connection.onRequest(lsp.SemanticTokensRangeRequest.type, server.semanticTokensRange.bind(server));
|
|
52
53
|
return connection;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lsp-connection.js","sourceRoot":"","sources":["../src/lsp-connection.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"lsp-connection.js","sourceRoot":"","sources":["../src/lsp-connection.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,14 +23,5 @@ export declare type InlayHintsResult = {
|
|
|
23
23
|
};
|
|
24
24
|
export declare const type: lsp.RequestType<InlayHintsParams, InlayHintsResult, lsp.TextDocumentRegistrationOptions>;
|
|
25
25
|
export declare type HandlerSignature = RequestHandler<InlayHintsParams, InlayHintsResult | null, void>;
|
|
26
|
-
export interface InlayHintsOptions {
|
|
27
|
-
includeInlayParameterNameHints?: 'none' | 'literals' | 'all';
|
|
28
|
-
includeInlayParameterNameHintsWhenArgumentMatchesName?: boolean;
|
|
29
|
-
includeInlayFunctionParameterTypeHints?: boolean;
|
|
30
|
-
includeInlayVariableTypeHints?: boolean;
|
|
31
|
-
includeInlayPropertyDeclarationTypeHints?: boolean;
|
|
32
|
-
includeInlayFunctionLikeReturnTypeHints?: boolean;
|
|
33
|
-
includeInlayEnumMemberValueHints?: boolean;
|
|
34
|
-
}
|
|
35
26
|
export {};
|
|
36
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,KAAK,GAAG,MAAM,8BAA8B,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAEhD,oBAAY,gBAAgB,GAAG;IAC3B;;OAEG;IACH,YAAY,EAAE,GAAG,CAAC,sBAAsB,CAAC;IACzC;;OAEG;IACH,KAAK,CAAC,EAAE,GAAG,CAAC,KAAK,CAAC;CACrB,CAAC;AAEF,aAAK,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,oBAAY,gBAAgB,GAAG;IAC3B,UAAU,EAAE,SAAS,EAAE,CAAC;CAC3B,CAAC;AAEF,eAAO,MAAM,IAAI,0FAAwH,CAAC;AAE1I,oBAAY,gBAAgB,GAAG,cAAc,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,IAAI,EAAE,IAAI,CAAC,CAAC
|
|
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,KAAK,GAAG,MAAM,8BAA8B,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAEhD,oBAAY,gBAAgB,GAAG;IAC3B;;OAEG;IACH,YAAY,EAAE,GAAG,CAAC,sBAAsB,CAAC;IACzC;;OAEG;IACH,KAAK,CAAC,EAAE,GAAG,CAAC,KAAK,CAAC;CACrB,CAAC;AAEF,aAAK,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,oBAAY,gBAAgB,GAAG;IAC3B,UAAU,EAAE,SAAS,EAAE,CAAC;CAC3B,CAAC;AAEF,eAAO,MAAM,IAAI,0FAAwH,CAAC;AAE1I,oBAAY,gBAAgB,GAAG,cAAc,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,IAAI,EAAE,IAAI,CAAC,CAAC"}
|
package/lib/lsp-server.d.ts
CHANGED
|
@@ -3,17 +3,16 @@ import * as lspcalls from './lsp-protocol.calls.proposed.js';
|
|
|
3
3
|
import * as lspinlayHints from './lsp-protocol.inlayHints.proposed.js';
|
|
4
4
|
import tsp from 'typescript/lib/protocol.d.js';
|
|
5
5
|
import { LspDocument } from './document.js';
|
|
6
|
-
import { TypeScriptInitializeParams, TypeScriptInitializeResult
|
|
6
|
+
import { TypeScriptInitializeParams, TypeScriptInitializeResult } from './ts-protocol.js';
|
|
7
7
|
import { IServerOptions } from './utils/configuration.js';
|
|
8
8
|
export declare class LspServer {
|
|
9
9
|
private options;
|
|
10
10
|
private _tspClient;
|
|
11
11
|
private _loadingIndicator;
|
|
12
12
|
private initializeParams;
|
|
13
|
-
private initializeResult;
|
|
14
13
|
private diagnosticQueue?;
|
|
14
|
+
private configurationManager;
|
|
15
15
|
private logger;
|
|
16
|
-
private workspaceConfiguration;
|
|
17
16
|
private workspaceRoot;
|
|
18
17
|
private typeScriptAutoFixProvider;
|
|
19
18
|
private features;
|
|
@@ -28,7 +27,6 @@ export declare class LspServer {
|
|
|
28
27
|
protected getLogFile(logVerbosity: string | undefined): string | undefined;
|
|
29
28
|
protected doGetLogFile(): string | undefined;
|
|
30
29
|
didChangeConfiguration(params: lsp.DidChangeConfigurationParams): void;
|
|
31
|
-
getWorkspacePreferencesForDocument(file: string): TypeScriptWorkspaceSettingsLanguageSettings;
|
|
32
30
|
protected diagnosticsTokenSource: lsp.CancellationTokenSource | undefined;
|
|
33
31
|
protected interuptDiagnostics<R>(f: () => R): R;
|
|
34
32
|
pendingDebouncedRequest: boolean;
|
|
@@ -41,15 +39,13 @@ export declare class LspServer {
|
|
|
41
39
|
didCloseTextDocument(params: lsp.DidCloseTextDocumentParams): void;
|
|
42
40
|
protected closeDocument(file: string): void;
|
|
43
41
|
didChangeTextDocument(params: lsp.DidChangeTextDocumentParams): void;
|
|
44
|
-
didSaveTextDocument(_params: lsp.
|
|
45
|
-
definition(params: lsp.
|
|
46
|
-
implementation(params: lsp.TextDocumentPositionParams): Promise<lsp.Definition>;
|
|
47
|
-
typeDefinition(params: lsp.TextDocumentPositionParams): Promise<lsp.Definition>;
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
}): Promise<lsp.Definition>;
|
|
52
|
-
documentSymbol(params: lsp.TextDocumentPositionParams): Promise<lsp.DocumentSymbol[] | lsp.SymbolInformation[]>;
|
|
42
|
+
didSaveTextDocument(_params: lsp.DidSaveTextDocumentParams): void;
|
|
43
|
+
definition(params: lsp.DefinitionParams): Promise<lsp.Definition | lsp.DefinitionLink[] | undefined>;
|
|
44
|
+
implementation(params: lsp.TextDocumentPositionParams): Promise<lsp.Definition | undefined>;
|
|
45
|
+
typeDefinition(params: lsp.TextDocumentPositionParams): Promise<lsp.Definition | undefined>;
|
|
46
|
+
private getDefinition;
|
|
47
|
+
private getSymbolLocations;
|
|
48
|
+
documentSymbol(params: lsp.DocumentSymbolParams): Promise<lsp.DocumentSymbol[] | lsp.SymbolInformation[]>;
|
|
53
49
|
protected get supportHierarchicalDocumentSymbol(): boolean;
|
|
54
50
|
completion(params: lsp.CompletionParams): Promise<lsp.CompletionList | null>;
|
|
55
51
|
completionResolve(item: lsp.CompletionItem): Promise<lsp.CompletionItem>;
|
|
@@ -59,14 +55,13 @@ export declare class LspServer {
|
|
|
59
55
|
references(params: lsp.ReferenceParams): Promise<lsp.Location[]>;
|
|
60
56
|
documentFormatting(params: lsp.DocumentFormattingParams): Promise<lsp.TextEdit[]>;
|
|
61
57
|
documentRangeFormatting(params: lsp.DocumentRangeFormattingParams): Promise<lsp.TextEdit[]>;
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
protected getSignatureHelp(file: string, position: lsp.Position): Promise<tsp.SignatureHelpResponse | undefined>;
|
|
58
|
+
signatureHelp(params: lsp.SignatureHelpParams): Promise<lsp.SignatureHelp | undefined>;
|
|
59
|
+
protected getSignatureHelp(file: string, params: lsp.SignatureHelpParams): Promise<tsp.SignatureHelpResponse | undefined>;
|
|
65
60
|
codeAction(params: lsp.CodeActionParams): Promise<lsp.CodeAction[]>;
|
|
66
61
|
protected getCodeFixes(args: tsp.CodeFixRequestArgs): Promise<tsp.GetCodeFixesResponse | undefined>;
|
|
67
62
|
protected getRefactors(args: tsp.GetApplicableRefactorsRequestArgs): Promise<tsp.GetApplicableRefactorsResponse | undefined>;
|
|
68
63
|
protected getOrganizeImports(args: tsp.OrganizeImportsRequestArgs): Promise<tsp.OrganizeImportsResponse | undefined>;
|
|
69
|
-
executeCommand(arg: lsp.ExecuteCommandParams): Promise<
|
|
64
|
+
executeCommand(arg: lsp.ExecuteCommandParams, token?: lsp.CancellationToken, workDoneProgress?: lsp.WorkDoneProgressReporter): Promise<any>;
|
|
70
65
|
protected applyFileCodeEdits(edits: ReadonlyArray<tsp.FileCodeEdits>): Promise<boolean>;
|
|
71
66
|
protected applyRenameFile(sourceUri: string, targetUri: string): Promise<void>;
|
|
72
67
|
protected getEditsForFileRename(sourceUri: string, targetUri: string): Promise<ReadonlyArray<tsp.FileCodeEdits>>;
|
|
@@ -79,10 +74,10 @@ export declare class LspServer {
|
|
|
79
74
|
foldingRanges(params: lsp.FoldingRangeParams): Promise<lsp.FoldingRange[] | undefined>;
|
|
80
75
|
protected asFoldingRange(span: tsp.OutliningSpan, document: LspDocument): lsp.FoldingRange | undefined;
|
|
81
76
|
protected asFoldingRangeKind(span: tsp.OutliningSpan): lsp.FoldingRangeKind | undefined;
|
|
82
|
-
protected onTsEvent(event: protocol.Event): void
|
|
77
|
+
protected onTsEvent(event: protocol.Event): Promise<void>;
|
|
83
78
|
calls(params: lspcalls.CallsParams): Promise<lspcalls.CallsResult>;
|
|
84
|
-
inlayHints(params:
|
|
85
|
-
|
|
79
|
+
inlayHints(params: lsp.InlayHintParams): Promise<lsp.InlayHint[] | undefined>;
|
|
80
|
+
inlayHintsLegacy(params: lspinlayHints.InlayHintsParams): Promise<lspinlayHints.InlayHintsResult>;
|
|
86
81
|
semanticTokensFull(params: lsp.SemanticTokensParams): Promise<lsp.SemanticTokens>;
|
|
87
82
|
semanticTokensRange(params: lsp.SemanticTokensRangeParams): Promise<lsp.SemanticTokens>;
|
|
88
83
|
getSemanticTokens(doc: LspDocument, file: string, startOffset: number, endOffset: number): Promise<lsp.SemanticTokens>;
|
package/lib/lsp-server.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lsp-server.d.ts","sourceRoot":"","sources":["../src/lsp-server.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,GAAG,MAAM,uBAAuB,CAAC;AAC7C,OAAO,KAAK,QAAQ,MAAM,kCAAkC,CAAC;AAC7D,OAAO,KAAK,aAAa,MAAM,uCAAuC,CAAC;AAEvE,OAAO,GAAG,MAAM,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"lsp-server.d.ts","sourceRoot":"","sources":["../src/lsp-server.ts"],"names":[],"mappings":"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"}
|