typescript-language-server 0.6.5 → 0.8.1
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 +84 -0
- package/README.md +105 -30
- package/lib/cli.js +4 -4
- package/lib/cli.js.map +1 -1
- package/lib/commands.d.ts +3 -0
- package/lib/commands.d.ts.map +1 -1
- package/lib/commands.js +4 -1
- package/lib/commands.js.map +1 -1
- package/lib/completion.d.ts +4 -1
- package/lib/completion.d.ts.map +1 -1
- package/lib/completion.js +171 -19
- package/lib/completion.js.map +1 -1
- package/lib/diagnostic-queue.d.ts +3 -0
- package/lib/diagnostic-queue.d.ts.map +1 -1
- package/lib/diagnostic-queue.js +14 -3
- package/lib/diagnostic-queue.js.map +1 -1
- package/lib/logger.d.ts.map +1 -1
- package/lib/logger.js +1 -0
- package/lib/logger.js.map +1 -1
- package/lib/lsp-connection.d.ts.map +1 -1
- package/lib/lsp-connection.js +2 -0
- package/lib/lsp-connection.js.map +1 -1
- package/lib/lsp-server.d.ts +7 -12
- package/lib/lsp-server.d.ts.map +1 -1
- package/lib/lsp-server.js +174 -52
- package/lib/lsp-server.js.map +1 -1
- package/lib/lsp-server.spec.js +213 -10
- package/lib/lsp-server.spec.js.map +1 -1
- package/lib/organize-imports.d.ts +2 -1
- package/lib/organize-imports.d.ts.map +1 -1
- package/lib/organize-imports.js +7 -5
- package/lib/organize-imports.js.map +1 -1
- package/lib/organize-imports.spec.js +14 -7
- package/lib/organize-imports.spec.js.map +1 -1
- package/lib/protocol-translation.js +7 -10
- package/lib/protocol-translation.js.map +1 -1
- package/lib/semantic-tokens.d.ts +9 -0
- package/lib/semantic-tokens.d.ts.map +1 -0
- package/lib/semantic-tokens.js +47 -0
- package/lib/semantic-tokens.js.map +1 -0
- package/lib/test-utils.d.ts.map +1 -1
- package/lib/test-utils.js +4 -2
- package/lib/test-utils.js.map +1 -1
- package/lib/ts-protocol.d.ts +19 -0
- package/lib/ts-protocol.d.ts.map +1 -1
- package/lib/ts-protocol.js +10 -1
- package/lib/ts-protocol.js.map +1 -1
- package/lib/tsp-client.d.ts +7 -1
- package/lib/tsp-client.d.ts.map +1 -1
- package/lib/tsp-client.js +24 -14
- package/lib/tsp-client.js.map +1 -1
- package/lib/tsp-client.spec.js +74 -82
- package/lib/tsp-client.spec.js.map +1 -1
- package/lib/tsp-command-types.d.ts +14 -1
- package/lib/tsp-command-types.d.ts.map +1 -1
- package/lib/tsp-command-types.js +21 -1
- package/lib/tsp-command-types.js.map +1 -1
- package/lib/utils/SnippetString.d.ts +12 -0
- package/lib/utils/SnippetString.d.ts.map +1 -0
- package/lib/utils/SnippetString.js +69 -0
- package/lib/utils/SnippetString.js.map +1 -0
- package/lib/utils/api.d.ts +45 -0
- package/lib/utils/api.d.ts.map +1 -0
- package/lib/utils/api.js +95 -0
- package/lib/utils/api.js.map +1 -0
- package/lib/utils/configuration.d.ts +10 -0
- package/lib/utils/configuration.d.ts.map +1 -0
- package/lib/utils/configuration.js +3 -0
- package/lib/utils/configuration.js.map +1 -0
- package/lib/utils/modules-resolver.d.ts +2 -0
- package/lib/utils/modules-resolver.d.ts.map +1 -0
- package/lib/{modules-resolver.js → utils/modules-resolver.js} +8 -22
- package/lib/utils/modules-resolver.js.map +1 -0
- package/lib/{modules-resolver.spec.d.ts → utils/modules-resolver.spec.d.ts} +0 -0
- package/lib/utils/modules-resolver.spec.d.ts.map +1 -0
- package/lib/{modules-resolver.spec.js → utils/modules-resolver.spec.js} +9 -9
- package/lib/utils/modules-resolver.spec.js.map +1 -0
- package/lib/utils/typeConverters.d.ts +11 -0
- package/lib/utils/typeConverters.d.ts.map +1 -0
- package/lib/utils/typeConverters.js +22 -0
- package/lib/utils/typeConverters.js.map +1 -0
- package/lib/utils/versionProvider.d.ts +30 -0
- package/lib/utils/versionProvider.d.ts.map +1 -0
- package/lib/utils/versionProvider.js +147 -0
- package/lib/utils/versionProvider.js.map +1 -0
- package/lib/utils.d.ts +0 -1
- package/lib/utils.d.ts.map +1 -1
- package/lib/utils.js +1 -8
- package/lib/utils.js.map +1 -1
- package/package.json +31 -17
- package/lib/modules-resolver.d.ts +0 -3
- package/lib/modules-resolver.d.ts.map +0 -1
- package/lib/modules-resolver.js.map +0 -1
- package/lib/modules-resolver.spec.d.ts.map +0 -1
- package/lib/modules-resolver.spec.js.map +0 -1
package/lib/completion.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"completion.js","sourceRoot":"","sources":["../src/completion.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"completion.js","sourceRoot":"","sources":["../src/completion.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,8 +20,11 @@ export declare class DiagnosticEventQueue {
|
|
|
20
20
|
protected readonly publishDiagnosticsCapabilities: lsp.TextDocumentClientCapabilities['publishDiagnostics'];
|
|
21
21
|
protected readonly logger: Logger;
|
|
22
22
|
protected readonly diagnostics: Map<string, FileDiagnostics>;
|
|
23
|
+
private ignoredDiagnosticCodes;
|
|
23
24
|
constructor(publishDiagnostics: (params: lsp.PublishDiagnosticsParams) => void, documents: LspDocuments, publishDiagnosticsCapabilities: lsp.TextDocumentClientCapabilities['publishDiagnostics'], logger: Logger);
|
|
24
25
|
updateDiagnostics(kind: EventTypes, event: tsp.DiagnosticEvent): void;
|
|
26
|
+
updateIgnoredDiagnosticCodes(ignoredCodes: readonly number[]): void;
|
|
27
|
+
private isDiagnosticIgnored;
|
|
25
28
|
}
|
|
26
29
|
export {};
|
|
27
30
|
//# sourceMappingURL=diagnostic-queue.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"diagnostic-queue.d.ts","sourceRoot":"","sources":["../src/diagnostic-queue.ts"],"names":[],"mappings":"AAOA,OAAO,GAAG,MAAM,yBAAyB,CAAC;AAC1C,OAAO,KAAK,GAAG,MAAM,4BAA4B,CAAC;AAClD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAEjD,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE1C,cAAM,eAAe;IAIb,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,MAAM;IAC9B,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,CAAC,MAAM,EAAE,GAAG,CAAC,wBAAwB,KAAK,IAAI;IACrF,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,YAAY;IAC1C,SAAS,CAAC,QAAQ,CAAC,8BAA8B,EAAE,GAAG,CAAC,8BAA8B,CAAC,oBAAoB,CAAC;IAN/G,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAA2C;gBAGvD,GAAG,EAAE,MAAM,EACX,kBAAkB,EAAE,CAAC,MAAM,EAAE,GAAG,CAAC,wBAAwB,KAAK,IAAI,EAClE,SAAS,EAAE,YAAY,EACvB,8BAA8B,EAAE,GAAG,CAAC,8BAA8B,CAAC,oBAAoB,CAAC;IAG/G,MAAM,CAAC,IAAI,EAAE,UAAU,EAAE,WAAW,EAAE,GAAG,CAAC,UAAU,EAAE,GAAG,IAAI;IAI7D,SAAS,CAAC,QAAQ,CAAC,sBAAsB,sBAGlC;IAEP,SAAS,CAAC,cAAc,IAAI,GAAG,CAAC,UAAU,EAAE;CAS/C;AAED,qBAAa,oBAAoB;
|
|
1
|
+
{"version":3,"file":"diagnostic-queue.d.ts","sourceRoot":"","sources":["../src/diagnostic-queue.ts"],"names":[],"mappings":"AAOA,OAAO,GAAG,MAAM,yBAAyB,CAAC;AAC1C,OAAO,KAAK,GAAG,MAAM,4BAA4B,CAAC;AAClD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAEjD,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE1C,cAAM,eAAe;IAIb,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,MAAM;IAC9B,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,CAAC,MAAM,EAAE,GAAG,CAAC,wBAAwB,KAAK,IAAI;IACrF,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,YAAY;IAC1C,SAAS,CAAC,QAAQ,CAAC,8BAA8B,EAAE,GAAG,CAAC,8BAA8B,CAAC,oBAAoB,CAAC;IAN/G,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAA2C;gBAGvD,GAAG,EAAE,MAAM,EACX,kBAAkB,EAAE,CAAC,MAAM,EAAE,GAAG,CAAC,wBAAwB,KAAK,IAAI,EAClE,SAAS,EAAE,YAAY,EACvB,8BAA8B,EAAE,GAAG,CAAC,8BAA8B,CAAC,oBAAoB,CAAC;IAG/G,MAAM,CAAC,IAAI,EAAE,UAAU,EAAE,WAAW,EAAE,GAAG,CAAC,UAAU,EAAE,GAAG,IAAI;IAI7D,SAAS,CAAC,QAAQ,CAAC,sBAAsB,sBAGlC;IAEP,SAAS,CAAC,cAAc,IAAI,GAAG,CAAC,UAAU,EAAE;CAS/C;AAED,qBAAa,oBAAoB;IAKzB,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,CAAC,MAAM,EAAE,GAAG,CAAC,wBAAwB,KAAK,IAAI;IACrF,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,YAAY;IAC1C,SAAS,CAAC,QAAQ,CAAC,8BAA8B,EAAE,GAAG,CAAC,8BAA8B,CAAC,oBAAoB,CAAC;IAC3G,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM;IAPrC,SAAS,CAAC,QAAQ,CAAC,WAAW,+BAAsC;IACpE,OAAO,CAAC,sBAAsB,CAA0B;gBAGjC,kBAAkB,EAAE,CAAC,MAAM,EAAE,GAAG,CAAC,wBAAwB,KAAK,IAAI,EAClE,SAAS,EAAE,YAAY,EACvB,8BAA8B,EAAE,GAAG,CAAC,8BAA8B,CAAC,oBAAoB,CAAC,EACxF,MAAM,EAAE,MAAM;IAGrC,iBAAiB,CAAC,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,GAAG,CAAC,eAAe,GAAG,IAAI;IAkBrE,4BAA4B,CAAC,YAAY,EAAE,SAAS,MAAM,EAAE,GAAG,IAAI;IAInE,OAAO,CAAC,mBAAmB;CAG9B"}
|
package/lib/diagnostic-queue.js
CHANGED
|
@@ -45,6 +45,7 @@ class DiagnosticEventQueue {
|
|
|
45
45
|
this.publishDiagnosticsCapabilities = publishDiagnosticsCapabilities;
|
|
46
46
|
this.logger = logger;
|
|
47
47
|
this.diagnostics = new Map();
|
|
48
|
+
this.ignoredDiagnosticCodes = new Set();
|
|
48
49
|
}
|
|
49
50
|
updateDiagnostics(kind, event) {
|
|
50
51
|
if (!event.body) {
|
|
@@ -52,10 +53,20 @@ class DiagnosticEventQueue {
|
|
|
52
53
|
return;
|
|
53
54
|
}
|
|
54
55
|
const { file } = event.body;
|
|
56
|
+
let { diagnostics } = event.body;
|
|
57
|
+
if (this.ignoredDiagnosticCodes.size) {
|
|
58
|
+
diagnostics = diagnostics.filter(diagnostic => !this.isDiagnosticIgnored(diagnostic));
|
|
59
|
+
}
|
|
55
60
|
const uri = (0, protocol_translation_1.pathToUri)(file, this.documents);
|
|
56
|
-
const
|
|
57
|
-
|
|
58
|
-
this.diagnostics.set(uri,
|
|
61
|
+
const diagnosticsForFile = this.diagnostics.get(uri) || new FileDiagnostics(uri, this.publishDiagnostics, this.documents, this.publishDiagnosticsCapabilities);
|
|
62
|
+
diagnosticsForFile.update(kind, diagnostics);
|
|
63
|
+
this.diagnostics.set(uri, diagnosticsForFile);
|
|
64
|
+
}
|
|
65
|
+
updateIgnoredDiagnosticCodes(ignoredCodes) {
|
|
66
|
+
this.ignoredDiagnosticCodes = new Set(ignoredCodes);
|
|
67
|
+
}
|
|
68
|
+
isDiagnosticIgnored(diagnostic) {
|
|
69
|
+
return diagnostic.code !== undefined && this.ignoredDiagnosticCodes.has(diagnostic.code);
|
|
59
70
|
}
|
|
60
71
|
}
|
|
61
72
|
exports.DiagnosticEventQueue = DiagnosticEventQueue;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"diagnostic-queue.js","sourceRoot":"","sources":["../src/diagnostic-queue.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;;AAKH,iEAAiE;AAEjE,4DAAkC;AAGlC,MAAM,eAAe;IAGjB,YACuB,GAAW,EACX,kBAAkE,EAClE,SAAuB,EACvB,8BAAwF;QAHxF,QAAG,GAAH,GAAG,CAAQ;QACX,uBAAkB,GAAlB,kBAAkB,CAAgD;QAClE,cAAS,GAAT,SAAS,CAAc;QACvB,mCAA8B,GAA9B,8BAA8B,CAA0D;QAN9F,uBAAkB,GAAG,IAAI,GAAG,EAAgC,CAAC;QAa3D,2BAAsB,GAAG,IAAA,oBAAQ,EAAC,GAAG,EAAE;YACtD,MAAM,WAAW,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;YAC1C,IAAI,CAAC,kBAAkB,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,WAAW,EAAE,CAAC,CAAC;QAC5D,CAAC,EAAE,EAAE,CAAC,CAAC;IATH,CAAC;IAEL,MAAM,CAAC,IAAgB,EAAE,WAA6B;QAClD,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;QAC/C,IAAI,CAAC,sBAAsB,EAAE,CAAC;IAClC,CAAC;IAMS,cAAc;QACpB,MAAM,MAAM,GAAqB,EAAE,CAAC;QACpC,KAAK,MAAM,WAAW,IAAI,IAAI,CAAC,kBAAkB,CAAC,MAAM,EAAE,EAAE;YACxD,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE;gBAClC,MAAM,CAAC,IAAI,CAAC,IAAA,mCAAY,EAAC,UAAU,EAAE,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,8BAA8B,CAAC,CAAC,CAAC;aAC9F;SACJ;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ;AAED,MAAa,oBAAoB;
|
|
1
|
+
{"version":3,"file":"diagnostic-queue.js","sourceRoot":"","sources":["../src/diagnostic-queue.ts"],"names":[],"mappings":"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"}
|
package/lib/logger.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,KAAK,GAAG,MAAM,4BAA4B,CAAC;AAElD;;GAEG;AACH,MAAM,WAAW,MAAM;IACnB,KAAK,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;IAC3B,IAAI,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;IAC1B,IAAI,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;IAC1B,GAAG,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;CAC5B;AAED,qBAAa,eAAgB,YAAW,MAAM;IAC9B,SAAS,CAAC,MAAM,EAAE,SAAS;IAAE,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,WAAW;gBAAnD,MAAM,EAAE,SAAS,EAAY,KAAK,EAAE,GAAG,CAAC,WAAW;IAEzE,SAAS,CAAC,WAAW,CAAC,QAAQ,EAAE,GAAG,CAAC,WAAW,EAAE,cAAc,EAAE,GAAG,EAAE,GAAG,IAAI;IAiB7E,KAAK,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI;IAI1B,IAAI,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI;IAIzB,IAAI,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI;IAIzB,GAAG,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI;CAG3B;AAED,qBAAa,aAAc,YAAW,MAAM;IAC5B,OAAO,CAAC,YAAY,CAAC;gBAAb,YAAY,CAAC,qBAAS;IAE1C,OAAO,CAAC,SAAS;IAIjB,KAAK,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI;IAG1B,IAAI,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI;IAGzB,IAAI,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI;
|
|
1
|
+
{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,KAAK,GAAG,MAAM,4BAA4B,CAAC;AAElD;;GAEG;AACH,MAAM,WAAW,MAAM;IACnB,KAAK,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;IAC3B,IAAI,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;IAC1B,IAAI,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;IAC1B,GAAG,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;CAC5B;AAED,qBAAa,eAAgB,YAAW,MAAM;IAC9B,SAAS,CAAC,MAAM,EAAE,SAAS;IAAE,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,WAAW;gBAAnD,MAAM,EAAE,SAAS,EAAY,KAAK,EAAE,GAAG,CAAC,WAAW;IAEzE,SAAS,CAAC,WAAW,CAAC,QAAQ,EAAE,GAAG,CAAC,WAAW,EAAE,cAAc,EAAE,GAAG,EAAE,GAAG,IAAI;IAiB7E,KAAK,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI;IAI1B,IAAI,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI;IAIzB,IAAI,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI;IAIzB,GAAG,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI;CAG3B;AAED,qBAAa,aAAc,YAAW,MAAM;IAC5B,OAAO,CAAC,YAAY,CAAC;gBAAb,YAAY,CAAC,qBAAS;IAE1C,OAAO,CAAC,SAAS;IAIjB,KAAK,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI;IAG1B,IAAI,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI;IAGzB,IAAI,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI;IAIzB,GAAG,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI;CAM3B;AAED,qBAAa,eAAgB,YAAW,MAAM;IAC9B,OAAO,CAAC,MAAM;IAAU,OAAO,CAAC,MAAM;gBAA9B,MAAM,EAAE,MAAM,EAAU,MAAM,EAAE,MAAM;IAE1D,KAAK,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI;IAI1B,IAAI,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI;IAIzB,IAAI,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI;IAIzB,GAAG,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI;CAG3B"}
|
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,gEAAkD;AAYlD,MAAa,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;AAnCD,0CAmCC;AAED,MAAa,aAAa;IACtB,YAAoB,YAAsB;QAAtB,iBAAY,GAAZ,YAAY,CAAU;IAAG,CAAC;IAEtC,SAAS,CAAC,GAAG,GAAG;QACpB,OAAO,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;IACpD,CAAC;IAED,KAAK,CAAC,GAAG,GAAU;QACf,OAAO,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC;IAC1C,CAAC;IACD,IAAI,CAAC,GAAG,GAAU;QACd,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC;IACzC,CAAC;IACD,IAAI,CAAC,GAAG,GAAU;QACd,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC;IACzC,CAAC;IACD,GAAG,CAAC,GAAG,GAAU;QACb,IAAI,IAAI,CAAC,YAAY,EAAE;YACnB,sCAAsC;YACtC,OAAO,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC;SACvC;IACL,CAAC;CACJ;
|
|
1
|
+
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lsp-connection.d.ts","sourceRoot":"","sources":["../src/lsp-connection.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,GAAG,MAAM,4BAA4B,CAAC;AAQlD,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,4BAA4B,CAAC;AAQlD,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,CA+C3E"}
|
package/lib/lsp-connection.js
CHANGED
|
@@ -69,6 +69,8 @@ function createLspConnection(options) {
|
|
|
69
69
|
// proposed `textDocument/calls` request
|
|
70
70
|
connection.onRequest(lspcalls.CallsRequest.type, server.calls.bind(server));
|
|
71
71
|
connection.onRequest(lspinlayHints.type, server.inlayHints.bind(server));
|
|
72
|
+
connection.onRequest(lsp.SemanticTokensRequest.type, server.semanticTokensFull.bind(server));
|
|
73
|
+
connection.onRequest(lsp.SemanticTokensRangeRequest.type, server.semanticTokensRange.bind(server));
|
|
72
74
|
return connection;
|
|
73
75
|
}
|
|
74
76
|
exports.createLspConnection = createLspConnection;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lsp-connection.js","sourceRoot":"","sources":["../src/lsp-connection.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;;;;;;;;;;;;;;;;;;AAEH,gEAAkD;AAClD,wEAA0D;AAC1D,kFAAoE;AAEpE,qCAA2C;AAC3C,6CAAyC;AACzC,6CAA6C;AAS7C,SAAgB,mBAAmB,CAAC,OAAuB;IACvD,MAAM,UAAU,GAAG,GAAG,CAAC,gBAAgB,CAAC,GAAG,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC;IAClE,MAAM,SAAS,GAAG,IAAI,0BAAa,CAAC,UAAU,CAAC,CAAC;IAChD,MAAM,MAAM,GAAG,IAAI,wBAAe,CAAC,SAAS,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAC;IACxE,MAAM,MAAM,GAAc,IAAI,sBAAS,CAAC;QACpC,MAAM;QACN,SAAS;QACT,YAAY,EAAE,OAAO,CAAC,YAAY;QAClC,eAAe,EAAE,OAAO,CAAC,eAAe;QACxC,oBAAoB,EAAE,OAAO,CAAC,oBAAoB;KACrD,CAAC,CAAC;IAEH,UAAU,CAAC,YAAY,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;IACxD,UAAU,CAAC,wBAAwB,CAAC,MAAM,CAAC,sBAAsB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;IAEhF,UAAU,CAAC,qBAAqB,CAAC,MAAM,CAAC,mBAAmB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;IAC1E,UAAU,CAAC,qBAAqB,CAAC,MAAM,CAAC,mBAAmB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;IAC1E,UAAU,CAAC,sBAAsB,CAAC,MAAM,CAAC,oBAAoB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;IAC5E,UAAU,CAAC,uBAAuB,CAAC,MAAM,CAAC,qBAAqB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;IAE9E,UAAU,CAAC,YAAY,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;IACxD,UAAU,CAAC,YAAY,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;IACxD,UAAU,CAAC,mBAAmB,CAAC,MAAM,CAAC,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;IACtE,UAAU,CAAC,YAAY,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;IACxD,UAAU,CAAC,gBAAgB,CAAC,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;IAChE,UAAU,CAAC,gBAAgB,CAAC,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;IAChE,UAAU,CAAC,oBAAoB,CAAC,MAAM,CAAC,kBAAkB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;IACxE,UAAU,CAAC,yBAAyB,CAAC,MAAM,CAAC,uBAAuB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;IAClF,UAAU,CAAC,mBAAmB,CAAC,MAAM,CAAC,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;IACtE,UAAU,CAAC,gBAAgB,CAAC,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;IAChE,UAAU,CAAC,gBAAgB,CAAC,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;IAChE,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;IAC9C,UAAU,CAAC,YAAY,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;IACxD,UAAU,CAAC,eAAe,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;IACvD,UAAU,CAAC,eAAe,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;IAC9D,UAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;IAClE,UAAU,CAAC,eAAe,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;IAE9D,wCAAwC;IACxC,UAAU,CAAC,SAAS,CAAC,QAAQ,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;IAE5E,UAAU,CAAC,SAAS,CAAC,aAAa,CAAC,IAAI,EAAE,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;IAEzE,OAAO,UAAU,CAAC;AACtB,CAAC;
|
|
1
|
+
{"version":3,"file":"lsp-connection.js","sourceRoot":"","sources":["../src/lsp-connection.ts"],"names":[],"mappings":"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"}
|
package/lib/lsp-server.d.ts
CHANGED
|
@@ -2,17 +2,9 @@ import * as lsp from 'vscode-languageserver/node';
|
|
|
2
2
|
import * as lspcalls from './lsp-protocol.calls.proposed';
|
|
3
3
|
import * as lspinlayHints from './lsp-protocol.inlayHints.proposed';
|
|
4
4
|
import tsp from 'typescript/lib/protocol';
|
|
5
|
-
import { Logger } from './logger';
|
|
6
|
-
import { LspClient } from './lsp-client';
|
|
7
5
|
import { LspDocument } from './document';
|
|
8
6
|
import { TypeScriptInitializeParams, TypeScriptInitializeResult, TypeScriptWorkspaceSettingsLanguageSettings } from './ts-protocol';
|
|
9
|
-
|
|
10
|
-
logger: Logger;
|
|
11
|
-
tsserverPath?: string;
|
|
12
|
-
tsserverLogFile?: string;
|
|
13
|
-
tsserverLogVerbosity?: string;
|
|
14
|
-
lspClient: LspClient;
|
|
15
|
-
}
|
|
7
|
+
import { IServerOptions } from './utils/configuration';
|
|
16
8
|
export declare class LspServer {
|
|
17
9
|
private options;
|
|
18
10
|
private initializeParams;
|
|
@@ -21,10 +13,11 @@ export declare class LspServer {
|
|
|
21
13
|
private diagnosticQueue?;
|
|
22
14
|
private logger;
|
|
23
15
|
private workspaceConfiguration;
|
|
16
|
+
private workspaceRoot;
|
|
24
17
|
private readonly documents;
|
|
25
18
|
constructor(options: IServerOptions);
|
|
26
19
|
closeAll(): void;
|
|
27
|
-
|
|
20
|
+
private findTypescriptVersion;
|
|
28
21
|
initialize(params: TypeScriptInitializeParams): Promise<TypeScriptInitializeResult>;
|
|
29
22
|
protected getLogFile(logVerbosity: string | undefined): string | undefined;
|
|
30
23
|
protected doGetLogFile(): string | undefined;
|
|
@@ -55,7 +48,7 @@ export declare class LspServer {
|
|
|
55
48
|
hover(params: lsp.TextDocumentPositionParams): Promise<lsp.Hover>;
|
|
56
49
|
protected getQuickInfo(file: string, position: lsp.Position): Promise<tsp.QuickInfoResponse | undefined>;
|
|
57
50
|
rename(params: lsp.RenameParams): Promise<lsp.WorkspaceEdit | undefined>;
|
|
58
|
-
references(params: lsp.
|
|
51
|
+
references(params: lsp.ReferenceParams): Promise<lsp.Location[]>;
|
|
59
52
|
documentFormatting(params: lsp.DocumentFormattingParams): Promise<lsp.TextEdit[]>;
|
|
60
53
|
documentRangeFormatting(params: lsp.DocumentRangeFormattingParams): Promise<lsp.TextEdit[]>;
|
|
61
54
|
private getFormattingOptions;
|
|
@@ -70,7 +63,6 @@ export declare class LspServer {
|
|
|
70
63
|
protected applyRenameFile(sourceUri: string, targetUri: string): Promise<void>;
|
|
71
64
|
protected getEditsForFileRename(sourceUri: string, targetUri: string): Promise<ReadonlyArray<tsp.FileCodeEdits>>;
|
|
72
65
|
documentHighlight(arg: lsp.TextDocumentPositionParams): Promise<lsp.DocumentHighlight[]>;
|
|
73
|
-
private rootPath;
|
|
74
66
|
private lastFileOrDummy;
|
|
75
67
|
workspaceSymbol(params: lsp.WorkspaceSymbolParams): Promise<lsp.SymbolInformation[]>;
|
|
76
68
|
/**
|
|
@@ -83,5 +75,8 @@ export declare class LspServer {
|
|
|
83
75
|
calls(params: lspcalls.CallsParams): Promise<lspcalls.CallsResult>;
|
|
84
76
|
inlayHints(params: lspinlayHints.InlayHintsParams): Promise<lspinlayHints.InlayHintsResult>;
|
|
85
77
|
private getInlayHintsOptions;
|
|
78
|
+
semanticTokensFull(params: lsp.SemanticTokensParams): Promise<lsp.SemanticTokens>;
|
|
79
|
+
semanticTokensRange(params: lsp.SemanticTokensRangeParams): Promise<lsp.SemanticTokens>;
|
|
80
|
+
getSemanticTokens(doc: LspDocument, file: string, startOffset: number, endOffset: number): Promise<lsp.SemanticTokens>;
|
|
86
81
|
}
|
|
87
82
|
//# sourceMappingURL=lsp-server.d.ts.map
|
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":"AASA,OAAO,KAAK,GAAG,MAAM,4BAA4B,CAAC;AAClD,OAAO,KAAK,QAAQ,MAAM,+BAA+B,CAAC;AAC1D,OAAO,KAAK,aAAa,MAAM,oCAAoC,CAAC;
|
|
1
|
+
{"version":3,"file":"lsp-server.d.ts","sourceRoot":"","sources":["../src/lsp-server.ts"],"names":[],"mappings":"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"}
|
package/lib/lsp-server.js
CHANGED
|
@@ -42,16 +42,14 @@ const path = __importStar(require("path"));
|
|
|
42
42
|
const tempy_1 = __importDefault(require("tempy"));
|
|
43
43
|
const lsp = __importStar(require("vscode-languageserver/node"));
|
|
44
44
|
const lspcalls = __importStar(require("./lsp-protocol.calls.proposed"));
|
|
45
|
+
const lspsemanticTokens = __importStar(require("./semantic-tokens"));
|
|
45
46
|
const fs = __importStar(require("fs-extra"));
|
|
46
|
-
const commandExists = __importStar(require("command-exists"));
|
|
47
47
|
const node_1 = require("vscode-languageserver/node");
|
|
48
48
|
const p_debounce_1 = __importDefault(require("p-debounce"));
|
|
49
49
|
const logger_1 = require("./logger");
|
|
50
50
|
const tsp_client_1 = require("./tsp-client");
|
|
51
51
|
const diagnostic_queue_1 = require("./diagnostic-queue");
|
|
52
|
-
const modules_resolver_1 = require("./modules-resolver");
|
|
53
52
|
const protocol_translation_1 = require("./protocol-translation");
|
|
54
|
-
const utils_1 = require("./utils");
|
|
55
53
|
const document_1 = require("./document");
|
|
56
54
|
const completion_1 = require("./completion");
|
|
57
55
|
const hover_1 = require("./hover");
|
|
@@ -61,6 +59,7 @@ const refactor_1 = require("./refactor");
|
|
|
61
59
|
const organize_imports_1 = require("./organize-imports");
|
|
62
60
|
const document_symbol_1 = require("./document-symbol");
|
|
63
61
|
const calls_1 = require("./calls");
|
|
62
|
+
const versionProvider_1 = require("./utils/versionProvider");
|
|
64
63
|
class LspServer {
|
|
65
64
|
constructor(options) {
|
|
66
65
|
this.options = options;
|
|
@@ -74,44 +73,43 @@ class LspServer {
|
|
|
74
73
|
this.closeDocument(file);
|
|
75
74
|
}
|
|
76
75
|
}
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
76
|
+
findTypescriptVersion() {
|
|
77
|
+
const typescriptVersionProvider = new versionProvider_1.TypeScriptVersionProvider(this.options);
|
|
78
|
+
// User-provided tsserver path.
|
|
79
|
+
const userSettingVersion = typescriptVersionProvider.getUserSettingVersion();
|
|
80
|
+
if (userSettingVersion) {
|
|
81
|
+
if (userSettingVersion.isValid) {
|
|
82
|
+
return userSettingVersion;
|
|
83
|
+
}
|
|
84
|
+
this.logger.warn(`Typescript specified through --tsserver-path ignored due to invalid path "${userSettingVersion.path}"`);
|
|
80
85
|
}
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
// 2) look into node_modules of workspace root
|
|
88
|
-
const executable = (0, modules_resolver_1.findPathToModule)(this.rootPath(), tsServerPath);
|
|
89
|
-
if (executable) {
|
|
90
|
-
return executable;
|
|
91
|
-
}
|
|
92
|
-
// 3) use globally installed tsserver
|
|
93
|
-
if (commandExists.sync((0, utils_1.getTsserverExecutable)())) {
|
|
94
|
-
return (0, utils_1.getTsserverExecutable)();
|
|
86
|
+
// Workspace version.
|
|
87
|
+
if (this.workspaceRoot) {
|
|
88
|
+
const workspaceVersion = typescriptVersionProvider.getWorkspaceVersion([this.workspaceRoot]);
|
|
89
|
+
if (workspaceVersion) {
|
|
90
|
+
return workspaceVersion;
|
|
91
|
+
}
|
|
95
92
|
}
|
|
96
|
-
//
|
|
97
|
-
const
|
|
98
|
-
if (
|
|
99
|
-
|
|
93
|
+
// Bundled version
|
|
94
|
+
const bundledVersion = typescriptVersionProvider.bundledVersion();
|
|
95
|
+
if (bundledVersion && bundledVersion.isValid) {
|
|
96
|
+
return bundledVersion;
|
|
100
97
|
}
|
|
101
|
-
return
|
|
98
|
+
return null;
|
|
102
99
|
}
|
|
103
100
|
initialize(params) {
|
|
104
101
|
var _a;
|
|
105
102
|
return __awaiter(this, void 0, void 0, function* () {
|
|
106
103
|
this.logger.log('initialize', params);
|
|
107
104
|
this.initializeParams = params;
|
|
105
|
+
this.workspaceRoot = this.initializeParams.rootUri ? (0, protocol_translation_1.uriToPath)(this.initializeParams.rootUri) : this.initializeParams.rootPath || undefined;
|
|
108
106
|
this.diagnosticQueue = new diagnostic_queue_1.DiagnosticEventQueue(diagnostics => this.options.lspClient.publishDiagnostics(diagnostics), this.documents, (_a = this.initializeParams.capabilities.textDocument) === null || _a === void 0 ? void 0 : _a.publishDiagnostics, this.logger);
|
|
109
107
|
const userInitializationOptions = this.initializeParams.initializationOptions || {};
|
|
110
|
-
const { hostInfo, maxTsServerMemory } = userInitializationOptions;
|
|
108
|
+
const { disableAutomaticTypingAcquisition, hostInfo, maxTsServerMemory, npmLocation } = userInitializationOptions;
|
|
111
109
|
const { logVerbosity, plugins, preferences } = {
|
|
112
110
|
logVerbosity: userInitializationOptions.logVerbosity || this.options.tsserverLogVerbosity,
|
|
113
111
|
plugins: userInitializationOptions.plugins || [],
|
|
114
|
-
preferences: Object.assign({ includeCompletionsForModuleExports: true, includeCompletionsWithInsertText: true }, userInitializationOptions.preferences)
|
|
112
|
+
preferences: Object.assign({ allowIncompleteCompletions: true, allowRenameOfImportPath: true, allowTextChangesInNewFiles: true, displayPartsForJSDoc: true, generateReturnInDocTemplate: true, includeAutomaticOptionalChainCompletions: true, includeCompletionsForImportStatements: true, includeCompletionsForModuleExports: true, includeCompletionsWithInsertText: true, includeCompletionsWithSnippetText: true }, userInitializationOptions.preferences)
|
|
115
113
|
};
|
|
116
114
|
const logFile = this.getLogFile(logVerbosity);
|
|
117
115
|
const globalPlugins = [];
|
|
@@ -120,19 +118,44 @@ class LspServer {
|
|
|
120
118
|
globalPlugins.push(plugin.name);
|
|
121
119
|
pluginProbeLocations.push(plugin.location);
|
|
122
120
|
}
|
|
123
|
-
const
|
|
121
|
+
const typescriptVersion = this.findTypescriptVersion();
|
|
122
|
+
if (typescriptVersion) {
|
|
123
|
+
this.logger.info(`Using Typescript version (${typescriptVersion.source}) ${typescriptVersion.versionString} from path "${typescriptVersion.tsServerPath}"`);
|
|
124
|
+
}
|
|
125
|
+
else {
|
|
126
|
+
throw Error('Could not find a valid tsserver version. Exiting.');
|
|
127
|
+
}
|
|
124
128
|
this.tspClient = new tsp_client_1.TspClient({
|
|
125
|
-
tsserverPath,
|
|
129
|
+
tsserverPath: typescriptVersion.tsServerPath,
|
|
126
130
|
logFile,
|
|
127
131
|
logVerbosity,
|
|
132
|
+
disableAutomaticTypingAcquisition,
|
|
128
133
|
maxTsServerMemory,
|
|
134
|
+
npmLocation,
|
|
129
135
|
globalPlugins,
|
|
130
136
|
pluginProbeLocations,
|
|
131
137
|
logger: this.options.logger,
|
|
132
|
-
onEvent: this.onTsEvent.bind(this)
|
|
138
|
+
onEvent: this.onTsEvent.bind(this),
|
|
139
|
+
onExit: (exitCode, signal) => {
|
|
140
|
+
this.logger.error(`tsserver process has exited (exit code: ${exitCode}, signal: ${signal}). Stopping the server.`);
|
|
141
|
+
// Allow the log to be dispatched to the client.
|
|
142
|
+
setTimeout(() => process.exit(1));
|
|
143
|
+
}
|
|
133
144
|
});
|
|
134
|
-
this.tspClient.start();
|
|
135
|
-
|
|
145
|
+
const started = this.tspClient.start();
|
|
146
|
+
if (!started) {
|
|
147
|
+
throw new Error('tsserver process has failed to start.');
|
|
148
|
+
}
|
|
149
|
+
process.on('exit', () => {
|
|
150
|
+
this.tspClient.shutdown();
|
|
151
|
+
});
|
|
152
|
+
process.on('SIGINT', () => {
|
|
153
|
+
process.exit();
|
|
154
|
+
});
|
|
155
|
+
this.tspClient.request("configure" /* Configure */, Object.assign(Object.assign({}, hostInfo ? { hostInfo } : {}), { formatOptions: {
|
|
156
|
+
// We can use \n here since the editor should normalize later on to its line endings.
|
|
157
|
+
newLineCharacter: '\n'
|
|
158
|
+
}, preferences }));
|
|
136
159
|
this.tspClient.request("compilerOptionsForInferredProjects" /* CompilerOptionsForInferredProjects */, {
|
|
137
160
|
options: {
|
|
138
161
|
module: "CommonJS" /* CommonJS */,
|
|
@@ -175,7 +198,38 @@ class LspServer {
|
|
|
175
198
|
workspaceSymbolProvider: true,
|
|
176
199
|
implementationProvider: true,
|
|
177
200
|
typeDefinitionProvider: true,
|
|
178
|
-
foldingRangeProvider: true
|
|
201
|
+
foldingRangeProvider: true,
|
|
202
|
+
semanticTokensProvider: {
|
|
203
|
+
documentSelector: null,
|
|
204
|
+
legend: {
|
|
205
|
+
// list taken from: https://github.com/microsoft/TypeScript/blob/main/src/services/classifier2020.ts#L10
|
|
206
|
+
tokenTypes: [
|
|
207
|
+
'class',
|
|
208
|
+
'enum',
|
|
209
|
+
'interface',
|
|
210
|
+
'namespace',
|
|
211
|
+
'typeParameter',
|
|
212
|
+
'type',
|
|
213
|
+
'parameter',
|
|
214
|
+
'variable',
|
|
215
|
+
'enumMember',
|
|
216
|
+
'property',
|
|
217
|
+
'function',
|
|
218
|
+
'member'
|
|
219
|
+
],
|
|
220
|
+
// token from: https://github.com/microsoft/TypeScript/blob/main/src/services/classifier2020.ts#L14
|
|
221
|
+
tokenModifiers: [
|
|
222
|
+
'declaration',
|
|
223
|
+
'static',
|
|
224
|
+
'async',
|
|
225
|
+
'readonly',
|
|
226
|
+
'defaultLibrary',
|
|
227
|
+
'local'
|
|
228
|
+
]
|
|
229
|
+
},
|
|
230
|
+
full: true,
|
|
231
|
+
range: true
|
|
232
|
+
}
|
|
179
233
|
},
|
|
180
234
|
logFileUri
|
|
181
235
|
};
|
|
@@ -202,16 +256,16 @@ class LspServer {
|
|
|
202
256
|
if (this.options.tsserverLogFile) {
|
|
203
257
|
return this.options.tsserverLogFile;
|
|
204
258
|
}
|
|
205
|
-
if (this.
|
|
206
|
-
return path.join(
|
|
207
|
-
}
|
|
208
|
-
if (this.initializeParams.rootPath) {
|
|
209
|
-
return path.join(this.initializeParams.rootPath, '.log/tsserver.log');
|
|
259
|
+
if (this.workspaceRoot) {
|
|
260
|
+
return path.join(this.workspaceRoot, '.log/tsserver.log');
|
|
210
261
|
}
|
|
211
262
|
return undefined;
|
|
212
263
|
}
|
|
213
264
|
didChangeConfiguration(params) {
|
|
265
|
+
var _a, _b;
|
|
214
266
|
this.workspaceConfiguration = params.settings || {};
|
|
267
|
+
const ignoredDiagnosticCodes = ((_a = this.workspaceConfiguration.diagnostics) === null || _a === void 0 ? void 0 : _a.ignoredCodes) || [];
|
|
268
|
+
(_b = this.diagnosticQueue) === null || _b === void 0 ? void 0 : _b.updateIgnoredDiagnosticCodes(ignoredDiagnosticCodes);
|
|
215
269
|
}
|
|
216
270
|
getWorkspacePreferencesForDocument(file) {
|
|
217
271
|
var _a;
|
|
@@ -263,7 +317,7 @@ class LspServer {
|
|
|
263
317
|
file,
|
|
264
318
|
fileContent: params.textDocument.text,
|
|
265
319
|
scriptKindName: this.getScriptKindName(params.textDocument.languageId),
|
|
266
|
-
projectRootPath: this.
|
|
320
|
+
projectRootPath: this.workspaceRoot
|
|
267
321
|
});
|
|
268
322
|
this.requestDiagnostics();
|
|
269
323
|
}
|
|
@@ -476,7 +530,7 @@ class LspServer {
|
|
|
476
530
|
if (!details) {
|
|
477
531
|
return item;
|
|
478
532
|
}
|
|
479
|
-
return (0, completion_1.asResolvedCompletionItem)(item, details);
|
|
533
|
+
return (0, completion_1.asResolvedCompletionItem)(item, details, this.tspClient, this.workspaceConfiguration.completions || {});
|
|
480
534
|
});
|
|
481
535
|
}
|
|
482
536
|
hover(params) {
|
|
@@ -568,6 +622,7 @@ class LspServer {
|
|
|
568
622
|
return [];
|
|
569
623
|
}
|
|
570
624
|
return result.body.refs
|
|
625
|
+
.filter(fileSpan => params.context.includeDeclaration || !fileSpan.isDefinition)
|
|
571
626
|
.map(fileSpan => (0, protocol_translation_1.toLocation)(fileSpan, this.documents));
|
|
572
627
|
});
|
|
573
628
|
}
|
|
@@ -633,11 +688,13 @@ class LspServer {
|
|
|
633
688
|
if (opts.indentSize === undefined) {
|
|
634
689
|
opts.indentSize = requestOptions.tabSize;
|
|
635
690
|
}
|
|
636
|
-
|
|
637
|
-
|
|
638
|
-
|
|
639
|
-
|
|
640
|
-
|
|
691
|
+
if (this.workspaceRoot) {
|
|
692
|
+
try {
|
|
693
|
+
opts = JSON.parse(fs.readFileSync(this.workspaceRoot + '/tsfmt.json', 'utf-8'));
|
|
694
|
+
}
|
|
695
|
+
catch (err) {
|
|
696
|
+
this.logger.log(`No formatting options found ${err}`);
|
|
697
|
+
}
|
|
641
698
|
}
|
|
642
699
|
return opts;
|
|
643
700
|
}
|
|
@@ -670,6 +727,7 @@ class LspServer {
|
|
|
670
727
|
});
|
|
671
728
|
}
|
|
672
729
|
codeAction(params) {
|
|
730
|
+
var _a;
|
|
673
731
|
return __awaiter(this, void 0, void 0, function* () {
|
|
674
732
|
const file = (0, protocol_translation_1.uriToPath)(params.textDocument.uri);
|
|
675
733
|
this.logger.log('codeAction', params, file);
|
|
@@ -686,8 +744,17 @@ class LspServer {
|
|
|
686
744
|
actions.push(...(0, refactor_1.provideRefactors)(yield this.getRefactors(args), args));
|
|
687
745
|
}
|
|
688
746
|
// organize import is provided by tsserver for any line, so we only get it if explicitly requested
|
|
689
|
-
if (params.context.only
|
|
690
|
-
|
|
747
|
+
if ((_a = params.context.only) === null || _a === void 0 ? void 0 : _a.includes(commands_1.CodeActions.SourceOrganizeImportsTsLs)) {
|
|
748
|
+
// see this issue for more context about how this argument is used
|
|
749
|
+
// https://github.com/microsoft/TypeScript/issues/43051
|
|
750
|
+
const skipDestructiveCodeActions = params.context.diagnostics.some(
|
|
751
|
+
// assume no severity is an error
|
|
752
|
+
d => { var _a; return ((_a = d.severity) !== null && _a !== void 0 ? _a : 0) <= 2; });
|
|
753
|
+
const response = yield this.getOrganizeImports({
|
|
754
|
+
scope: { type: 'file', args },
|
|
755
|
+
skipDestructiveCodeActions
|
|
756
|
+
});
|
|
757
|
+
actions.push(...(0, organize_imports_1.provideOrganizeImports)(response, this.documents));
|
|
691
758
|
}
|
|
692
759
|
return actions;
|
|
693
760
|
});
|
|
@@ -766,11 +833,13 @@ class LspServer {
|
|
|
766
833
|
}
|
|
767
834
|
else if (arg.command === commands_1.Commands.ORGANIZE_IMPORTS && arg.arguments) {
|
|
768
835
|
const file = arg.arguments[0];
|
|
836
|
+
const additionalArguments = arg.arguments[1] || {};
|
|
769
837
|
const { body } = yield this.tspClient.request("organizeImports" /* OrganizeImports */, {
|
|
770
838
|
scope: {
|
|
771
839
|
type: 'file',
|
|
772
840
|
args: { file }
|
|
773
|
-
}
|
|
841
|
+
},
|
|
842
|
+
skipDestructiveCodeActions: additionalArguments.skipDestructiveCodeActions
|
|
774
843
|
});
|
|
775
844
|
yield this.applyFileCodeEdits(body);
|
|
776
845
|
}
|
|
@@ -870,11 +939,8 @@ class LspServer {
|
|
|
870
939
|
return result;
|
|
871
940
|
});
|
|
872
941
|
}
|
|
873
|
-
rootPath() {
|
|
874
|
-
return this.initializeParams.rootUri ? (0, protocol_translation_1.uriToPath)(this.initializeParams.rootUri) : this.initializeParams.rootPath;
|
|
875
|
-
}
|
|
876
942
|
lastFileOrDummy() {
|
|
877
|
-
return this.documents.files[0] || this.
|
|
943
|
+
return this.documents.files[0] || this.workspaceRoot;
|
|
878
944
|
}
|
|
879
945
|
workspaceSymbol(params) {
|
|
880
946
|
return __awaiter(this, void 0, void 0, function* () {
|
|
@@ -1040,6 +1106,62 @@ class LspServer {
|
|
|
1040
1106
|
const userPreferences = ((_a = this.initializeParams.initializationOptions) === null || _a === void 0 ? void 0 : _a.preferences) || {};
|
|
1041
1107
|
return Object.assign(Object.assign({}, userPreferences), (_b = workspacePreference.inlayHints) !== null && _b !== void 0 ? _b : {});
|
|
1042
1108
|
}
|
|
1109
|
+
semanticTokensFull(params) {
|
|
1110
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
1111
|
+
const file = (0, protocol_translation_1.uriToPath)(params.textDocument.uri);
|
|
1112
|
+
this.logger.log('semanticTokensFull', params, file);
|
|
1113
|
+
if (!file) {
|
|
1114
|
+
return { data: [] };
|
|
1115
|
+
}
|
|
1116
|
+
const doc = this.documents.get(file);
|
|
1117
|
+
if (!doc) {
|
|
1118
|
+
return { data: [] };
|
|
1119
|
+
}
|
|
1120
|
+
const start = doc.offsetAt({
|
|
1121
|
+
line: 0,
|
|
1122
|
+
character: 0
|
|
1123
|
+
});
|
|
1124
|
+
const end = doc.offsetAt({
|
|
1125
|
+
line: doc.lineCount,
|
|
1126
|
+
character: 0
|
|
1127
|
+
});
|
|
1128
|
+
return this.getSemanticTokens(doc, file, start, end);
|
|
1129
|
+
});
|
|
1130
|
+
}
|
|
1131
|
+
semanticTokensRange(params) {
|
|
1132
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
1133
|
+
const file = (0, protocol_translation_1.uriToPath)(params.textDocument.uri);
|
|
1134
|
+
this.logger.log('semanticTokensRange', params, file);
|
|
1135
|
+
if (!file) {
|
|
1136
|
+
return { data: [] };
|
|
1137
|
+
}
|
|
1138
|
+
const doc = this.documents.get(file);
|
|
1139
|
+
if (!doc) {
|
|
1140
|
+
return { data: [] };
|
|
1141
|
+
}
|
|
1142
|
+
const start = doc.offsetAt(params.range.start);
|
|
1143
|
+
const end = doc.offsetAt(params.range.end);
|
|
1144
|
+
return this.getSemanticTokens(doc, file, start, end);
|
|
1145
|
+
});
|
|
1146
|
+
}
|
|
1147
|
+
getSemanticTokens(doc, file, startOffset, endOffset) {
|
|
1148
|
+
var _a, _b;
|
|
1149
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
1150
|
+
try {
|
|
1151
|
+
const result = yield this.tspClient.request("encodedSemanticClassifications-full" /* EncodedSemanticClassificationsFull */, {
|
|
1152
|
+
file,
|
|
1153
|
+
start: startOffset,
|
|
1154
|
+
length: endOffset - startOffset,
|
|
1155
|
+
format: '2020'
|
|
1156
|
+
});
|
|
1157
|
+
const spans = (_b = (_a = result.body) === null || _a === void 0 ? void 0 : _a.spans) !== null && _b !== void 0 ? _b : [];
|
|
1158
|
+
return { data: lspsemanticTokens.transformSpans(doc, spans) };
|
|
1159
|
+
}
|
|
1160
|
+
catch (_c) {
|
|
1161
|
+
return { data: [] };
|
|
1162
|
+
}
|
|
1163
|
+
});
|
|
1164
|
+
}
|
|
1043
1165
|
}
|
|
1044
1166
|
exports.LspServer = LspServer;
|
|
1045
1167
|
//# sourceMappingURL=lsp-server.js.map
|