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 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/tsServer/server.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAChG;;;;;GAKG;
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/tsServer/server.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serverError.d.ts","sourceRoot":"","sources":["../../src/tsServer/serverError.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,GAAG,MAAM,
|
|
1
|
+
{"version":3,"file":"serverError.d.ts","sourceRoot":"","sources":["../../src/tsServer/serverError.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAE9D,qBAAa,qBAAsB,SAAQ,KAAK;aAWxB,QAAQ,EAAE,MAAM;aAChB,OAAO,EAAE,iBAAiB;IAC1C,OAAO,CAAC,QAAQ,CAAC,QAAQ;aACT,aAAa,EAAE,MAAM,GAAG,SAAS;aACjC,WAAW,EAAE,MAAM,GAAG,SAAS;WAdrC,MAAM,CAChB,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,iBAAiB,EAC1B,QAAQ,EAAE,GAAG,CAAC,QAAQ,GACvB,qBAAqB;IAKxB,OAAO;IAUP,IAAW,eAAe,IAAI,MAAM,GAAG,SAAS,CAE/C;IAED,IAAW,aAAa,IAAI,MAAM,CAEjC;IAED;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,cAAc;CAmBhC"}
|
|
@@ -9,6 +9,10 @@
|
|
|
9
9
|
* You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
|
|
10
10
|
*/
|
|
11
11
|
export class TypeScriptServerError extends Error {
|
|
12
|
+
static create(serverId, version, response) {
|
|
13
|
+
const parsedResult = TypeScriptServerError.parseErrorText(response);
|
|
14
|
+
return new TypeScriptServerError(serverId, version, response, parsedResult?.message, parsedResult?.stack);
|
|
15
|
+
}
|
|
12
16
|
constructor(serverId, version, response, serverMessage, serverStack) {
|
|
13
17
|
super(`<${serverId}> TypeScript Server Error (${version.versionString})\n${serverMessage}\n${serverStack}`);
|
|
14
18
|
this.serverId = serverId;
|
|
@@ -17,10 +21,6 @@ export class TypeScriptServerError extends Error {
|
|
|
17
21
|
this.serverMessage = serverMessage;
|
|
18
22
|
this.serverStack = serverStack;
|
|
19
23
|
}
|
|
20
|
-
static create(serverId, version, response) {
|
|
21
|
-
const parsedResult = TypeScriptServerError.parseErrorText(response);
|
|
22
|
-
return new TypeScriptServerError(serverId, version, response, parsedResult?.message, parsedResult?.stack);
|
|
23
|
-
}
|
|
24
24
|
get serverErrorText() {
|
|
25
25
|
return this.response.message;
|
|
26
26
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serverError.js","sourceRoot":"","sources":["../../src/tsServer/serverError.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAChG;;;;;GAKG;AAKH,MAAM,OAAO,qBAAsB,SAAQ,KAAK;
|
|
1
|
+
{"version":3,"file":"serverError.js","sourceRoot":"","sources":["../../src/tsServer/serverError.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAChG;;;;;GAKG;AAKH,MAAM,OAAO,qBAAsB,SAAQ,KAAK;IACrC,MAAM,CAAC,MAAM,CAChB,QAAgB,EAChB,OAA0B,EAC1B,QAAsB;QAEtB,MAAM,YAAY,GAAG,qBAAqB,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;QACpE,OAAO,IAAI,qBAAqB,CAAC,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,OAAO,EAAE,YAAY,EAAE,KAAK,CAAC,CAAC;IAC9G,CAAC;IAED,YACoB,QAAgB,EAChB,OAA0B,EACzB,QAAsB,EACvB,aAAiC,EACjC,WAA+B;QAE/C,KAAK,CAAC,IAAI,QAAQ,8BAA8B,OAAO,CAAC,aAAa,MAAM,aAAa,KAAK,WAAW,EAAE,CAAC,CAAC;QAN5F,aAAQ,GAAR,QAAQ,CAAQ;QAChB,YAAO,GAAP,OAAO,CAAmB;QACzB,aAAQ,GAAR,QAAQ,CAAc;QACvB,kBAAa,GAAb,aAAa,CAAoB;QACjC,gBAAW,GAAX,WAAW,CAAoB;IAGnD,CAAC;IAED,IAAW,eAAe;QACtB,OAAO,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC;IACjC,CAAC;IAED,IAAW,aAAa;QACpB,OAAO,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC;IACjC,CAAC;IAED;;OAEG;IACK,MAAM,CAAC,cAAc,CAAC,QAAsB;QAChD,MAAM,SAAS,GAAG,QAAQ,CAAC,OAAO,CAAC;QACnC,IAAI,SAAS,EAAE;YACX,MAAM,WAAW,GAAG,4BAA4B,CAAC;YACjD,IAAI,SAAS,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE;gBACnC,MAAM,mBAAmB,GAAG,SAAS,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;gBACjE,MAAM,YAAY,GAAG,mBAAmB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;gBACvD,IAAI,YAAY,IAAI,CAAC,EAAE;oBACnB,8CAA8C;oBAC9C,MAAM,KAAK,GAAG,mBAAmB,CAAC,SAAS,CAAC,YAAY,GAAG,CAAC,CAAC,CAAC;oBAC9D,OAAO;wBACH,OAAO,EAAE,mBAAmB,CAAC,SAAS,CAAC,CAAC,EAAE,YAAY,CAAC;wBACvD,KAAK;qBACR,CAAC;iBACL;aACJ;SACJ;QACD,OAAO,SAAS,CAAC;IACrB,CAAC;CACJ"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serverProcess.d.ts","sourceRoot":"","sources":["../../src/tsServer/serverProcess.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"serverProcess.d.ts","sourceRoot":"","sources":["../../src/tsServer/serverProcess.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,eAAe,EAAE,sBAAsB,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAE3F,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAEzD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAE9D,qBAAa,0BAA2B,YAAW,sBAAsB;IACrE,IAAI,CACA,OAAO,EAAE,iBAAiB,EAC1B,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,IAAI,EAAE,mBAAmB,EACzB,aAAa,EAAE,gBAAgB,GAChC,eAAe;CAmBrB"}
|
|
@@ -10,10 +10,11 @@
|
|
|
10
10
|
*/
|
|
11
11
|
import ChildProcess from 'node:child_process';
|
|
12
12
|
import path from 'node:path';
|
|
13
|
+
import API from '../utils/api.js';
|
|
13
14
|
export class NodeTsServerProcessFactory {
|
|
14
15
|
fork(version, args, kind, configuration) {
|
|
15
16
|
const tsServerPath = version.tsServerPath;
|
|
16
|
-
const useIpc =
|
|
17
|
+
const useIpc = version.version?.gte(API.v490);
|
|
17
18
|
const runtimeArgs = [...args];
|
|
18
19
|
if (useIpc) {
|
|
19
20
|
runtimeArgs.push('--useNodeIpc');
|
|
@@ -80,6 +81,9 @@ class IpcChildServerProcess {
|
|
|
80
81
|
onExit(handler) {
|
|
81
82
|
this._process.on('exit', handler);
|
|
82
83
|
}
|
|
84
|
+
onStdErr(handler) {
|
|
85
|
+
this._process.stderr.on('data', data => handler(data.toString()));
|
|
86
|
+
}
|
|
83
87
|
onError(handler) {
|
|
84
88
|
this._process.on('error', handler);
|
|
85
89
|
}
|
|
@@ -104,6 +108,9 @@ class StdioChildServerProcess {
|
|
|
104
108
|
onExit(handler) {
|
|
105
109
|
this._process.on('exit', handler);
|
|
106
110
|
}
|
|
111
|
+
onStdErr(handler) {
|
|
112
|
+
this._process.stderr.on('data', data => handler(data.toString()));
|
|
113
|
+
}
|
|
107
114
|
onError(handler) {
|
|
108
115
|
this._process.on('error', handler);
|
|
109
116
|
this.reader.onError(handler);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serverProcess.js","sourceRoot":"","sources":["../../src/tsServer/serverProcess.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAChG;;;;;GAKG;AAEH,OAAO,YAAY,MAAM,oBAAoB,CAAC;AAC9C,OAAO,IAAI,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"serverProcess.js","sourceRoot":"","sources":["../../src/tsServer/serverProcess.ts"],"names":[],"mappings":"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"}
|
package/lib/tsServer/tracer.d.ts
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
|
-
import type tsp from '
|
|
1
|
+
import type { tsp } from '../ts-protocol.js';
|
|
2
2
|
import { Logger } from '../utils/logger.js';
|
|
3
3
|
export declare enum Trace {
|
|
4
4
|
Off = 0,
|
|
5
5
|
Messages = 1,
|
|
6
6
|
Verbose = 2
|
|
7
7
|
}
|
|
8
|
-
export
|
|
8
|
+
export type TraceValue = 'off' | 'messages' | 'verbose';
|
|
9
9
|
export declare namespace Trace {
|
|
10
10
|
function fromString(value: string): Trace;
|
|
11
11
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tracer.d.ts","sourceRoot":"","sources":["../../src/tsServer/tracer.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,GAAG,MAAM,
|
|
1
|
+
{"version":3,"file":"tracer.d.ts","sourceRoot":"","sources":["../../src/tsServer/tracer.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAE5C,oBAAY,KAAK;IACb,GAAG,IAAA;IACH,QAAQ,IAAA;IACR,OAAO,IAAA;CACV;AAED,MAAM,MAAM,UAAU,GAAG,KAAK,GAAG,UAAU,GAAG,SAAS,CAAC;AAExD,yBAAiB,KAAK,CAAC;IACnB,SAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,KAAK,CAY/C;CACJ;AAED,UAAU,wBAAwB;IAC9B,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;CACrC;AAED,MAAM,CAAC,OAAO,OAAO,MAAM;IAEnB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,KAAK;gBADL,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,KAAK;IAI1B,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,gBAAgB,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,GAAG,IAAI;IAW1G,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,CAAC,QAAQ,EAAE,IAAI,EAAE,wBAAwB,GAAG,IAAI;IAW7F,qBAAqB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,wBAAwB,GAAG,GAAG;IAOlH,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,CAAC,KAAK,GAAG,IAAI;IAWpD,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,GAAG,GAAG,IAAI;CAKvE"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import API from '../utils/api.js';
|
|
2
|
-
import type { TypeScriptServiceConfiguration } from '../utils/configuration.js';
|
|
3
2
|
import type { Logger } from '../utils/logger.js';
|
|
4
3
|
export declare const enum TypeScriptVersionSource {
|
|
5
4
|
Bundled = "bundled",
|
|
@@ -10,12 +9,9 @@ export declare class TypeScriptVersion {
|
|
|
10
9
|
readonly source: TypeScriptVersionSource;
|
|
11
10
|
readonly path: string;
|
|
12
11
|
private readonly logger;
|
|
13
|
-
private readonly _pathLabel?;
|
|
14
12
|
private _api;
|
|
15
|
-
constructor(source: TypeScriptVersionSource, path: string, logger: Logger
|
|
16
|
-
get tscPath(): string;
|
|
13
|
+
constructor(source: TypeScriptVersionSource, path: string, logger: Logger);
|
|
17
14
|
get tsServerPath(): string;
|
|
18
|
-
get pathLabel(): string;
|
|
19
15
|
get isValid(): boolean;
|
|
20
16
|
get version(): API | null;
|
|
21
17
|
get versionString(): string | null;
|
|
@@ -23,9 +19,9 @@ export declare class TypeScriptVersion {
|
|
|
23
19
|
}
|
|
24
20
|
export declare const MODULE_FOLDERS: string[];
|
|
25
21
|
export declare class TypeScriptVersionProvider {
|
|
26
|
-
private
|
|
22
|
+
private userTsserverPath;
|
|
27
23
|
private logger;
|
|
28
|
-
constructor(
|
|
24
|
+
constructor(userTsserverPath: string | undefined, logger: Logger);
|
|
29
25
|
getUserSettingVersion(): TypeScriptVersion | null;
|
|
30
26
|
getWorkspaceVersion(workspaceFolders: string[]): TypeScriptVersion | null;
|
|
31
27
|
bundledVersion(): TypeScriptVersion | null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"versionProvider.d.ts","sourceRoot":"","sources":["../../src/tsServer/versionProvider.ts"],"names":[],"mappings":"AAgBA,OAAO,GAAG,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"versionProvider.d.ts","sourceRoot":"","sources":["../../src/tsServer/versionProvider.ts"],"names":[],"mappings":"AAgBA,OAAO,GAAG,MAAM,iBAAiB,CAAC;AAElC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAEjD,0BAAkB,uBAAuB;IACrC,OAAO,YAAY;IACnB,WAAW,iBAAiB;IAC5B,SAAS,cAAc;CAC1B;AAED,qBAAa,iBAAiB;aAGN,MAAM,EAAE,uBAAuB;aAC/B,IAAI,EAAE,MAAM;IAC5B,OAAO,CAAC,QAAQ,CAAC,MAAM;IAJ3B,OAAO,CAAC,IAAI,CAAyB;gBAEjB,MAAM,EAAE,uBAAuB,EAC/B,IAAI,EAAE,MAAM,EACX,MAAM,EAAE,MAAM;IAKnC,IAAW,YAAY,IAAI,MAAM,CAEhC;IAED,IAAW,OAAO,IAAI,OAAO,CAE5B;IAED,IAAW,OAAO,IAAI,GAAG,GAAG,IAAI,CAM/B;IAED,IAAW,aAAa,IAAI,MAAM,GAAG,IAAI,CAGxC;IAED,OAAO,CAAC,oBAAoB;CA0C/B;AAED,eAAO,MAAM,cAAc,UAAgG,CAAC;AAE5H,qBAAa,yBAAyB;IACf,OAAO,CAAC,gBAAgB;IAAsB,OAAO,CAAC,MAAM;gBAApD,gBAAgB,EAAE,MAAM,GAAG,SAAS,EAAU,MAAM,EAAE,MAAM;IAEhF,qBAAqB,IAAI,iBAAiB,GAAG,IAAI;IA4CjD,mBAAmB,CAAC,gBAAgB,EAAE,MAAM,EAAE,GAAG,iBAAiB,GAAG,IAAI;IAczE,cAAc,IAAI,iBAAiB,GAAG,IAAI;CAYpD"}
|
|
@@ -16,21 +16,14 @@ import { pkgUpSync } from 'pkg-up';
|
|
|
16
16
|
import API from '../utils/api.js';
|
|
17
17
|
import { findPathToModule } from '../utils/modules-resolver.js';
|
|
18
18
|
export class TypeScriptVersion {
|
|
19
|
-
constructor(source, path, logger
|
|
19
|
+
constructor(source, path, logger) {
|
|
20
20
|
this.source = source;
|
|
21
21
|
this.path = path;
|
|
22
22
|
this.logger = logger;
|
|
23
|
-
this._pathLabel = _pathLabel;
|
|
24
23
|
this._api = null;
|
|
25
24
|
}
|
|
26
|
-
get tscPath() {
|
|
27
|
-
return path.resolve(this.path, '../bin/tsc');
|
|
28
|
-
}
|
|
29
25
|
get tsServerPath() {
|
|
30
|
-
return
|
|
31
|
-
}
|
|
32
|
-
get pathLabel() {
|
|
33
|
-
return typeof this._pathLabel === 'undefined' ? this.path : this._pathLabel;
|
|
26
|
+
return this.path;
|
|
34
27
|
}
|
|
35
28
|
get isValid() {
|
|
36
29
|
return this.version !== null;
|
|
@@ -90,20 +83,19 @@ export class TypeScriptVersion {
|
|
|
90
83
|
}
|
|
91
84
|
export const MODULE_FOLDERS = ['node_modules/typescript/lib', '.vscode/pnpify/typescript/lib', '.yarn/sdks/typescript/lib'];
|
|
92
85
|
export class TypeScriptVersionProvider {
|
|
93
|
-
constructor(
|
|
94
|
-
this.
|
|
86
|
+
constructor(userTsserverPath, logger) {
|
|
87
|
+
this.userTsserverPath = userTsserverPath;
|
|
95
88
|
this.logger = logger;
|
|
96
89
|
}
|
|
97
90
|
getUserSettingVersion() {
|
|
98
|
-
|
|
99
|
-
if (!tsserverPath) {
|
|
91
|
+
if (!this.userTsserverPath) {
|
|
100
92
|
return null;
|
|
101
93
|
}
|
|
102
|
-
this.logger.log(`Resolving user-provided tsserver path "${
|
|
103
|
-
let resolvedPath =
|
|
94
|
+
this.logger.log(`Resolving user-provided tsserver path "${this.userTsserverPath}"...`);
|
|
95
|
+
let resolvedPath = this.userTsserverPath;
|
|
104
96
|
// Resolve full path to the binary if path is not absolute.
|
|
105
97
|
if (!path.isAbsolute(resolvedPath)) {
|
|
106
|
-
const binaryPath = which.sync(
|
|
98
|
+
const binaryPath = which.sync(resolvedPath, { nothrow: true });
|
|
107
99
|
if (binaryPath) {
|
|
108
100
|
resolvedPath = binaryPath;
|
|
109
101
|
}
|
|
@@ -118,6 +110,10 @@ export class TypeScriptVersionProvider {
|
|
|
118
110
|
// Get directory path
|
|
119
111
|
stat = fs.lstatSync(resolvedPath, { throwIfNoEntry: false });
|
|
120
112
|
if (stat?.isFile()) {
|
|
113
|
+
if (path.basename(resolvedPath) === 'tsserver.js') {
|
|
114
|
+
this.logger.log(`Resolved tsserver location: ${resolvedPath}`);
|
|
115
|
+
return new TypeScriptVersion("user-setting" /* TypeScriptVersionSource.UserSetting */, resolvedPath, this.logger);
|
|
116
|
+
}
|
|
121
117
|
resolvedPath = path.dirname(resolvedPath);
|
|
122
118
|
this.logger.log(`Resolved directory path from a file path: ${resolvedPath}`);
|
|
123
119
|
}
|
|
@@ -126,20 +122,21 @@ export class TypeScriptVersionProvider {
|
|
|
126
122
|
const packageJsonPath = pkgUpSync({ cwd: resolvedPath });
|
|
127
123
|
this.logger.log(`Resolved package.json location: "${packageJsonPath}"`);
|
|
128
124
|
if (packageJsonPath) {
|
|
129
|
-
resolvedPath = path.join(path.dirname(packageJsonPath), 'lib');
|
|
130
|
-
this.logger.log(`
|
|
125
|
+
resolvedPath = path.join(path.dirname(packageJsonPath), 'lib', 'tsserver.js');
|
|
126
|
+
this.logger.log(`Resolved tsserver location: "${resolvedPath}"`);
|
|
131
127
|
}
|
|
132
128
|
}
|
|
133
129
|
catch {
|
|
134
130
|
// ignore
|
|
135
131
|
}
|
|
136
|
-
return new TypeScriptVersion("user-setting" /* TypeScriptVersionSource.UserSetting */, resolvedPath, this.logger
|
|
132
|
+
return new TypeScriptVersion("user-setting" /* TypeScriptVersionSource.UserSetting */, resolvedPath, this.logger);
|
|
137
133
|
}
|
|
138
134
|
getWorkspaceVersion(workspaceFolders) {
|
|
139
135
|
for (const p of workspaceFolders) {
|
|
140
136
|
const libFolder = findPathToModule(p, MODULE_FOLDERS);
|
|
141
137
|
if (libFolder) {
|
|
142
|
-
const
|
|
138
|
+
const tsServerPath = path.join(libFolder, 'tsserver.js');
|
|
139
|
+
const version = new TypeScriptVersion("workspace" /* TypeScriptVersionSource.Workspace */, tsServerPath, this.logger);
|
|
143
140
|
if (version.isValid) {
|
|
144
141
|
return version;
|
|
145
142
|
}
|
|
@@ -151,7 +148,8 @@ export class TypeScriptVersionProvider {
|
|
|
151
148
|
const require = createRequire(import.meta.url);
|
|
152
149
|
try {
|
|
153
150
|
const file = require.resolve('typescript');
|
|
154
|
-
const
|
|
151
|
+
const tsServerPath = path.join(path.dirname(file), 'tsserver.js');
|
|
152
|
+
const bundledVersion = new TypeScriptVersion("bundled" /* TypeScriptVersionSource.Bundled */, tsServerPath, this.logger);
|
|
155
153
|
return bundledVersion;
|
|
156
154
|
}
|
|
157
155
|
catch (e) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"versionProvider.js","sourceRoot":"","sources":["../../src/tsServer/versionProvider.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAChG;;;;;GAKG;AAEH,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AACnC,OAAO,GAAG,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"versionProvider.js","sourceRoot":"","sources":["../../src/tsServer/versionProvider.ts"],"names":[],"mappings":"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"}
|
package/lib/tsp-client.d.ts
CHANGED
|
@@ -1,15 +1,15 @@
|
|
|
1
1
|
/// <reference types="node" resolution-mode="require"/>
|
|
2
|
-
import type tsp from 'typescript/lib/protocol.d.js';
|
|
3
2
|
import type { CancellationToken } from 'vscode-jsonrpc';
|
|
4
|
-
import { CommandTypes } from './tsp-command-types.js';
|
|
5
3
|
import { Logger } from './utils/logger.js';
|
|
6
4
|
import API from './utils/api.js';
|
|
5
|
+
import { tsp } from './ts-protocol.js';
|
|
7
6
|
import type { ILogDirectoryProvider } from './tsServer/logDirectoryProvider.js';
|
|
8
7
|
import { ExecConfig, ServerResponse, TypeScriptRequestTypes } from './tsServer/requests.js';
|
|
9
8
|
import { Trace } from './tsServer/tracer.js';
|
|
10
9
|
import type { TypeScriptVersion } from './tsServer/versionProvider.js';
|
|
11
10
|
import type { LspClient } from './lsp-client.js';
|
|
12
11
|
import type { TsServerLogLevel } from './utils/configuration.js';
|
|
12
|
+
import CommandTypes = tsp.CommandTypes;
|
|
13
13
|
export interface TspClientOptions {
|
|
14
14
|
lspClient: LspClient;
|
|
15
15
|
trace: Trace;
|
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":";
|
|
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
|
@@ -10,10 +10,12 @@
|
|
|
10
10
|
*/
|
|
11
11
|
import { PrefixingLogger } from './utils/logger.js';
|
|
12
12
|
import API from './utils/api.js';
|
|
13
|
+
import { tsp } from './ts-protocol.js';
|
|
13
14
|
import { ServerResponse } from './tsServer/requests.js';
|
|
14
15
|
import { TypeScriptServerError } from './tsServer/serverError.js';
|
|
15
16
|
import { TypeScriptServerSpawner } from './tsServer/spawner.js';
|
|
16
17
|
import Tracer from './tsServer/tracer.js';
|
|
18
|
+
var CommandTypes = tsp.CommandTypes;
|
|
17
19
|
class ServerInitializingIndicator {
|
|
18
20
|
constructor(lspClient) {
|
|
19
21
|
this.lspClient = lspClient;
|
|
@@ -21,27 +23,24 @@ class ServerInitializingIndicator {
|
|
|
21
23
|
reset() {
|
|
22
24
|
if (this._loadingProjectName) {
|
|
23
25
|
this._loadingProjectName = undefined;
|
|
24
|
-
if (this.
|
|
25
|
-
this.
|
|
26
|
-
this.
|
|
26
|
+
if (this._task) {
|
|
27
|
+
const task = this._task;
|
|
28
|
+
this._task = undefined;
|
|
29
|
+
task.then(reporter => reporter.done());
|
|
27
30
|
}
|
|
28
31
|
}
|
|
29
32
|
}
|
|
30
|
-
|
|
33
|
+
startedLoadingProject(projectName) {
|
|
31
34
|
// TS projects are loaded sequentially. Cancel existing task because it should always be resolved before
|
|
32
35
|
// the incoming project loading task is.
|
|
33
36
|
this.reset();
|
|
34
37
|
this._loadingProjectName = projectName;
|
|
35
|
-
this.
|
|
36
|
-
this.
|
|
38
|
+
this._task = this.lspClient.createProgressReporter();
|
|
39
|
+
this._task.then(reporter => reporter.begin('Initializing JS/TS language features…'));
|
|
37
40
|
}
|
|
38
41
|
finishedLoadingProject(projectName) {
|
|
39
42
|
if (this._loadingProjectName === projectName) {
|
|
40
|
-
this.
|
|
41
|
-
if (this._progressReporter) {
|
|
42
|
-
this._progressReporter.done();
|
|
43
|
-
this._progressReporter = undefined;
|
|
44
|
-
}
|
|
43
|
+
this.reset();
|
|
45
44
|
}
|
|
46
45
|
}
|
|
47
46
|
}
|
|
@@ -59,12 +58,18 @@ export class TspClient {
|
|
|
59
58
|
const tsServerSpawner = new TypeScriptServerSpawner(this.apiVersion, this.options.logDirectoryProvider, this.logger, this.tracer);
|
|
60
59
|
const tsServer = tsServerSpawner.spawn(this.options.typescriptVersion, this.options);
|
|
61
60
|
tsServer.onExit((data) => {
|
|
61
|
+
this.primaryTsServer = null;
|
|
62
62
|
this.shutdown();
|
|
63
63
|
this.tsserverLogger.error(`Exited. Code: ${data.code}. Signal: ${data.signal}`);
|
|
64
64
|
if (this.options.onExit) {
|
|
65
65
|
this.options.onExit(data.code, data.signal);
|
|
66
66
|
}
|
|
67
67
|
});
|
|
68
|
+
tsServer.onStdErr((error) => {
|
|
69
|
+
if (error) {
|
|
70
|
+
this.logger.error(error);
|
|
71
|
+
}
|
|
72
|
+
});
|
|
68
73
|
tsServer.onError((err) => {
|
|
69
74
|
if (err) {
|
|
70
75
|
this.tsserverLogger.error('Exited with error. Error message is: {0}', err.message || err.name);
|
|
@@ -136,7 +141,7 @@ export class TspClient {
|
|
|
136
141
|
this.executeWithoutWaitingForResponse(command, args);
|
|
137
142
|
}
|
|
138
143
|
requestGeterr(args, token) {
|
|
139
|
-
return this.executeAsync(
|
|
144
|
+
return this.executeAsync(CommandTypes.Geterr, args, token);
|
|
140
145
|
}
|
|
141
146
|
request(command, args, token, config) {
|
|
142
147
|
return this.execute(command, args, token, config);
|
|
@@ -176,7 +181,7 @@ export class TspClient {
|
|
|
176
181
|
if (config?.nonRecoverable) {
|
|
177
182
|
executions[0].catch(err => this.fatalError(command, err));
|
|
178
183
|
}
|
|
179
|
-
if (command ===
|
|
184
|
+
if (command === CommandTypes.UpdateOpen) {
|
|
180
185
|
// If update open has completed, consider that the project has loaded
|
|
181
186
|
Promise.all(executions).then(() => {
|
|
182
187
|
this.loadingIndicator.reset();
|
package/lib/tsp-client.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tsp-client.js","sourceRoot":"","sources":["../src/tsp-client.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAChG;;;;;GAKG;
|
|
1
|
+
{"version":3,"file":"tsp-client.js","sourceRoot":"","sources":["../src/tsp-client.ts"],"names":[],"mappings":"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"}
|
package/lib/tsp-client.spec.js
CHANGED
|
@@ -8,10 +8,12 @@ import * as chai from 'chai';
|
|
|
8
8
|
import { TspClient } from './tsp-client.js';
|
|
9
9
|
import { ConsoleLogger } from './utils/logger.js';
|
|
10
10
|
import { filePath, readContents, TestLspClient, uri } from './test-utils.js';
|
|
11
|
+
import { tsp } from './ts-protocol.js';
|
|
11
12
|
import { Trace } from './tsServer/tracer.js';
|
|
12
13
|
import { TypeScriptVersionProvider } from './tsServer/versionProvider.js';
|
|
13
14
|
import { TsServerLogLevel } from './utils/configuration.js';
|
|
14
15
|
import { noopLogDirectoryProvider } from './tsServer/logDirectoryProvider.js';
|
|
16
|
+
var CommandTypes = tsp.CommandTypes;
|
|
15
17
|
const assert = chai.assert;
|
|
16
18
|
const logger = new ConsoleLogger();
|
|
17
19
|
const lspClientOptions = {
|
|
@@ -24,7 +26,7 @@ const configuration = {
|
|
|
24
26
|
lspClient,
|
|
25
27
|
tsserverLogVerbosity: TsServerLogLevel.Off,
|
|
26
28
|
};
|
|
27
|
-
const typescriptVersionProvider = new TypeScriptVersionProvider(configuration, logger);
|
|
29
|
+
const typescriptVersionProvider = new TypeScriptVersionProvider(configuration.tsserverPath, logger);
|
|
28
30
|
const bundled = typescriptVersionProvider.bundledVersion();
|
|
29
31
|
let server;
|
|
30
32
|
before(() => {
|
|
@@ -45,11 +47,11 @@ describe('ts server client', () => {
|
|
|
45
47
|
});
|
|
46
48
|
it('completion', async () => {
|
|
47
49
|
const f = filePath('module2.ts');
|
|
48
|
-
server.notify(
|
|
50
|
+
server.notify(CommandTypes.Open, {
|
|
49
51
|
file: f,
|
|
50
52
|
fileContent: readContents(f),
|
|
51
53
|
});
|
|
52
|
-
const completions = await server.request(
|
|
54
|
+
const completions = await server.request(CommandTypes.CompletionInfo, {
|
|
53
55
|
file: f,
|
|
54
56
|
line: 1,
|
|
55
57
|
offset: 0,
|
|
@@ -60,11 +62,11 @@ describe('ts server client', () => {
|
|
|
60
62
|
});
|
|
61
63
|
it('references', async () => {
|
|
62
64
|
const f = filePath('module2.ts');
|
|
63
|
-
server.notify(
|
|
65
|
+
server.notify(CommandTypes.Open, {
|
|
64
66
|
file: f,
|
|
65
67
|
fileContent: readContents(f),
|
|
66
68
|
});
|
|
67
|
-
const references = await server.request(
|
|
69
|
+
const references = await server.request(CommandTypes.References, {
|
|
68
70
|
file: f,
|
|
69
71
|
line: 8,
|
|
70
72
|
offset: 16,
|
|
@@ -74,16 +76,16 @@ describe('ts server client', () => {
|
|
|
74
76
|
});
|
|
75
77
|
it('inlayHints', async () => {
|
|
76
78
|
const f = filePath('module2.ts');
|
|
77
|
-
server.notify(
|
|
79
|
+
server.notify(CommandTypes.Open, {
|
|
78
80
|
file: f,
|
|
79
81
|
fileContent: readContents(f),
|
|
80
82
|
});
|
|
81
|
-
await server.request(
|
|
83
|
+
await server.request(CommandTypes.Configure, {
|
|
82
84
|
preferences: {
|
|
83
85
|
includeInlayFunctionLikeReturnTypeHints: true,
|
|
84
86
|
},
|
|
85
87
|
});
|
|
86
|
-
const inlayHints = await server.request(
|
|
88
|
+
const inlayHints = await server.request(CommandTypes.ProvideInlayHints, {
|
|
87
89
|
file: f,
|
|
88
90
|
start: 0,
|
|
89
91
|
length: 1000,
|
|
@@ -93,11 +95,11 @@ describe('ts server client', () => {
|
|
|
93
95
|
});
|
|
94
96
|
it('documentHighlight', async () => {
|
|
95
97
|
const f = filePath('module2.ts');
|
|
96
|
-
server.notify(
|
|
98
|
+
server.notify(CommandTypes.Open, {
|
|
97
99
|
file: f,
|
|
98
100
|
fileContent: readContents(f),
|
|
99
101
|
});
|
|
100
|
-
const response = await server.request(
|
|
102
|
+
const response = await server.request(CommandTypes.DocumentHighlights, {
|
|
101
103
|
file: f,
|
|
102
104
|
line: 8,
|
|
103
105
|
offset: 16,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tsp-client.spec.js","sourceRoot":"","sources":["../src/tsp-client.spec.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,aAAa,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"tsp-client.spec.js","sourceRoot":"","sources":["../src/tsp-client.spec.ts"],"names":[],"mappings":"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"}
|