typescript-language-server 0.11.2 → 1.0.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 +28 -0
- package/README.md +32 -6
- package/lib/calls.d.ts +3 -3
- package/lib/calls.d.ts.map +1 -1
- package/lib/calls.js +18 -46
- package/lib/calls.js.map +1 -1
- package/lib/cli.js +8 -32
- package/lib/cli.js.map +1 -1
- package/lib/commands.js +1 -4
- package/lib/commands.js.map +1 -1
- package/lib/completion.d.ts +6 -6
- package/lib/completion.d.ts.map +1 -1
- package/lib/completion.js +76 -116
- package/lib/completion.js.map +1 -1
- package/lib/diagnostic-queue.d.ts +5 -5
- package/lib/diagnostic-queue.d.ts.map +1 -1
- package/lib/diagnostic-queue.js +7 -14
- package/lib/diagnostic-queue.js.map +1 -1
- package/lib/document-symbol.d.ts +2 -2
- package/lib/document-symbol.d.ts.map +1 -1
- package/lib/document-symbol.js +16 -22
- package/lib/document-symbol.js.map +1 -1
- package/lib/document.d.ts +1 -1
- package/lib/document.d.ts.map +1 -1
- package/lib/document.js +6 -34
- package/lib/document.js.map +1 -1
- package/lib/features/fix-all.d.ts +4 -4
- package/lib/features/fix-all.d.ts.map +1 -1
- package/lib/features/fix-all.js +17 -44
- package/lib/features/fix-all.js.map +1 -1
- package/lib/file-lsp-server.spec.js +17 -18
- package/lib/file-lsp-server.spec.js.map +1 -1
- package/lib/hover.d.ts +2 -2
- package/lib/hover.d.ts.map +1 -1
- package/lib/hover.js +8 -12
- package/lib/hover.js.map +1 -1
- package/lib/logger.d.ts +12 -4
- package/lib/logger.d.ts.map +1 -1
- package/lib/logger.js +36 -43
- package/lib/logger.js.map +1 -1
- package/lib/lsp-client.d.ts +3 -3
- package/lib/lsp-client.d.ts.map +1 -1
- package/lib/lsp-client.js +4 -31
- package/lib/lsp-client.js.map +1 -1
- package/lib/lsp-connection.d.ts +1 -1
- package/lib/lsp-connection.d.ts.map +1 -1
- package/lib/lsp-connection.js +10 -37
- package/lib/lsp-connection.js.map +1 -1
- package/lib/lsp-protocol.calls.proposed.d.ts +1 -1
- package/lib/lsp-protocol.calls.proposed.d.ts.map +1 -1
- package/lib/lsp-protocol.calls.proposed.js +7 -32
- package/lib/lsp-protocol.calls.proposed.js.map +1 -1
- package/lib/lsp-protocol.inlayHints.proposed.d.ts +2 -2
- package/lib/lsp-protocol.inlayHints.proposed.d.ts.map +1 -1
- package/lib/lsp-protocol.inlayHints.proposed.js +2 -28
- package/lib/lsp-protocol.inlayHints.proposed.js.map +1 -1
- package/lib/lsp-server.d.ts +13 -9
- package/lib/lsp-server.d.ts.map +1 -1
- package/lib/lsp-server.js +226 -189
- package/lib/lsp-server.js.map +1 -1
- package/lib/lsp-server.spec.js +243 -245
- package/lib/lsp-server.spec.js.map +1 -1
- package/lib/organize-imports.d.ts +3 -3
- package/lib/organize-imports.d.ts.map +1 -1
- package/lib/organize-imports.js +5 -32
- package/lib/organize-imports.js.map +1 -1
- package/lib/organize-imports.spec.js +9 -34
- package/lib/organize-imports.spec.js.map +1 -1
- package/lib/protocol-translation.d.ts +3 -3
- package/lib/protocol-translation.d.ts.map +1 -1
- package/lib/protocol-translation.js +26 -70
- package/lib/protocol-translation.js.map +1 -1
- package/lib/quickfix.d.ts +3 -3
- package/lib/quickfix.d.ts.map +1 -1
- package/lib/quickfix.js +7 -35
- package/lib/quickfix.js.map +1 -1
- package/lib/refactor.d.ts +2 -2
- package/lib/refactor.d.ts.map +1 -1
- package/lib/refactor.js +7 -36
- package/lib/refactor.js.map +1 -1
- package/lib/semantic-tokens.d.ts +1 -1
- package/lib/semantic-tokens.d.ts.map +1 -1
- package/lib/semantic-tokens.js +1 -5
- package/lib/semantic-tokens.js.map +1 -1
- package/lib/test-utils.d.ts +4 -2
- package/lib/test-utils.d.ts.map +1 -1
- package/lib/test-utils.js +39 -60
- package/lib/test-utils.js.map +1 -1
- package/lib/ts-protocol.d.ts +7 -4
- package/lib/ts-protocol.d.ts.map +1 -1
- package/lib/ts-protocol.js +4 -31
- package/lib/ts-protocol.js.map +1 -1
- package/lib/tsp-client.d.ts +42 -43
- package/lib/tsp-client.d.ts.map +1 -1
- package/lib/tsp-client.js +23 -46
- package/lib/tsp-client.js.map +1 -1
- package/lib/tsp-client.spec.js +36 -56
- package/lib/tsp-client.spec.js.map +1 -1
- package/lib/tsp-command-types.js +3 -7
- package/lib/tsp-command-types.js.map +1 -1
- package/lib/utils/SnippetString.js +1 -4
- package/lib/utils/SnippetString.js.map +1 -1
- package/lib/utils/api.d.ts +1 -0
- package/lib/utils/api.d.ts.map +1 -1
- package/lib/utils/api.js +3 -28
- package/lib/utils/api.js.map +1 -1
- package/lib/utils/configuration.d.ts +2 -2
- package/lib/utils/configuration.d.ts.map +1 -1
- package/lib/utils/configuration.js +1 -2
- package/lib/utils/errorCodes.js +11 -14
- package/lib/utils/errorCodes.js.map +1 -1
- package/lib/utils/fixNames.js +13 -16
- package/lib/utils/fixNames.js.map +1 -1
- package/lib/utils/modules-resolver.js +7 -34
- package/lib/utils/modules-resolver.js.map +1 -1
- package/lib/utils/modules-resolver.spec.d.ts +1 -1
- package/lib/utils/modules-resolver.spec.d.ts.map +1 -1
- package/lib/utils/modules-resolver.spec.js +11 -34
- package/lib/utils/modules-resolver.spec.js.map +1 -1
- package/lib/utils/typeConverters.d.ts +1 -1
- package/lib/utils/typeConverters.d.ts.map +1 -1
- package/lib/utils/typeConverters.js +2 -5
- package/lib/utils/typeConverters.js.map +1 -1
- package/lib/utils/types.js +2 -29
- package/lib/utils/types.js.map +1 -1
- package/lib/utils/versionProvider.d.ts +3 -3
- package/lib/utils/versionProvider.d.ts.map +1 -1
- package/lib/utils/versionProvider.js +35 -41
- package/lib/utils/versionProvider.js.map +1 -1
- package/lib/utils.js +1 -5
- package/lib/utils.js.map +1 -1
- package/package.json +35 -33
package/lib/test-utils.js
CHANGED
|
@@ -1,33 +1,9 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
/*
|
|
3
2
|
* Copyright (C) 2017, 2018 TypeFox and others.
|
|
4
3
|
*
|
|
5
4
|
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License.
|
|
6
5
|
* You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
|
|
7
6
|
*/
|
|
8
|
-
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
9
|
-
if (k2 === undefined) k2 = k;
|
|
10
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
11
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
12
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
13
|
-
}
|
|
14
|
-
Object.defineProperty(o, k2, desc);
|
|
15
|
-
}) : (function(o, m, k, k2) {
|
|
16
|
-
if (k2 === undefined) k2 = k;
|
|
17
|
-
o[k2] = m[k];
|
|
18
|
-
}));
|
|
19
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
20
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
21
|
-
}) : function(o, v) {
|
|
22
|
-
o["default"] = v;
|
|
23
|
-
});
|
|
24
|
-
var __importStar = (this && this.__importStar) || function (mod) {
|
|
25
|
-
if (mod && mod.__esModule) return mod;
|
|
26
|
-
var result = {};
|
|
27
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
28
|
-
__setModuleDefault(result, mod);
|
|
29
|
-
return result;
|
|
30
|
-
};
|
|
31
7
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
32
8
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
33
9
|
return new (P || (P = Promise))(function (resolve, reject) {
|
|
@@ -37,19 +13,26 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
37
13
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
38
14
|
});
|
|
39
15
|
};
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
16
|
+
import { platform } from 'node:os';
|
|
17
|
+
import * as path from 'node:path';
|
|
18
|
+
import * as fs from 'node:fs';
|
|
19
|
+
import { fileURLToPath } from 'node:url';
|
|
20
|
+
import * as lsp from 'vscode-languageserver';
|
|
21
|
+
import { normalizePath, pathToUri } from './protocol-translation.js';
|
|
22
|
+
import { LspServer } from './lsp-server.js';
|
|
23
|
+
import { ConsoleLogger } from './logger.js';
|
|
24
|
+
import { TextDocument } from 'vscode-languageserver-textdocument';
|
|
25
|
+
import { TypeScriptVersionProvider } from './utils/versionProvider.js';
|
|
26
|
+
const CONSOLE_LOG_LEVEL = ConsoleLogger.toMessageTypeLevel(process.env.CONSOLE_LOG_LEVEL);
|
|
27
|
+
export const PACKAGE_ROOT = fileURLToPath(new URL('..', import.meta.url));
|
|
28
|
+
export function getDefaultClientCapabilities() {
|
|
51
29
|
return {
|
|
52
30
|
textDocument: {
|
|
31
|
+
completion: {
|
|
32
|
+
completionItem: {
|
|
33
|
+
labelDetailsSupport: true
|
|
34
|
+
}
|
|
35
|
+
},
|
|
53
36
|
documentSymbol: {
|
|
54
37
|
hierarchicalDocumentSymbolSupport: true
|
|
55
38
|
},
|
|
@@ -65,58 +48,55 @@ function getDefaultClientCapabilities() {
|
|
|
65
48
|
}
|
|
66
49
|
};
|
|
67
50
|
}
|
|
68
|
-
|
|
69
|
-
function uri(...components) {
|
|
51
|
+
export function uri(...components) {
|
|
70
52
|
const resolved = filePath(...components);
|
|
71
|
-
return
|
|
53
|
+
return pathToUri(resolved, undefined);
|
|
72
54
|
}
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
return (0, protocol_translation_1.normalizePath)(path.resolve(__dirname, '..', 'test-data', ...components));
|
|
55
|
+
export function filePath(...components) {
|
|
56
|
+
return normalizePath(path.resolve(PACKAGE_ROOT, 'test-data', ...components));
|
|
76
57
|
}
|
|
77
|
-
|
|
78
|
-
function readContents(path) {
|
|
58
|
+
export function readContents(path) {
|
|
79
59
|
return fs.readFileSync(path, 'utf-8').toString();
|
|
80
60
|
}
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
const doc = vscode_languageserver_textdocument_1.TextDocument.create(document.uri, document.languageId, document.version, document.text);
|
|
61
|
+
export function positionAt(document, idx) {
|
|
62
|
+
const doc = TextDocument.create(document.uri, document.languageId, document.version, document.text);
|
|
84
63
|
const pos = doc.positionAt(idx);
|
|
85
64
|
return {
|
|
86
65
|
line: pos.line,
|
|
87
66
|
character: pos.character
|
|
88
67
|
};
|
|
89
68
|
}
|
|
90
|
-
|
|
91
|
-
function position(document, match) {
|
|
69
|
+
export function position(document, match) {
|
|
92
70
|
return positionAt(document, document.text.indexOf(match));
|
|
93
71
|
}
|
|
94
|
-
|
|
95
|
-
function positionAfter(document, match) {
|
|
72
|
+
export function positionAfter(document, match) {
|
|
96
73
|
return positionAt(document, document.text.indexOf(match) + match.length);
|
|
97
74
|
}
|
|
98
|
-
|
|
99
|
-
function lastPosition(document, match) {
|
|
75
|
+
export function lastPosition(document, match) {
|
|
100
76
|
return positionAt(document, document.text.lastIndexOf(match));
|
|
101
77
|
}
|
|
102
|
-
|
|
103
|
-
|
|
78
|
+
export function toPlatformEOL(text) {
|
|
79
|
+
if (platform() === 'win32') {
|
|
80
|
+
return text.replace(/(?!\r)\n/g, '\r\n');
|
|
81
|
+
}
|
|
82
|
+
return text;
|
|
83
|
+
}
|
|
84
|
+
export class TestLspServer extends LspServer {
|
|
104
85
|
constructor() {
|
|
105
86
|
super(...arguments);
|
|
106
87
|
this.workspaceEdits = [];
|
|
107
88
|
}
|
|
108
89
|
}
|
|
109
|
-
|
|
110
|
-
function createServer(options) {
|
|
90
|
+
export function createServer(options) {
|
|
111
91
|
return __awaiter(this, void 0, void 0, function* () {
|
|
112
|
-
const typescriptVersionProvider = new
|
|
92
|
+
const typescriptVersionProvider = new TypeScriptVersionProvider();
|
|
113
93
|
const bundled = typescriptVersionProvider.bundledVersion();
|
|
114
|
-
const logger = new
|
|
94
|
+
const logger = new ConsoleLogger(CONSOLE_LOG_LEVEL);
|
|
115
95
|
const server = new TestLspServer({
|
|
116
96
|
logger,
|
|
117
97
|
tsserverPath: bundled.tsServerPath,
|
|
118
98
|
tsserverLogVerbosity: options.tsserverLogVerbosity,
|
|
119
|
-
tsserverLogFile: path.resolve(
|
|
99
|
+
tsserverLogFile: path.resolve(PACKAGE_ROOT, 'tsserver.log'),
|
|
120
100
|
lspClient: {
|
|
121
101
|
setClientCapabilites() { },
|
|
122
102
|
createProgressReporter() {
|
|
@@ -155,5 +135,4 @@ function createServer(options) {
|
|
|
155
135
|
return server;
|
|
156
136
|
});
|
|
157
137
|
}
|
|
158
|
-
exports.createServer = createServer;
|
|
159
138
|
//# sourceMappingURL=test-utils.js.map
|
package/lib/test-utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test-utils.js","sourceRoot":"","sources":["../src/test-utils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"test-utils.js","sourceRoot":"","sources":["../src/test-utils.ts"],"names":[],"mappings":"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"}
|
package/lib/ts-protocol.d.ts
CHANGED
|
@@ -2,8 +2,8 @@
|
|
|
2
2
|
* **IMPORTANT** this module should not depend on `vscode-languageserver` only protocol and types
|
|
3
3
|
*/
|
|
4
4
|
import * as lsp from 'vscode-languageserver-protocol';
|
|
5
|
-
import
|
|
6
|
-
import { InlayHintsOptions } from './lsp-protocol.inlayHints.proposed';
|
|
5
|
+
import type tsp from 'typescript/lib/protocol.d.js';
|
|
6
|
+
import { InlayHintsOptions } from './lsp-protocol.inlayHints.proposed.js';
|
|
7
7
|
export declare namespace TypeScriptRenameRequest {
|
|
8
8
|
const type: lsp.RequestType<lsp.TextDocumentPositionParams, void, void>;
|
|
9
9
|
}
|
|
@@ -15,6 +15,9 @@ export declare class DisplayPartKind {
|
|
|
15
15
|
static readonly punctuation = "punctuation";
|
|
16
16
|
static readonly text = "text";
|
|
17
17
|
}
|
|
18
|
+
export interface SupportedFeatures {
|
|
19
|
+
labelDetails?: boolean;
|
|
20
|
+
}
|
|
18
21
|
export interface TypeScriptPlugin {
|
|
19
22
|
name: string;
|
|
20
23
|
location: string;
|
|
@@ -26,7 +29,7 @@ export interface TypeScriptInitializationOptions {
|
|
|
26
29
|
npmLocation?: string;
|
|
27
30
|
locale?: string;
|
|
28
31
|
plugins: TypeScriptPlugin[];
|
|
29
|
-
preferences?: UserPreferences;
|
|
32
|
+
preferences?: tsp.UserPreferences;
|
|
30
33
|
hostInfo?: string;
|
|
31
34
|
}
|
|
32
35
|
export declare type TypeScriptInitializeParams = lsp.InitializeParams & {
|
|
@@ -36,7 +39,7 @@ export interface TypeScriptInitializeResult extends lsp.InitializeResult {
|
|
|
36
39
|
logFileUri?: string;
|
|
37
40
|
}
|
|
38
41
|
export interface TypeScriptWorkspaceSettingsLanguageSettings {
|
|
39
|
-
format?: FormatCodeSettings;
|
|
42
|
+
format?: tsp.FormatCodeSettings;
|
|
40
43
|
inlayHints?: InlayHintsOptions;
|
|
41
44
|
}
|
|
42
45
|
interface TypeScriptWorkspaceSettingsDiagnostics {
|
package/lib/ts-protocol.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ts-protocol.d.ts","sourceRoot":"","sources":["../src/ts-protocol.ts"],"names":[],"mappings":"AAOA;;GAEG;AACH,OAAO,KAAK,GAAG,MAAM,gCAAgC,CAAC;AACtD,OAAO,
|
|
1
|
+
{"version":3,"file":"ts-protocol.d.ts","sourceRoot":"","sources":["../src/ts-protocol.ts"],"names":[],"mappings":"AAOA;;GAEG;AACH,OAAO,KAAK,GAAG,MAAM,gCAAgC,CAAC;AACtD,OAAO,KAAK,GAAG,MAAM,8BAA8B,CAAC;AACpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAE1E,yBAAiB,uBAAuB,CAAC;IAC9B,MAAM,IAAI,6DAAwF,CAAC;CAC7G;AAED,qBAAa,eAAe;IACxB,gBAAuB,YAAY,kBAAkB;IACrD,gBAAuB,UAAU,gBAAgB;IACjD,gBAAuB,aAAa,mBAAmB;IACvD,gBAAuB,YAAY,kBAAkB;IACrD,gBAAuB,WAAW,iBAAiB;IACnD,gBAAuB,IAAI,UAAU;CACxC;AAED,MAAM,WAAW,iBAAiB;IAC9B,YAAY,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED,MAAM,WAAW,gBAAgB;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,+BAA+B;IAC5C,iCAAiC,CAAC,EAAE,OAAO,CAAC;IAC5C,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,gBAAgB,EAAE,CAAC;IAC5B,WAAW,CAAC,EAAE,GAAG,CAAC,eAAe,CAAC;IAClC,QAAQ,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,oBAAY,0BAA0B,GAAG,GAAG,CAAC,gBAAgB,GAAG;IAC5D,qBAAqB,CAAC,EAAE,OAAO,CAAC,+BAA+B,CAAC,CAAC;CACpE,CAAC;AAEF,MAAM,WAAW,0BAA2B,SAAQ,GAAG,CAAC,gBAAgB;IACpE,UAAU,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,2CAA2C;IACxD,MAAM,CAAC,EAAE,GAAG,CAAC,kBAAkB,CAAC;IAChC,UAAU,CAAC,EAAE,iBAAiB,CAAC;CAClC;AAED,UAAU,sCAAsC;IAC5C,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;CAC3B;AAED,MAAM,WAAW,2BAA2B;IACxC,UAAU,CAAC,EAAE,2CAA2C,CAAC;IACzD,UAAU,CAAC,EAAE,2CAA2C,CAAC;IACzD,WAAW,CAAC,EAAE,iBAAiB,CAAC;IAChC,WAAW,CAAC,EAAE,sCAAsC,CAAC;CACxD;AAED,MAAM,WAAW,iBAAiB;IAC9B,qBAAqB,CAAC,EAAE,OAAO,CAAC;CACnC"}
|
package/lib/ts-protocol.js
CHANGED
|
@@ -1,46 +1,19 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
/*
|
|
3
2
|
* Copyright (C) 2018 TypeFox and others.
|
|
4
3
|
*
|
|
5
4
|
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License.
|
|
6
5
|
* You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
|
|
7
6
|
*/
|
|
8
|
-
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
9
|
-
if (k2 === undefined) k2 = k;
|
|
10
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
11
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
12
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
13
|
-
}
|
|
14
|
-
Object.defineProperty(o, k2, desc);
|
|
15
|
-
}) : (function(o, m, k, k2) {
|
|
16
|
-
if (k2 === undefined) k2 = k;
|
|
17
|
-
o[k2] = m[k];
|
|
18
|
-
}));
|
|
19
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
20
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
21
|
-
}) : function(o, v) {
|
|
22
|
-
o["default"] = v;
|
|
23
|
-
});
|
|
24
|
-
var __importStar = (this && this.__importStar) || function (mod) {
|
|
25
|
-
if (mod && mod.__esModule) return mod;
|
|
26
|
-
var result = {};
|
|
27
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
28
|
-
__setModuleDefault(result, mod);
|
|
29
|
-
return result;
|
|
30
|
-
};
|
|
31
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
32
|
-
exports.DisplayPartKind = exports.TypeScriptRenameRequest = void 0;
|
|
33
7
|
/**
|
|
34
8
|
* **IMPORTANT** this module should not depend on `vscode-languageserver` only protocol and types
|
|
35
9
|
*/
|
|
36
|
-
|
|
37
|
-
var TypeScriptRenameRequest;
|
|
10
|
+
import * as lsp from 'vscode-languageserver-protocol';
|
|
11
|
+
export var TypeScriptRenameRequest;
|
|
38
12
|
(function (TypeScriptRenameRequest) {
|
|
39
13
|
TypeScriptRenameRequest.type = new lsp.RequestType('_typescript.rename');
|
|
40
|
-
})(TypeScriptRenameRequest =
|
|
41
|
-
class DisplayPartKind {
|
|
14
|
+
})(TypeScriptRenameRequest = TypeScriptRenameRequest || (TypeScriptRenameRequest = {}));
|
|
15
|
+
export class DisplayPartKind {
|
|
42
16
|
}
|
|
43
|
-
exports.DisplayPartKind = DisplayPartKind;
|
|
44
17
|
DisplayPartKind.functionName = 'functionName';
|
|
45
18
|
DisplayPartKind.methodName = 'methodName';
|
|
46
19
|
DisplayPartKind.parameterName = 'parameterName';
|
package/lib/ts-protocol.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ts-protocol.js","sourceRoot":"","sources":["../src/ts-protocol.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ts-protocol.js","sourceRoot":"","sources":["../src/ts-protocol.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH;;GAEG;AACH,OAAO,KAAK,GAAG,MAAM,gCAAgC,CAAC;AAItD,MAAM,KAAW,uBAAuB,CAEvC;AAFD,WAAiB,uBAAuB;IACvB,4BAAI,GAAG,IAAI,GAAG,CAAC,WAAW,CAA6C,oBAAoB,CAAC,CAAC;AAC9G,CAAC,EAFgB,uBAAuB,GAAvB,uBAAuB,KAAvB,uBAAuB,QAEvC;AAED,MAAM,OAAO,eAAe;;AACD,4BAAY,GAAG,cAAc,CAAC;AAC9B,0BAAU,GAAG,YAAY,CAAC;AAC1B,6BAAa,GAAG,eAAe,CAAC;AAChC,4BAAY,GAAG,cAAc,CAAC;AAC9B,2BAAW,GAAG,aAAa,CAAC;AAC5B,oBAAI,GAAG,MAAM,CAAC"}
|
package/lib/tsp-client.d.ts
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
/// <reference types="node" />
|
|
2
|
-
import
|
|
3
|
-
import { CommandTypes } from './tsp-command-types';
|
|
4
|
-
import { Logger } from './logger';
|
|
1
|
+
/// <reference types="node" resolution-mode="require"/>
|
|
2
|
+
import type tsp from 'typescript/lib/protocol.d.js';
|
|
5
3
|
import { CancellationToken } from 'vscode-jsonrpc';
|
|
4
|
+
import { CommandTypes } from './tsp-command-types.js';
|
|
5
|
+
import { Logger } from './logger.js';
|
|
6
6
|
export interface TspClientOptions {
|
|
7
7
|
logger: Logger;
|
|
8
8
|
tsserverPath: string;
|
|
@@ -14,48 +14,47 @@ export interface TspClientOptions {
|
|
|
14
14
|
locale?: string;
|
|
15
15
|
globalPlugins?: string[];
|
|
16
16
|
pluginProbeLocations?: string[];
|
|
17
|
-
onEvent?: (event:
|
|
17
|
+
onEvent?: (event: tsp.Event) => void;
|
|
18
18
|
onExit?: (exitCode: number | null, signal: NodeJS.Signals | null) => void;
|
|
19
19
|
}
|
|
20
20
|
interface TypeScriptRequestTypes {
|
|
21
|
-
'geterr': [
|
|
22
|
-
'compilerOptionsForInferredProjects': [
|
|
23
|
-
'documentHighlights': [
|
|
24
|
-
'applyCodeActionCommand': [
|
|
25
|
-
'completionEntryDetails': [
|
|
26
|
-
'completionInfo': [
|
|
27
|
-
'configure': [
|
|
28
|
-
'definition': [
|
|
29
|
-
'definitionAndBoundSpan': [
|
|
30
|
-
'docCommentTemplate': [
|
|
31
|
-
'format': [
|
|
32
|
-
'formatonkey': [
|
|
33
|
-
'getApplicableRefactors': [
|
|
34
|
-
'getCodeFixes': [
|
|
35
|
-
'getCombinedCodeFix': [
|
|
36
|
-
'getEditsForFileRename': [
|
|
37
|
-
'getEditsForRefactor': [
|
|
38
|
-
'getOutliningSpans': [
|
|
39
|
-
'getSupportedCodeFixes': [null,
|
|
40
|
-
'implementation': [
|
|
41
|
-
'jsxClosingTag': [
|
|
42
|
-
'navto': [
|
|
43
|
-
'navtree': [
|
|
44
|
-
'
|
|
45
|
-
'
|
|
46
|
-
'
|
|
47
|
-
'
|
|
48
|
-
'
|
|
49
|
-
'
|
|
50
|
-
'
|
|
51
|
-
'
|
|
52
|
-
'
|
|
53
|
-
'encodedSemanticClassifications-full': [protocol.EncodedSemanticClassificationsRequestArgs, protocol.EncodedSemanticClassificationsResponse];
|
|
21
|
+
'geterr': [tsp.GeterrRequestArgs, any];
|
|
22
|
+
'compilerOptionsForInferredProjects': [tsp.SetCompilerOptionsForInferredProjectsArgs, tsp.SetCompilerOptionsForInferredProjectsResponse];
|
|
23
|
+
'documentHighlights': [tsp.DocumentHighlightsRequestArgs, tsp.DocumentHighlightsResponse];
|
|
24
|
+
'applyCodeActionCommand': [tsp.ApplyCodeActionCommandRequestArgs, tsp.ApplyCodeActionCommandResponse];
|
|
25
|
+
'completionEntryDetails': [tsp.CompletionDetailsRequestArgs, tsp.CompletionDetailsResponse];
|
|
26
|
+
'completionInfo': [tsp.CompletionsRequestArgs, tsp.CompletionInfoResponse];
|
|
27
|
+
'configure': [tsp.ConfigureRequestArguments, tsp.ConfigureResponse];
|
|
28
|
+
'definition': [tsp.FileLocationRequestArgs, tsp.DefinitionResponse];
|
|
29
|
+
'definitionAndBoundSpan': [tsp.FileLocationRequestArgs, tsp.DefinitionInfoAndBoundSpanResponse];
|
|
30
|
+
'docCommentTemplate': [tsp.FileLocationRequestArgs, tsp.DocCommandTemplateResponse];
|
|
31
|
+
'format': [tsp.FormatRequestArgs, tsp.FormatResponse];
|
|
32
|
+
'formatonkey': [tsp.FormatOnKeyRequestArgs, tsp.FormatResponse];
|
|
33
|
+
'getApplicableRefactors': [tsp.GetApplicableRefactorsRequestArgs, tsp.GetApplicableRefactorsResponse];
|
|
34
|
+
'getCodeFixes': [tsp.CodeFixRequestArgs, tsp.CodeFixResponse];
|
|
35
|
+
'getCombinedCodeFix': [tsp.GetCombinedCodeFixRequestArgs, tsp.GetCombinedCodeFixResponse];
|
|
36
|
+
'getEditsForFileRename': [tsp.GetEditsForFileRenameRequestArgs, tsp.GetEditsForFileRenameResponse];
|
|
37
|
+
'getEditsForRefactor': [tsp.GetEditsForRefactorRequestArgs, tsp.GetEditsForRefactorResponse];
|
|
38
|
+
'getOutliningSpans': [tsp.FileRequestArgs, tsp.OutliningSpansResponse];
|
|
39
|
+
'getSupportedCodeFixes': [null, tsp.GetSupportedCodeFixesResponse];
|
|
40
|
+
'implementation': [tsp.FileLocationRequestArgs, tsp.ImplementationResponse];
|
|
41
|
+
'jsxClosingTag': [tsp.JsxClosingTagRequestArgs, tsp.JsxClosingTagResponse];
|
|
42
|
+
'navto': [tsp.NavtoRequestArgs, tsp.NavtoResponse];
|
|
43
|
+
'navtree': [tsp.FileRequestArgs, tsp.NavTreeResponse];
|
|
44
|
+
'organizeImports': [tsp.OrganizeImportsRequestArgs, tsp.OrganizeImportsResponse];
|
|
45
|
+
'projectInfo': [tsp.ProjectInfoRequestArgs, tsp.ProjectInfoResponse];
|
|
46
|
+
'quickinfo': [tsp.FileLocationRequestArgs, tsp.QuickInfoResponse];
|
|
47
|
+
'references': [tsp.FileLocationRequestArgs, tsp.ReferencesResponse];
|
|
48
|
+
'rename': [tsp.RenameRequestArgs, tsp.RenameResponse];
|
|
49
|
+
'signatureHelp': [tsp.SignatureHelpRequestArgs, tsp.SignatureHelpResponse];
|
|
50
|
+
'typeDefinition': [tsp.FileLocationRequestArgs, tsp.TypeDefinitionResponse];
|
|
51
|
+
'provideInlayHints': [tsp.InlayHintsRequestArgs, tsp.InlayHintsResponse];
|
|
52
|
+
'encodedSemanticClassifications-full': [tsp.EncodedSemanticClassificationsRequestArgs, tsp.EncodedSemanticClassificationsResponse];
|
|
54
53
|
}
|
|
55
54
|
export declare class TspClient {
|
|
56
55
|
private options;
|
|
57
|
-
private readlineInterface;
|
|
58
56
|
private tsserverProc;
|
|
57
|
+
private readlineInterface;
|
|
59
58
|
private seq;
|
|
60
59
|
private readonly deferreds;
|
|
61
60
|
private logger;
|
|
@@ -64,10 +63,10 @@ export declare class TspClient {
|
|
|
64
63
|
constructor(options: TspClientOptions);
|
|
65
64
|
start(): boolean;
|
|
66
65
|
shutdown(): void;
|
|
67
|
-
notify(command: CommandTypes.Open, args:
|
|
68
|
-
notify(command: CommandTypes.Close, args:
|
|
69
|
-
notify(command: CommandTypes.Saveto, args:
|
|
70
|
-
notify(command: CommandTypes.Change, args:
|
|
66
|
+
notify(command: CommandTypes.Open, args: tsp.OpenRequestArgs): void;
|
|
67
|
+
notify(command: CommandTypes.Close, args: tsp.FileRequestArgs): void;
|
|
68
|
+
notify(command: CommandTypes.Saveto, args: tsp.SavetoRequestArgs): void;
|
|
69
|
+
notify(command: CommandTypes.Change, args: tsp.ChangeRequestArgs): void;
|
|
71
70
|
request<K extends keyof TypeScriptRequestTypes>(command: K, args: TypeScriptRequestTypes[K][0], token?: CancellationToken): Promise<TypeScriptRequestTypes[K][1]>;
|
|
72
71
|
protected sendMessage(command: string, notification: boolean, args?: any): void;
|
|
73
72
|
protected processMessage(untrimmedMessageString: string): void;
|
package/lib/tsp-client.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tsp-client.d.ts","sourceRoot":"","sources":["../src/tsp-client.ts"],"names":[],"mappings":";AAWA,OAAO,
|
|
1
|
+
{"version":3,"file":"tsp-client.d.ts","sourceRoot":"","sources":["../src/tsp-client.ts"],"names":[],"mappings":"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"}
|
package/lib/tsp-client.js
CHANGED
|
@@ -1,52 +1,23 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
/*
|
|
3
2
|
* Copyright (C) 2017, 2018 TypeFox and others.
|
|
4
3
|
*
|
|
5
4
|
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License.
|
|
6
5
|
* You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
|
|
7
6
|
*/
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
if (k2 === undefined) k2 = k;
|
|
17
|
-
o[k2] = m[k];
|
|
18
|
-
}));
|
|
19
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
20
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
21
|
-
}) : function(o, v) {
|
|
22
|
-
o["default"] = v;
|
|
23
|
-
});
|
|
24
|
-
var __importStar = (this && this.__importStar) || function (mod) {
|
|
25
|
-
if (mod && mod.__esModule) return mod;
|
|
26
|
-
var result = {};
|
|
27
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
28
|
-
__setModuleDefault(result, mod);
|
|
29
|
-
return result;
|
|
30
|
-
};
|
|
31
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
32
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
33
|
-
};
|
|
34
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
35
|
-
exports.TspClient = void 0;
|
|
36
|
-
const fs = __importStar(require("fs"));
|
|
37
|
-
const cp = __importStar(require("child_process"));
|
|
38
|
-
const readline = __importStar(require("readline"));
|
|
39
|
-
const decoder = __importStar(require("string_decoder"));
|
|
40
|
-
const tempy_1 = __importDefault(require("tempy"));
|
|
41
|
-
const logger_1 = require("./logger");
|
|
42
|
-
const utils_1 = require("./utils");
|
|
43
|
-
class TspClient {
|
|
7
|
+
import * as fs from 'node:fs';
|
|
8
|
+
import * as cp from 'node:child_process';
|
|
9
|
+
import * as readline from 'node:readline';
|
|
10
|
+
import * as decoder from 'node:string_decoder';
|
|
11
|
+
import { temporaryFile } from 'tempy';
|
|
12
|
+
import { PrefixingLogger } from './logger.js';
|
|
13
|
+
import { Deferred } from './utils.js';
|
|
14
|
+
export class TspClient {
|
|
44
15
|
constructor(options) {
|
|
45
16
|
this.options = options;
|
|
46
17
|
this.seq = 0;
|
|
47
18
|
this.deferreds = {};
|
|
48
|
-
this.logger = new
|
|
49
|
-
this.tsserverLogger = new
|
|
19
|
+
this.logger = new PrefixingLogger(options.logger, '[tsclient]');
|
|
20
|
+
this.tsserverLogger = new PrefixingLogger(options.logger, '[tsserver]');
|
|
50
21
|
}
|
|
51
22
|
start() {
|
|
52
23
|
if (this.readlineInterface) {
|
|
@@ -76,7 +47,7 @@ class TspClient {
|
|
|
76
47
|
if (locale) {
|
|
77
48
|
args.push('--locale', locale);
|
|
78
49
|
}
|
|
79
|
-
this.cancellationPipeName =
|
|
50
|
+
this.cancellationPipeName = temporaryFile({ name: 'tscancellation' });
|
|
80
51
|
args.push('--cancellationPipeName', `${this.cancellationPipeName}*`);
|
|
81
52
|
this.logger.log(`Starting tsserver : '${tsserverPath} ${args.join(' ')}'`);
|
|
82
53
|
const options = {
|
|
@@ -109,8 +80,10 @@ class TspClient {
|
|
|
109
80
|
shutdown() {
|
|
110
81
|
var _a, _b;
|
|
111
82
|
(_a = this.readlineInterface) === null || _a === void 0 ? void 0 : _a.close();
|
|
112
|
-
(
|
|
113
|
-
|
|
83
|
+
if (this.tsserverProc) {
|
|
84
|
+
(_b = this.tsserverProc.stdin) === null || _b === void 0 ? void 0 : _b.destroy();
|
|
85
|
+
this.tsserverProc.kill('SIGTERM');
|
|
86
|
+
}
|
|
114
87
|
}
|
|
115
88
|
notify(command, args) {
|
|
116
89
|
this.sendMessage(command, true, args);
|
|
@@ -118,7 +91,7 @@ class TspClient {
|
|
|
118
91
|
request(command, args, token) {
|
|
119
92
|
this.sendMessage(command, false, args);
|
|
120
93
|
const seq = this.seq;
|
|
121
|
-
const deferred = new
|
|
94
|
+
const deferred = new Deferred();
|
|
122
95
|
this.deferreds[seq] = deferred;
|
|
123
96
|
const request = deferred.promise;
|
|
124
97
|
if (token) {
|
|
@@ -147,8 +120,13 @@ class TspClient {
|
|
|
147
120
|
request.arguments = args;
|
|
148
121
|
}
|
|
149
122
|
const serializedRequest = JSON.stringify(request) + '\n';
|
|
150
|
-
this.tsserverProc
|
|
151
|
-
|
|
123
|
+
if (this.tsserverProc) {
|
|
124
|
+
this.tsserverProc.stdin.write(serializedRequest);
|
|
125
|
+
this.logger.log(notification ? 'notify' : 'request', request);
|
|
126
|
+
}
|
|
127
|
+
else {
|
|
128
|
+
this.logger.error(`Message "${command}" couldn't be sent. Tsserver process not started.`);
|
|
129
|
+
}
|
|
152
130
|
}
|
|
153
131
|
processMessage(untrimmedMessageString) {
|
|
154
132
|
const messageString = untrimmedMessageString.trim();
|
|
@@ -194,5 +172,4 @@ class TspClient {
|
|
|
194
172
|
return this.isEvent(message) && message.event === 'requestCompleted';
|
|
195
173
|
}
|
|
196
174
|
}
|
|
197
|
-
exports.TspClient = TspClient;
|
|
198
175
|
//# sourceMappingURL=tsp-client.js.map
|
package/lib/tsp-client.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tsp-client.js","sourceRoot":"","sources":["../src/tsp-client.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"tsp-client.js","sourceRoot":"","sources":["../src/tsp-client.ts"],"names":[],"mappings":"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"}
|