typescript-language-server 1.0.0 → 1.1.2

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.
Files changed (95) hide show
  1. package/CHANGELOG.md +31 -0
  2. package/README.md +128 -21
  3. package/lib/calls.d.ts +1 -1
  4. package/lib/calls.d.ts.map +1 -1
  5. package/lib/calls.js +140 -164
  6. package/lib/calls.js.map +1 -1
  7. package/lib/cli.js +1 -1
  8. package/lib/commands.d.ts +1 -0
  9. package/lib/commands.d.ts.map +1 -1
  10. package/lib/commands.js +3 -1
  11. package/lib/commands.js.map +1 -1
  12. package/lib/completion.d.ts +4 -7
  13. package/lib/completion.d.ts.map +1 -1
  14. package/lib/completion.js +64 -66
  15. package/lib/completion.js.map +1 -1
  16. package/lib/configuration-manager.d.ts +47 -0
  17. package/lib/configuration-manager.d.ts.map +1 -0
  18. package/lib/configuration-manager.js +105 -0
  19. package/lib/configuration-manager.js.map +1 -0
  20. package/lib/diagnostic-queue.d.ts +5 -4
  21. package/lib/diagnostic-queue.d.ts.map +1 -1
  22. package/lib/diagnostic-queue.js +7 -8
  23. package/lib/diagnostic-queue.js.map +1 -1
  24. package/lib/document-symbol.d.ts.map +1 -1
  25. package/lib/document-symbol.js +11 -10
  26. package/lib/document-symbol.js.map +1 -1
  27. package/lib/features/fix-all.d.ts.map +1 -1
  28. package/lib/features/fix-all.js +96 -112
  29. package/lib/features/fix-all.js.map +1 -1
  30. package/lib/features/inlay-hints.d.ts +11 -0
  31. package/lib/features/inlay-hints.d.ts.map +1 -0
  32. package/lib/features/inlay-hints.js +70 -0
  33. package/lib/features/inlay-hints.js.map +1 -0
  34. package/lib/features/source-definition.d.ts +11 -0
  35. package/lib/features/source-definition.d.ts.map +1 -0
  36. package/lib/features/source-definition.js +50 -0
  37. package/lib/features/source-definition.js.map +1 -0
  38. package/lib/file-lsp-server.spec.js +16 -25
  39. package/lib/file-lsp-server.spec.js.map +1 -1
  40. package/lib/hover.d.ts +2 -1
  41. package/lib/hover.d.ts.map +1 -1
  42. package/lib/hover.js +47 -7
  43. package/lib/hover.js.map +1 -1
  44. package/lib/logger.js +1 -1
  45. package/lib/logger.js.map +1 -1
  46. package/lib/lsp-client.d.ts +11 -15
  47. package/lib/lsp-client.d.ts.map +1 -1
  48. package/lib/lsp-client.js +29 -61
  49. package/lib/lsp-client.js.map +1 -1
  50. package/lib/lsp-connection.d.ts.map +1 -1
  51. package/lib/lsp-connection.js +3 -2
  52. package/lib/lsp-connection.js.map +1 -1
  53. package/lib/lsp-protocol.inlayHints.proposed.d.ts +0 -9
  54. package/lib/lsp-protocol.inlayHints.proposed.d.ts.map +1 -1
  55. package/lib/lsp-server.d.ts +15 -20
  56. package/lib/lsp-server.d.ts.map +1 -1
  57. package/lib/lsp-server.js +807 -901
  58. package/lib/lsp-server.js.map +1 -1
  59. package/lib/lsp-server.spec.js +772 -495
  60. package/lib/lsp-server.spec.js.map +1 -1
  61. package/lib/organize-imports.spec.js +8 -8
  62. package/lib/protocol-translation.d.ts +2 -7
  63. package/lib/protocol-translation.d.ts.map +1 -1
  64. package/lib/protocol-translation.js +19 -106
  65. package/lib/protocol-translation.js.map +1 -1
  66. package/lib/quickfix.js +1 -1
  67. package/lib/refactor.js +5 -1
  68. package/lib/refactor.js.map +1 -1
  69. package/lib/test-utils.d.ts +4 -3
  70. package/lib/test-utils.d.ts.map +1 -1
  71. package/lib/test-utils.js +103 -77
  72. package/lib/test-utils.js.map +1 -1
  73. package/lib/ts-protocol.d.ts +4 -19
  74. package/lib/ts-protocol.d.ts.map +1 -1
  75. package/lib/ts-protocol.js.map +1 -1
  76. package/lib/tsp-client.d.ts +36 -32
  77. package/lib/tsp-client.d.ts.map +1 -1
  78. package/lib/tsp-client.js +9 -7
  79. package/lib/tsp-client.js.map +1 -1
  80. package/lib/tsp-client.spec.js +26 -33
  81. package/lib/tsp-client.spec.js.map +1 -1
  82. package/lib/tsp-command-types.d.ts +1 -0
  83. package/lib/tsp-command-types.d.ts.map +1 -1
  84. package/lib/tsp-command-types.js +1 -1
  85. package/lib/tsp-command-types.js.map +1 -1
  86. package/lib/utils/typeConverters.d.ts +19 -1
  87. package/lib/utils/typeConverters.d.ts.map +1 -1
  88. package/lib/utils/typeConverters.js +103 -4
  89. package/lib/utils/typeConverters.js.map +1 -1
  90. package/lib/utils/versionProvider.js +17 -19
  91. package/lib/utils/versionProvider.js.map +1 -1
  92. package/lib/utils.d.ts.map +1 -1
  93. package/lib/utils.js +2 -0
  94. package/lib/utils.js.map +1 -1
  95. package/package.json +10 -7
package/lib/test-utils.js CHANGED
@@ -4,19 +4,11 @@
4
4
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License.
5
5
  * You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
6
6
  */
7
- var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
8
- function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
9
- return new (P || (P = Promise))(function (resolve, reject) {
10
- function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
11
- function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
12
- function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
13
- step((generator = generator.apply(thisArg, _arguments || [])).next());
14
- });
15
- };
16
7
  import { platform } from 'node:os';
17
8
  import * as path from 'node:path';
18
9
  import * as fs from 'node:fs';
19
10
  import { fileURLToPath } from 'node:url';
11
+ import deepmerge from 'deepmerge';
20
12
  import * as lsp from 'vscode-languageserver';
21
13
  import { normalizePath, pathToUri } from './protocol-translation.js';
22
14
  import { LspServer } from './lsp-server.js';
@@ -25,29 +17,46 @@ import { TextDocument } from 'vscode-languageserver-textdocument';
25
17
  import { TypeScriptVersionProvider } from './utils/versionProvider.js';
26
18
  const CONSOLE_LOG_LEVEL = ConsoleLogger.toMessageTypeLevel(process.env.CONSOLE_LOG_LEVEL);
27
19
  export const PACKAGE_ROOT = fileURLToPath(new URL('..', import.meta.url));
28
- export function getDefaultClientCapabilities() {
29
- return {
30
- textDocument: {
31
- completion: {
32
- completionItem: {
33
- labelDetailsSupport: true
34
- }
20
+ const DEFAULT_TEST_CLIENT_CAPABILITIES = {
21
+ textDocument: {
22
+ completion: {
23
+ completionItem: {
24
+ snippetSupport: true,
25
+ labelDetailsSupport: true,
35
26
  },
36
- documentSymbol: {
37
- hierarchicalDocumentSymbolSupport: true
27
+ },
28
+ documentSymbol: {
29
+ hierarchicalDocumentSymbolSupport: true,
30
+ },
31
+ publishDiagnostics: {
32
+ tagSupport: {
33
+ valueSet: [
34
+ lsp.DiagnosticTag.Unnecessary,
35
+ lsp.DiagnosticTag.Deprecated,
36
+ ],
38
37
  },
39
- publishDiagnostics: {
40
- tagSupport: {
41
- valueSet: [
42
- lsp.DiagnosticTag.Unnecessary,
43
- lsp.DiagnosticTag.Deprecated
44
- ]
45
- }
46
- },
47
- moniker: {}
48
- }
49
- };
50
- }
38
+ },
39
+ moniker: {},
40
+ },
41
+ };
42
+ const DEFAULT_TEST_CLIENT_INITIALIZATION_OPTIONS = {
43
+ plugins: [],
44
+ preferences: {
45
+ allowIncompleteCompletions: true,
46
+ allowRenameOfImportPath: true,
47
+ allowTextChangesInNewFiles: true,
48
+ displayPartsForJSDoc: true,
49
+ generateReturnInDocTemplate: true,
50
+ includeAutomaticOptionalChainCompletions: true,
51
+ includeCompletionsForImportStatements: true,
52
+ includeCompletionsForModuleExports: true,
53
+ includeCompletionsWithClassMemberSnippets: true,
54
+ includeCompletionsWithInsertText: true,
55
+ includeCompletionsWithSnippetText: true,
56
+ jsxAttributeCompletionStyle: 'auto',
57
+ providePrefixAndSuffixTextForRename: true,
58
+ },
59
+ };
51
60
  export function uri(...components) {
52
61
  const resolved = filePath(...components);
53
62
  return pathToUri(resolved, undefined);
@@ -63,7 +72,7 @@ export function positionAt(document, idx) {
63
72
  const pos = doc.positionAt(idx);
64
73
  return {
65
74
  line: pos.line,
66
- character: pos.character
75
+ character: pos.character,
67
76
  };
68
77
  }
69
78
  export function position(document, match) {
@@ -81,58 +90,75 @@ export function toPlatformEOL(text) {
81
90
  }
82
91
  return text;
83
92
  }
93
+ class TestLspClient {
94
+ constructor(options, logger) {
95
+ this.options = options;
96
+ this.logger = logger;
97
+ this.workspaceEditsListener = null;
98
+ }
99
+ async createProgressReporter(_token, _workDoneProgress) {
100
+ const reporter = new class {
101
+ begin(_title, _percentage, _message, _cancellable) { }
102
+ report(_message) { }
103
+ done() { }
104
+ };
105
+ return reporter;
106
+ }
107
+ async withProgress(_options, task) {
108
+ const progress = await this.createProgressReporter();
109
+ return await task(progress);
110
+ }
111
+ publishDiagnostics(args) {
112
+ return this.options.publishDiagnostics(args);
113
+ }
114
+ showErrorMessage(message) {
115
+ this.logger.error(`[showErrorMessage] ${message}`);
116
+ }
117
+ logMessage(args) {
118
+ this.logger.log('logMessage', JSON.stringify(args));
119
+ }
120
+ addApplyWorkspaceEditListener(listener) {
121
+ this.workspaceEditsListener = listener;
122
+ }
123
+ async applyWorkspaceEdit(args) {
124
+ if (this.workspaceEditsListener) {
125
+ this.workspaceEditsListener(args);
126
+ }
127
+ return { applied: true };
128
+ }
129
+ async rename() {
130
+ throw new Error('unsupported');
131
+ }
132
+ }
84
133
  export class TestLspServer extends LspServer {
85
134
  constructor() {
86
135
  super(...arguments);
87
136
  this.workspaceEdits = [];
88
137
  }
89
138
  }
90
- export function createServer(options) {
91
- return __awaiter(this, void 0, void 0, function* () {
92
- const typescriptVersionProvider = new TypeScriptVersionProvider();
93
- const bundled = typescriptVersionProvider.bundledVersion();
94
- const logger = new ConsoleLogger(CONSOLE_LOG_LEVEL);
95
- const server = new TestLspServer({
96
- logger,
97
- tsserverPath: bundled.tsServerPath,
98
- tsserverLogVerbosity: options.tsserverLogVerbosity,
99
- tsserverLogFile: path.resolve(PACKAGE_ROOT, 'tsserver.log'),
100
- lspClient: {
101
- setClientCapabilites() { },
102
- createProgressReporter() {
103
- return {
104
- begin() { },
105
- report() { },
106
- end() { }
107
- };
108
- },
109
- publishDiagnostics: options.publishDiagnostics,
110
- showMessage(args) {
111
- throw args; // should not be called.
112
- },
113
- logMessage(args) {
114
- logger.log('logMessage', JSON.stringify(args));
115
- },
116
- telemetry(args) {
117
- logger.log('telemetry', JSON.stringify(args));
118
- },
119
- applyWorkspaceEdit(args) {
120
- return __awaiter(this, void 0, void 0, function* () {
121
- server.workspaceEdits.push(args);
122
- return { applied: true };
123
- });
124
- },
125
- rename: () => Promise.reject(new Error('unsupported'))
126
- }
127
- });
128
- yield server.initialize({
129
- rootPath: undefined,
130
- rootUri: options.rootUri,
131
- processId: 42,
132
- capabilities: options.clientCapabilitiesOverride || getDefaultClientCapabilities(),
133
- workspaceFolders: null
134
- });
135
- return server;
139
+ export async function createServer(options) {
140
+ const typescriptVersionProvider = new TypeScriptVersionProvider();
141
+ const bundled = typescriptVersionProvider.bundledVersion();
142
+ const logger = new ConsoleLogger(CONSOLE_LOG_LEVEL);
143
+ const lspClient = new TestLspClient(options, logger);
144
+ const server = new TestLspServer({
145
+ logger,
146
+ tsserverPath: bundled.tsServerPath,
147
+ tsserverLogVerbosity: options.tsserverLogVerbosity,
148
+ tsserverLogFile: path.resolve(PACKAGE_ROOT, 'tsserver.log'),
149
+ lspClient,
150
+ });
151
+ lspClient.addApplyWorkspaceEditListener(args => {
152
+ server.workspaceEdits.push(args);
153
+ });
154
+ await server.initialize({
155
+ rootPath: undefined,
156
+ rootUri: options.rootUri,
157
+ processId: 42,
158
+ capabilities: deepmerge(DEFAULT_TEST_CLIENT_CAPABILITIES, options.clientCapabilitiesOverride || {}),
159
+ initializationOptions: DEFAULT_TEST_CLIENT_INITIALIZATION_OPTIONS,
160
+ workspaceFolders: null,
136
161
  });
162
+ return server;
137
163
  }
138
164
  //# sourceMappingURL=test-utils.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"test-utils.js","sourceRoot":"","sources":["../src/test-utils.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"test-utils.js","sourceRoot":"","sources":["../src/test-utils.ts"],"names":[],"mappings":"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"}
@@ -3,7 +3,6 @@
3
3
  */
4
4
  import * as lsp from 'vscode-languageserver-protocol';
5
5
  import type tsp from 'typescript/lib/protocol.d.js';
6
- import { InlayHintsOptions } from './lsp-protocol.inlayHints.proposed.js';
7
6
  export declare namespace TypeScriptRenameRequest {
8
7
  const type: lsp.RequestType<lsp.TextDocumentPositionParams, void, void>;
9
8
  }
@@ -16,7 +15,10 @@ export declare class DisplayPartKind {
16
15
  static readonly text = "text";
17
16
  }
18
17
  export interface SupportedFeatures {
19
- labelDetails?: boolean;
18
+ completionLabelDetails?: boolean;
19
+ completionSnippets?: boolean;
20
+ diagnosticsTagSupport?: boolean;
21
+ definitionLinkSupport?: boolean;
20
22
  }
21
23
  export interface TypeScriptPlugin {
22
24
  name: string;
@@ -38,21 +40,4 @@ export declare type TypeScriptInitializeParams = lsp.InitializeParams & {
38
40
  export interface TypeScriptInitializeResult extends lsp.InitializeResult {
39
41
  logFileUri?: string;
40
42
  }
41
- export interface TypeScriptWorkspaceSettingsLanguageSettings {
42
- format?: tsp.FormatCodeSettings;
43
- inlayHints?: InlayHintsOptions;
44
- }
45
- interface TypeScriptWorkspaceSettingsDiagnostics {
46
- ignoredCodes?: number[];
47
- }
48
- export interface TypeScriptWorkspaceSettings {
49
- javascript?: TypeScriptWorkspaceSettingsLanguageSettings;
50
- typescript?: TypeScriptWorkspaceSettingsLanguageSettings;
51
- completions?: CompletionOptions;
52
- diagnostics?: TypeScriptWorkspaceSettingsDiagnostics;
53
- }
54
- export interface CompletionOptions {
55
- completeFunctionCalls?: boolean;
56
- }
57
- export {};
58
43
  //# sourceMappingURL=ts-protocol.d.ts.map
@@ -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,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"}
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;AAEpD,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,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,qBAAqB,CAAC,EAAE,OAAO,CAAC;CACnC;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"}
@@ -1 +1 @@
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"}
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;AAGtD,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"}
@@ -3,7 +3,9 @@ import type tsp from 'typescript/lib/protocol.d.js';
3
3
  import { CancellationToken } from 'vscode-jsonrpc';
4
4
  import { CommandTypes } from './tsp-command-types.js';
5
5
  import { Logger } from './logger.js';
6
+ import API from './utils/api.js';
6
7
  export interface TspClientOptions {
8
+ apiVersion: API;
7
9
  logger: Logger;
8
10
  tsserverPath: string;
9
11
  logFile?: string;
@@ -18,41 +20,43 @@ export interface TspClientOptions {
18
20
  onExit?: (exitCode: number | null, signal: NodeJS.Signals | null) => void;
19
21
  }
20
22
  interface TypeScriptRequestTypes {
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];
23
+ [CommandTypes.ApplyCodeActionCommand]: [tsp.ApplyCodeActionCommandRequestArgs, tsp.ApplyCodeActionCommandResponse];
24
+ [CommandTypes.CompilerOptionsForInferredProjects]: [tsp.SetCompilerOptionsForInferredProjectsArgs, tsp.SetCompilerOptionsForInferredProjectsResponse];
25
+ [CommandTypes.CompletionDetails]: [tsp.CompletionDetailsRequestArgs, tsp.CompletionDetailsResponse];
26
+ [CommandTypes.CompletionInfo]: [tsp.CompletionsRequestArgs, tsp.CompletionInfoResponse];
27
+ [CommandTypes.Configure]: [tsp.ConfigureRequestArguments, tsp.ConfigureResponse];
28
+ [CommandTypes.Definition]: [tsp.FileLocationRequestArgs, tsp.DefinitionResponse];
29
+ [CommandTypes.DefinitionAndBoundSpan]: [tsp.FileLocationRequestArgs, tsp.DefinitionInfoAndBoundSpanResponse];
30
+ [CommandTypes.DocCommentTemplate]: [tsp.FileLocationRequestArgs, tsp.DocCommandTemplateResponse];
31
+ [CommandTypes.DocumentHighlights]: [tsp.DocumentHighlightsRequestArgs, tsp.DocumentHighlightsResponse];
32
+ [CommandTypes.EncodedSemanticClassificationsFull]: [tsp.EncodedSemanticClassificationsRequestArgs, tsp.EncodedSemanticClassificationsResponse];
33
+ [CommandTypes.FindSourceDefinition]: [tsp.FileLocationRequestArgs, tsp.DefinitionResponse];
34
+ [CommandTypes.Format]: [tsp.FormatRequestArgs, tsp.FormatResponse];
35
+ [CommandTypes.Formatonkey]: [tsp.FormatOnKeyRequestArgs, tsp.FormatResponse];
36
+ [CommandTypes.GetApplicableRefactors]: [tsp.GetApplicableRefactorsRequestArgs, tsp.GetApplicableRefactorsResponse];
37
+ [CommandTypes.GetCodeFixes]: [tsp.CodeFixRequestArgs, tsp.CodeFixResponse];
38
+ [CommandTypes.GetCombinedCodeFix]: [tsp.GetCombinedCodeFixRequestArgs, tsp.GetCombinedCodeFixResponse];
39
+ [CommandTypes.GetEditsForFileRename]: [tsp.GetEditsForFileRenameRequestArgs, tsp.GetEditsForFileRenameResponse];
40
+ [CommandTypes.GetEditsForRefactor]: [tsp.GetEditsForRefactorRequestArgs, tsp.GetEditsForRefactorResponse];
41
+ [CommandTypes.Geterr]: [tsp.GeterrRequestArgs, any];
42
+ [CommandTypes.GetOutliningSpans]: [tsp.FileRequestArgs, tsp.OutliningSpansResponse];
43
+ [CommandTypes.GetSupportedCodeFixes]: [null, tsp.GetSupportedCodeFixesResponse];
44
+ [CommandTypes.Implementation]: [tsp.FileLocationRequestArgs, tsp.ImplementationResponse];
45
+ [CommandTypes.JsxClosingTag]: [tsp.JsxClosingTagRequestArgs, tsp.JsxClosingTagResponse];
46
+ [CommandTypes.Navto]: [tsp.NavtoRequestArgs, tsp.NavtoResponse];
47
+ [CommandTypes.NavTree]: [tsp.FileRequestArgs, tsp.NavTreeResponse];
48
+ [CommandTypes.OrganizeImports]: [tsp.OrganizeImportsRequestArgs, tsp.OrganizeImportsResponse];
49
+ [CommandTypes.ProjectInfo]: [tsp.ProjectInfoRequestArgs, tsp.ProjectInfoResponse];
50
+ [CommandTypes.ProvideInlayHints]: [tsp.InlayHintsRequestArgs, tsp.InlayHintsResponse];
51
+ [CommandTypes.Quickinfo]: [tsp.FileLocationRequestArgs, tsp.QuickInfoResponse];
52
+ [CommandTypes.References]: [tsp.FileLocationRequestArgs, tsp.ReferencesResponse];
53
+ [CommandTypes.Rename]: [tsp.RenameRequestArgs, tsp.RenameResponse];
54
+ [CommandTypes.SignatureHelp]: [tsp.SignatureHelpRequestArgs, tsp.SignatureHelpResponse];
55
+ [CommandTypes.TypeDefinition]: [tsp.FileLocationRequestArgs, tsp.TypeDefinitionResponse];
53
56
  }
54
57
  export declare class TspClient {
55
58
  private options;
59
+ apiVersion: API;
56
60
  private tsserverProc;
57
61
  private readlineInterface;
58
62
  private seq;
@@ -1 +1 @@
1
- {"version":3,"file":"tsp-client.d.ts","sourceRoot":"","sources":["../src/tsp-client.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"tsp-client.d.ts","sourceRoot":"","sources":["../src/tsp-client.ts"],"names":[],"mappings":";AAWA,OAAO,KAAK,GAAG,MAAM,8BAA8B,CAAC;AACpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAEnD,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,EAAE,MAAM,EAAmB,MAAM,aAAa,CAAC;AAEtD,OAAO,GAAG,MAAM,gBAAgB,CAAC;AAEjC,MAAM,WAAW,gBAAgB;IAC7B,UAAU,EAAE,GAAG,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,iCAAiC,CAAC,EAAE,OAAO,CAAC;IAC5C,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAC;IAChC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,CAAC,KAAK,KAAK,IAAI,CAAC;IACrC,MAAM,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,OAAO,GAAG,IAAI,KAAK,IAAI,CAAC;CAC7E;AAED,UAAU,sBAAsB;IAC5B,CAAC,YAAY,CAAC,sBAAsB,CAAC,EAAE,CAAC,GAAG,CAAC,iCAAiC,EAAE,GAAG,CAAC,8BAA8B,CAAC,CAAC;IACnH,CAAC,YAAY,CAAC,kCAAkC,CAAC,EAAE,CAAC,GAAG,CAAC,yCAAyC,EAAE,GAAG,CAAC,6CAA6C,CAAC,CAAC;IACtJ,CAAC,YAAY,CAAC,iBAAiB,CAAC,EAAE,CAAC,GAAG,CAAC,4BAA4B,EAAE,GAAG,CAAC,yBAAyB,CAAC,CAAC;IACpG,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE,CAAC,GAAG,CAAC,sBAAsB,EAAE,GAAG,CAAC,sBAAsB,CAAC,CAAC;IACxF,CAAC,YAAY,CAAC,SAAS,CAAC,EAAE,CAAC,GAAG,CAAC,yBAAyB,EAAE,GAAG,CAAC,iBAAiB,CAAC,CAAC;IACjF,CAAC,YAAY,CAAC,UAAU,CAAC,EAAE,CAAC,GAAG,CAAC,uBAAuB,EAAE,GAAG,CAAC,kBAAkB,CAAC,CAAC;IACjF,CAAC,YAAY,CAAC,sBAAsB,CAAC,EAAE,CAAC,GAAG,CAAC,uBAAuB,EAAE,GAAG,CAAC,kCAAkC,CAAC,CAAC;IAC7G,CAAC,YAAY,CAAC,kBAAkB,CAAC,EAAE,CAAC,GAAG,CAAC,uBAAuB,EAAE,GAAG,CAAC,0BAA0B,CAAC,CAAC;IACjG,CAAC,YAAY,CAAC,kBAAkB,CAAC,EAAE,CAAC,GAAG,CAAC,6BAA6B,EAAE,GAAG,CAAC,0BAA0B,CAAC,CAAC;IACvG,CAAC,YAAY,CAAC,kCAAkC,CAAC,EAAE,CAAC,GAAG,CAAC,yCAAyC,EAAE,GAAG,CAAC,sCAAsC,CAAC,CAAC;IAC/I,CAAC,YAAY,CAAC,oBAAoB,CAAC,EAAE,CAAC,GAAG,CAAC,uBAAuB,EAAE,GAAG,CAAC,kBAAkB,CAAC,CAAC;IAC3F,CAAC,YAAY,CAAC,MAAM,CAAC,EAAE,CAAC,GAAG,CAAC,iBAAiB,EAAE,GAAG,CAAC,cAAc,CAAC,CAAC;IACnE,CAAC,YAAY,CAAC,WAAW,CAAC,EAAE,CAAC,GAAG,CAAC,sBAAsB,EAAE,GAAG,CAAC,cAAc,CAAC,CAAC;IAC7E,CAAC,YAAY,CAAC,sBAAsB,CAAC,EAAE,CAAC,GAAG,CAAC,iCAAiC,EAAE,GAAG,CAAC,8BAA8B,CAAC,CAAC;IACnH,CAAC,YAAY,CAAC,YAAY,CAAC,EAAE,CAAC,GAAG,CAAC,kBAAkB,EAAE,GAAG,CAAC,eAAe,CAAC,CAAC;IAC3E,CAAC,YAAY,CAAC,kBAAkB,CAAC,EAAE,CAAC,GAAG,CAAC,6BAA6B,EAAE,GAAG,CAAC,0BAA0B,CAAC,CAAC;IACvG,CAAC,YAAY,CAAC,qBAAqB,CAAC,EAAE,CAAC,GAAG,CAAC,gCAAgC,EAAE,GAAG,CAAC,6BAA6B,CAAC,CAAC;IAChH,CAAC,YAAY,CAAC,mBAAmB,CAAC,EAAE,CAAC,GAAG,CAAC,8BAA8B,EAAE,GAAG,CAAC,2BAA2B,CAAC,CAAC;IAC1G,CAAC,YAAY,CAAC,MAAM,CAAC,EAAE,CAAC,GAAG,CAAC,iBAAiB,EAAE,GAAG,CAAC,CAAC;IACpD,CAAC,YAAY,CAAC,iBAAiB,CAAC,EAAE,CAAC,GAAG,CAAC,eAAe,EAAE,GAAG,CAAC,sBAAsB,CAAC,CAAC;IACpF,CAAC,YAAY,CAAC,qBAAqB,CAAC,EAAE,CAAC,IAAI,EAAE,GAAG,CAAC,6BAA6B,CAAC,CAAC;IAChF,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE,CAAC,GAAG,CAAC,uBAAuB,EAAE,GAAG,CAAC,sBAAsB,CAAC,CAAC;IACzF,CAAC,YAAY,CAAC,aAAa,CAAC,EAAE,CAAC,GAAG,CAAC,wBAAwB,EAAE,GAAG,CAAC,qBAAqB,CAAC,CAAC;IACxF,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,CAAC,gBAAgB,EAAE,GAAG,CAAC,aAAa,CAAC,CAAC;IAChE,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE,CAAC,GAAG,CAAC,eAAe,EAAE,GAAG,CAAC,eAAe,CAAC,CAAC;IACnE,CAAC,YAAY,CAAC,eAAe,CAAC,EAAE,CAAC,GAAG,CAAC,0BAA0B,EAAE,GAAG,CAAC,uBAAuB,CAAC,CAAC;IAC9F,CAAC,YAAY,CAAC,WAAW,CAAC,EAAE,CAAC,GAAG,CAAC,sBAAsB,EAAE,GAAG,CAAC,mBAAmB,CAAC,CAAC;IAClF,CAAC,YAAY,CAAC,iBAAiB,CAAC,EAAE,CAAC,GAAG,CAAC,qBAAqB,EAAE,GAAG,CAAC,kBAAkB,CAAC,CAAC;IACtF,CAAC,YAAY,CAAC,SAAS,CAAC,EAAE,CAAC,GAAG,CAAC,uBAAuB,EAAE,GAAG,CAAC,iBAAiB,CAAC,CAAC;IAC/E,CAAC,YAAY,CAAC,UAAU,CAAC,EAAE,CAAC,GAAG,CAAC,uBAAuB,EAAE,GAAG,CAAC,kBAAkB,CAAC,CAAC;IACjF,CAAC,YAAY,CAAC,MAAM,CAAC,EAAE,CAAC,GAAG,CAAC,iBAAiB,EAAE,GAAG,CAAC,cAAc,CAAC,CAAC;IACnE,CAAC,YAAY,CAAC,aAAa,CAAC,EAAE,CAAC,GAAG,CAAC,wBAAwB,EAAE,GAAG,CAAC,qBAAqB,CAAC,CAAC;IACxF,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE,CAAC,GAAG,CAAC,uBAAuB,EAAE,GAAG,CAAC,sBAAsB,CAAC,CAAC;CAC5F;AAED,qBAAa,SAAS;IAUN,OAAO,CAAC,OAAO;IATpB,UAAU,EAAE,GAAG,CAAC;IACvB,OAAO,CAAC,YAAY,CAAgC;IACpD,OAAO,CAAC,iBAAiB,CAAkC;IAC3D,OAAO,CAAC,GAAG,CAAK;IAChB,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAyC;IACnE,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,cAAc,CAAS;IAC/B,OAAO,CAAC,oBAAoB,CAAqB;gBAE7B,OAAO,EAAE,gBAAgB;IAM7C,KAAK,IAAI,OAAO;IAuEhB,QAAQ,IAAI,IAAI;IAQhB,MAAM,CAAC,OAAO,EAAE,YAAY,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,CAAC,eAAe,GAAG,IAAI;IACnE,MAAM,CAAC,OAAO,EAAE,YAAY,CAAC,KAAK,EAAE,IAAI,EAAE,GAAG,CAAC,eAAe,GAAG,IAAI;IACpE,MAAM,CAAC,OAAO,EAAE,YAAY,CAAC,MAAM,EAAE,IAAI,EAAE,GAAG,CAAC,iBAAiB,GAAG,IAAI;IACvE,MAAM,CAAC,OAAO,EAAE,YAAY,CAAC,MAAM,EAAE,IAAI,EAAE,GAAG,CAAC,iBAAiB,GAAG,IAAI;IAKvE,OAAO,CAAC,CAAC,SAAS,MAAM,sBAAsB,EAC1C,OAAO,EAAE,CAAC,EACV,IAAI,EAAE,sBAAsB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAClC,KAAK,CAAC,EAAE,iBAAiB,GAC1B,OAAO,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAwBxC,SAAS,CAAC,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,GAAG,GAAG,IAAI;IAmB/E,SAAS,CAAC,cAAc,CAAC,sBAAsB,EAAE,MAAM,GAAG,IAAI;IAoB9D,OAAO,CAAC,eAAe;IAavB,OAAO,CAAC,OAAO;IAIf,OAAO,CAAC,UAAU;IAIlB,OAAO,CAAC,uBAAuB;CAGlC"}
package/lib/tsp-client.js CHANGED
@@ -14,8 +14,11 @@ import { Deferred } from './utils.js';
14
14
  export class TspClient {
15
15
  constructor(options) {
16
16
  this.options = options;
17
+ this.tsserverProc = null;
18
+ this.readlineInterface = null;
17
19
  this.seq = 0;
18
20
  this.deferreds = {};
21
+ this.apiVersion = options.apiVersion;
19
22
  this.logger = new PrefixingLogger(options.logger, '[tsclient]');
20
23
  this.tsserverLogger = new PrefixingLogger(options.logger, '[tsserver]');
21
24
  }
@@ -23,7 +26,7 @@ export class TspClient {
23
26
  if (this.readlineInterface) {
24
27
  return false;
25
28
  }
26
- const { tsserverPath, logFile, logVerbosity, disableAutomaticTypingAcquisition, maxTsServerMemory, npmLocation, locale, globalPlugins, pluginProbeLocations } = this.options;
29
+ const { tsserverPath, logFile, logVerbosity, disableAutomaticTypingAcquisition, maxTsServerMemory, npmLocation, locale, globalPlugins, pluginProbeLocations, } = this.options;
27
30
  const args = [];
28
31
  if (logFile) {
29
32
  args.push('--logFile', logFile);
@@ -53,8 +56,8 @@ export class TspClient {
53
56
  const options = {
54
57
  silent: true,
55
58
  execArgv: [
56
- ...maxTsServerMemory ? [`--max-old-space-size=${maxTsServerMemory}`] : []
57
- ]
59
+ ...maxTsServerMemory ? [`--max-old-space-size=${maxTsServerMemory}`] : [],
60
+ ],
58
61
  };
59
62
  this.tsserverProc = cp.fork(tsserverPath, args, options);
60
63
  this.tsserverProc.on('exit', (exitCode, signal) => {
@@ -78,10 +81,9 @@ export class TspClient {
78
81
  return true;
79
82
  }
80
83
  shutdown() {
81
- var _a, _b;
82
- (_a = this.readlineInterface) === null || _a === void 0 ? void 0 : _a.close();
84
+ this.readlineInterface?.close();
83
85
  if (this.tsserverProc) {
84
- (_b = this.tsserverProc.stdin) === null || _b === void 0 ? void 0 : _b.destroy();
86
+ this.tsserverProc.stdin?.destroy();
85
87
  this.tsserverProc.kill('SIGTERM');
86
88
  }
87
89
  }
@@ -114,7 +116,7 @@ export class TspClient {
114
116
  const request = {
115
117
  command,
116
118
  seq: this.seq,
117
- type: 'request'
119
+ type: 'request',
118
120
  };
119
121
  if (args) {
120
122
  request.arguments = args;
@@ -1 +1 @@
1
- {"version":3,"file":"tsp-client.js","sourceRoot":"","sources":["../src/tsp-client.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"tsp-client.js","sourceRoot":"","sources":["../src/tsp-client.ts"],"names":[],"mappings":"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"}
@@ -4,19 +4,11 @@
4
4
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License.
5
5
  * You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
6
6
  */
7
- var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
8
- function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
9
- return new (P || (P = Promise))(function (resolve, reject) {
10
- function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
11
- function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
12
- function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
13
- step((generator = generator.apply(thisArg, _arguments || [])).next());
14
- });
15
- };
16
7
  import * as chai from 'chai';
17
8
  import { TspClient } from './tsp-client.js';
18
9
  import { ConsoleLogger } from './logger.js';
19
10
  import { filePath, readContents } from './test-utils.js';
11
+ import API from './utils/api.js';
20
12
  import { TypeScriptVersionProvider } from './utils/versionProvider.js';
21
13
  const assert = chai.assert;
22
14
  const typescriptVersionProvider = new TypeScriptVersionProvider();
@@ -24,8 +16,9 @@ const bundled = typescriptVersionProvider.bundledVersion();
24
16
  let server;
25
17
  before(() => {
26
18
  server = new TspClient({
19
+ apiVersion: API.defaultVersion,
27
20
  logger: new ConsoleLogger(),
28
- tsserverPath: bundled.tsServerPath
21
+ tsserverPath: bundled.tsServerPath,
29
22
  });
30
23
  });
31
24
  after(() => {
@@ -35,69 +28,69 @@ describe('ts server client', () => {
35
28
  before(() => {
36
29
  server.start();
37
30
  });
38
- it('completion', () => __awaiter(void 0, void 0, void 0, function* () {
31
+ it('completion', async () => {
39
32
  const f = filePath('module2.ts');
40
33
  server.notify("open" /* CommandTypes.Open */, {
41
34
  file: f,
42
- fileContent: readContents(f)
35
+ fileContent: readContents(f),
43
36
  });
44
- const completions = yield server.request("completionInfo" /* CommandTypes.CompletionInfo */, {
37
+ const completions = await server.request("completionInfo" /* CommandTypes.CompletionInfo */, {
45
38
  file: f,
46
39
  line: 1,
47
40
  offset: 0,
48
- prefix: 'im'
41
+ prefix: 'im',
49
42
  });
50
43
  assert.isDefined(completions.body);
51
44
  assert.equal(completions.body.entries[1].name, 'ImageBitmap');
52
- }));
53
- it('references', () => __awaiter(void 0, void 0, void 0, function* () {
45
+ });
46
+ it('references', async () => {
54
47
  const f = filePath('module2.ts');
55
48
  server.notify("open" /* CommandTypes.Open */, {
56
49
  file: f,
57
- fileContent: readContents(f)
50
+ fileContent: readContents(f),
58
51
  });
59
- const references = yield server.request("references" /* CommandTypes.References */, {
52
+ const references = await server.request("references" /* CommandTypes.References */, {
60
53
  file: f,
61
54
  line: 8,
62
- offset: 16
55
+ offset: 16,
63
56
  });
64
57
  assert.isDefined(references.body);
65
58
  assert.equal(references.body.symbolName, 'doStuff');
66
- }));
67
- it('inlayHints', () => __awaiter(void 0, void 0, void 0, function* () {
59
+ });
60
+ it('inlayHints', async () => {
68
61
  const f = filePath('module2.ts');
69
62
  server.notify("open" /* CommandTypes.Open */, {
70
63
  file: f,
71
- fileContent: readContents(f)
64
+ fileContent: readContents(f),
72
65
  });
73
- yield server.request("configure" /* CommandTypes.Configure */, {
66
+ await server.request("configure" /* CommandTypes.Configure */, {
74
67
  preferences: {
75
- includeInlayFunctionLikeReturnTypeHints: true
76
- }
68
+ includeInlayFunctionLikeReturnTypeHints: true,
69
+ },
77
70
  });
78
- const inlayHints = yield server.request("provideInlayHints" /* CommandTypes.ProvideInlayHints */, {
71
+ const inlayHints = await server.request("provideInlayHints" /* CommandTypes.ProvideInlayHints */, {
79
72
  file: f,
80
73
  start: 0,
81
- length: 1000
74
+ length: 1000,
82
75
  });
83
76
  assert.isDefined(inlayHints.body);
84
77
  assert.equal(inlayHints.body[0].text, ': boolean');
85
- }));
86
- it('documentHighlight', () => __awaiter(void 0, void 0, void 0, function* () {
78
+ });
79
+ it('documentHighlight', async () => {
87
80
  const f = filePath('module2.ts');
88
81
  server.notify("open" /* CommandTypes.Open */, {
89
82
  file: f,
90
- fileContent: readContents(f)
83
+ fileContent: readContents(f),
91
84
  });
92
- const response = yield server.request("documentHighlights" /* CommandTypes.DocumentHighlights */, {
85
+ const response = await server.request("documentHighlights" /* CommandTypes.DocumentHighlights */, {
93
86
  file: f,
94
87
  line: 8,
95
88
  offset: 16,
96
- filesToSearch: [f]
89
+ filesToSearch: [f],
97
90
  });
98
91
  assert.isDefined(response.body);
99
92
  assert.isTrue(response.body.some(({ file }) => file.endsWith('module2.ts')), JSON.stringify(response.body, undefined, 2));
100
93
  assert.isFalse(response.body.some(({ file: file_1 }) => file_1.endsWith('module1.ts')), JSON.stringify(response.body, undefined, 2));
101
- }));
94
+ });
102
95
  });
103
96
  //# sourceMappingURL=tsp-client.spec.js.map