typescript-language-server 2.0.0 → 2.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (76) hide show
  1. package/CHANGELOG.md +23 -0
  2. package/README.md +72 -6
  3. package/lib/cli.js +4 -8
  4. package/lib/cli.js.map +1 -1
  5. package/lib/commands.d.ts +1 -0
  6. package/lib/commands.d.ts.map +1 -1
  7. package/lib/commands.js +1 -0
  8. package/lib/commands.js.map +1 -1
  9. package/lib/completion.d.ts +3 -2
  10. package/lib/completion.d.ts.map +1 -1
  11. package/lib/completion.js +11 -9
  12. package/lib/completion.js.map +1 -1
  13. package/lib/configuration-manager.d.ts +11 -2
  14. package/lib/configuration-manager.d.ts.map +1 -1
  15. package/lib/configuration-manager.js +15 -4
  16. package/lib/configuration-manager.js.map +1 -1
  17. package/lib/document.d.ts +4 -1
  18. package/lib/document.d.ts.map +1 -1
  19. package/lib/document.js +9 -0
  20. package/lib/document.js.map +1 -1
  21. package/lib/hover.d.ts +2 -1
  22. package/lib/hover.d.ts.map +1 -1
  23. package/lib/hover.js +13 -15
  24. package/lib/hover.js.map +1 -1
  25. package/lib/lsp-connection.d.ts +2 -2
  26. package/lib/lsp-connection.d.ts.map +1 -1
  27. package/lib/lsp-connection.js +2 -2
  28. package/lib/lsp-connection.js.map +1 -1
  29. package/lib/lsp-server.d.ts +2 -1
  30. package/lib/lsp-server.d.ts.map +1 -1
  31. package/lib/lsp-server.js +68 -53
  32. package/lib/lsp-server.js.map +1 -1
  33. package/lib/protocol-translation.d.ts +0 -8
  34. package/lib/protocol-translation.d.ts.map +1 -1
  35. package/lib/protocol-translation.js +0 -69
  36. package/lib/protocol-translation.js.map +1 -1
  37. package/lib/test-utils.js +1 -1
  38. package/lib/test-utils.js.map +1 -1
  39. package/lib/ts-protocol.d.ts +14 -1
  40. package/lib/ts-protocol.d.ts.map +1 -1
  41. package/lib/tsServer/requests.d.ts +1 -0
  42. package/lib/tsServer/requests.d.ts.map +1 -1
  43. package/lib/tsServer/serverProcess.js +1 -2
  44. package/lib/tsServer/serverProcess.js.map +1 -1
  45. package/lib/tsServer/spawner.js +2 -2
  46. package/lib/tsServer/spawner.js.map +1 -1
  47. package/lib/tsServer/versionProvider.d.ts +3 -7
  48. package/lib/tsServer/versionProvider.d.ts.map +1 -1
  49. package/lib/tsServer/versionProvider.js +19 -21
  50. package/lib/tsServer/versionProvider.js.map +1 -1
  51. package/lib/tsp-client.d.ts.map +1 -1
  52. package/lib/tsp-client.js +8 -11
  53. package/lib/tsp-client.js.map +1 -1
  54. package/lib/tsp-client.spec.js +1 -1
  55. package/lib/tsp-client.spec.js.map +1 -1
  56. package/lib/utils/MarkdownString.d.ts +15 -0
  57. package/lib/utils/MarkdownString.d.ts.map +1 -0
  58. package/lib/utils/MarkdownString.js +45 -0
  59. package/lib/utils/MarkdownString.js.map +1 -0
  60. package/lib/utils/configuration.d.ts +2 -1
  61. package/lib/utils/configuration.d.ts.map +1 -1
  62. package/lib/utils/configuration.js +4 -1
  63. package/lib/utils/configuration.js.map +1 -1
  64. package/lib/utils/previewer.d.ts +15 -0
  65. package/lib/utils/previewer.d.ts.map +1 -0
  66. package/lib/utils/previewer.js +185 -0
  67. package/lib/utils/previewer.js.map +1 -0
  68. package/lib/utils/previewer.spec.d.ts +2 -0
  69. package/lib/utils/previewer.spec.d.ts.map +1 -0
  70. package/lib/utils/previewer.spec.js +123 -0
  71. package/lib/utils/previewer.spec.js.map +1 -0
  72. package/lib/utils/tsconfig.d.ts +4 -0
  73. package/lib/utils/tsconfig.d.ts.map +1 -0
  74. package/lib/utils/tsconfig.js +40 -0
  75. package/lib/utils/tsconfig.js.map +1 -0
  76. package/package.json +7 -7
@@ -185,73 +185,4 @@ function toDocumentHighlightKind(kind) {
185
185
  default: return lsp.DocumentHighlightKind.Text;
186
186
  }
187
187
  }
188
- export function asDocumentation(data) {
189
- let value = '';
190
- if (data.documentation) {
191
- value += asPlainText(data.documentation);
192
- }
193
- if (data.tags) {
194
- const tagsDocumentation = asTagsDocumentation(data.tags);
195
- if (tagsDocumentation) {
196
- value += '\n\n' + tagsDocumentation;
197
- }
198
- }
199
- return value.length ? {
200
- kind: lsp.MarkupKind.Markdown,
201
- value,
202
- } : undefined;
203
- }
204
- export function asTagsDocumentation(tags) {
205
- return tags.map(asTagDocumentation).join(' \n\n');
206
- }
207
- export function asTagDocumentation(tag) {
208
- switch (tag.name) {
209
- case 'param': {
210
- if (!tag.text) {
211
- break;
212
- }
213
- const text = asPlainText(tag.text);
214
- const body = text.split(/^([\w.]+)\s*-?\s*/);
215
- if (body && body.length === 3) {
216
- const param = body[1];
217
- const doc = body[2];
218
- const label = `*@${tag.name}* \`${param}\``;
219
- if (!doc) {
220
- return label;
221
- }
222
- return label + (doc.match(/\r\n|\n/g) ? ' \n' + doc : ` — ${doc}`);
223
- }
224
- break;
225
- }
226
- }
227
- // Generic tag
228
- const label = `*@${tag.name}*`;
229
- const text = asTagBodyText(tag);
230
- if (!text) {
231
- return label;
232
- }
233
- return label + (text.match(/\r\n|\n/g) ? ' \n' + text : ` — ${text}`);
234
- }
235
- export function asTagBodyText(tag) {
236
- if (!tag.text) {
237
- return undefined;
238
- }
239
- const text = asPlainText(tag.text);
240
- switch (tag.name) {
241
- case 'example':
242
- case 'default':
243
- // Convert to markdown code block if it not already one
244
- if (text.match(/^\s*[~`]{3}/g)) {
245
- return text;
246
- }
247
- return '```\n' + text + '\n```';
248
- }
249
- return text;
250
- }
251
- export function asPlainText(parts) {
252
- if (typeof parts === 'string') {
253
- return parts;
254
- }
255
- return parts.map(part => part.text).join('');
256
- }
257
188
  //# sourceMappingURL=protocol-translation.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"protocol-translation.js","sourceRoot":"","sources":["../src/protocol-translation.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"protocol-translation.js","sourceRoot":"","sources":["../src/protocol-translation.ts"],"names":[],"mappings":"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"}
package/lib/test-utils.js CHANGED
@@ -153,7 +153,7 @@ export async function createServer(options) {
153
153
  lspClient,
154
154
  tsserverLogVerbosity: TsServerLogLevel.Off,
155
155
  };
156
- const typescriptVersionProvider = new TypeScriptVersionProvider(serverOptions, logger);
156
+ const typescriptVersionProvider = new TypeScriptVersionProvider(serverOptions.tsserverPath, logger);
157
157
  const bundled = typescriptVersionProvider.bundledVersion();
158
158
  const server = new TestLspServer({
159
159
  ...serverOptions,
@@ -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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"}
@@ -44,13 +44,26 @@ export interface TypeScriptInitializationOptions {
44
44
  }
45
45
  interface TsserverOptions {
46
46
  /**
47
- * The path to the directory where the `tsserver` logs will be created.
47
+ * The path to the directory where the `tsserver` log files will be created.
48
48
  * If not provided, the log files will be created within the workspace, inside the `.log` directory.
49
49
  * If no workspace root is provided when initializating the server and no custom path is specified then
50
50
  * the logs will not be created.
51
51
  * @default undefined
52
52
  */
53
53
  logDirectory?: string;
54
+ /**
55
+ * Verbosity of the information logged into the `tsserver` log files.
56
+ *
57
+ * Log levels from least to most amount of details: `'terse'`, `'normal'`, `'requestTime`', `'verbose'`.
58
+ * Enabling particular level also enables all lower levels.
59
+ *
60
+ * @default 'off'
61
+ */
62
+ logVerbosity?: 'off' | 'terse' | 'normal' | 'requestTime' | 'verbose';
63
+ /**
64
+ * The path to the `tsserver.js` file or the typescript lib directory. For example: `/Users/me/typescript/lib/tsserver.js`.
65
+ */
66
+ path?: string;
54
67
  /**
55
68
  * The verbosity of logging the tsserver communication through the LSP messages.
56
69
  * This doesn't affect the file logging.
@@ -1 +1 @@
1
- {"version":3,"file":"ts-protocol.d.ts","sourceRoot":"","sources":["../src/ts-protocol.ts"],"names":[],"mappings":"AAOA;;GAEG;AACH,OAAO,GAAG,MAAM,gCAAgC,CAAC;AACjD,OAAO,KAAK,GAAG,MAAM,8BAA8B,CAAC;AACpD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAEvD,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,oBAAY,mBAAmB;IAC3B,MAAM,WAAW;IACjB,MAAM,WAAW;IACjB,MAAM,WAAW;CACpB;AAED,MAAM,WAAW,iBAAiB;IAC9B,yBAAyB,CAAC,EAAE,OAAO,CAAC;IACpC,8BAA8B,CAAC,EAAE,OAAO,CAAC;IACzC,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,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,gBAAgB,EAAE,CAAC;IAC5B,WAAW,CAAC,EAAE,GAAG,CAAC,eAAe,CAAC;IAClC,QAAQ,CAAC,EAAE,eAAe,CAAC;CAC9B;AAED,UAAU,eAAe;IACrB;;;;;;OAMG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;;;OAIG;IACH,KAAK,CAAC,EAAE,UAAU,CAAC;CACtB;AAED,oBAAY,0BAA0B,GAAG,GAAG,CAAC,gBAAgB,GAAG;IAC5D,qBAAqB,CAAC,EAAE,OAAO,CAAC,+BAA+B,CAAC,CAAC;CACpE,CAAC"}
1
+ {"version":3,"file":"ts-protocol.d.ts","sourceRoot":"","sources":["../src/ts-protocol.ts"],"names":[],"mappings":"AAOA;;GAEG;AACH,OAAO,GAAG,MAAM,gCAAgC,CAAC;AACjD,OAAO,KAAK,GAAG,MAAM,8BAA8B,CAAC;AACpD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAEvD,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,oBAAY,mBAAmB;IAC3B,MAAM,WAAW;IACjB,MAAM,WAAW;IACjB,MAAM,WAAW;CACpB;AAED,MAAM,WAAW,iBAAiB;IAC9B,yBAAyB,CAAC,EAAE,OAAO,CAAC;IACpC,8BAA8B,CAAC,EAAE,OAAO,CAAC;IACzC,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,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,gBAAgB,EAAE,CAAC;IAC5B,WAAW,CAAC,EAAE,GAAG,CAAC,eAAe,CAAC;IAClC,QAAQ,CAAC,EAAE,eAAe,CAAC;CAC9B;AAED,UAAU,eAAe;IACrB;;;;;;OAMG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;;;;;;OAOG;IACH,YAAY,CAAC,EAAE,KAAK,GAAG,OAAO,GAAG,QAAQ,GAAG,aAAa,GAAG,SAAS,CAAC;IACtE;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;;;OAIG;IACH,KAAK,CAAC,EAAE,UAAU,CAAC;CACtB;AAED,oBAAY,0BAA0B,GAAG,GAAG,CAAC,gBAAgB,GAAG;IAC5D,qBAAqB,CAAC,EAAE,OAAO,CAAC,+BAA+B,CAAC,CAAC;CACpE,CAAC"}
@@ -28,6 +28,7 @@ export interface TypeScriptRequestTypes {
28
28
  [CommandTypes.CompletionDetails]: [tsp.CompletionDetailsRequestArgs, tsp.CompletionDetailsResponse];
29
29
  [CommandTypes.CompletionInfo]: [tsp.CompletionsRequestArgs, tsp.CompletionInfoResponse];
30
30
  [CommandTypes.Configure]: [tsp.ConfigureRequestArguments, tsp.ConfigureResponse];
31
+ [CommandTypes.ConfigurePlugin]: [tsp.ConfigurePluginRequestArguments, tsp.ConfigurePluginResponse];
31
32
  [CommandTypes.Definition]: [tsp.FileLocationRequestArgs, tsp.DefinitionResponse];
32
33
  [CommandTypes.DefinitionAndBoundSpan]: [tsp.FileLocationRequestArgs, tsp.DefinitionInfoAndBoundSpanResponse];
33
34
  [CommandTypes.DocCommentTemplate]: [tsp.FileLocationRequestArgs, tsp.DocCommandTemplateResponse];
@@ -1 +1 @@
1
- {"version":3,"file":"requests.d.ts","sourceRoot":"","sources":["../../src/tsServer/requests.ts"],"names":[],"mappings":"AAWA,OAAO,SAAS,MAAM,YAAY,CAAC;AACnC,OAAO,KAAK,GAAG,MAAM,8BAA8B,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C,oBAAY,UAAU;IAClB,MAAM,WAAW;IACjB,QAAQ,aAAa;CACxB;AAED,yBAAiB,cAAc,CAAC;IAE5B,MAAa,SAAS;iBAIE,MAAM,EAAE,MAAM;QAHlC,SAAgB,IAAI,eAAe;oBAGf,MAAM,EAAE,MAAM;KAErC;IAEM,MAAM,SAAS;;KAAiC,CAAC;IAEjD,MAAM,QAAQ;;KAAgC,CAAC;IAEtD,KAAY,QAAQ,CAAC,CAAC,SAAS,GAAG,CAAC,QAAQ,IAAI,CAAC,GAAG,SAAS,GAAG,OAAO,SAAS,GAAG,OAAO,QAAQ,CAAC;CACrG;AAED,MAAM,WAAW,sBAAsB;IACnC,CAAC,YAAY,CAAC,sBAAsB,CAAC,EAAE,CAAC,GAAG,CAAC,iCAAiC,EAAE,GAAG,CAAC,8BAA8B,CAAC,CAAC;IACnH,CAAC,YAAY,CAAC,MAAM,CAAC,EAAE,CAAC,GAAG,CAAC,iBAAiB,EAAE,IAAI,CAAC,CAAC;IACrD,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC;IAClD,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,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC;IACjD,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;IACzF,CAAC,YAAY,CAAC,UAAU,CAAC,EAAE,CAAC,GAAG,CAAC,qBAAqB,EAAE,GAAG,CAAC,QAAQ,CAAC,CAAC;CACxE;AAED,oBAAY,UAAU,GAAG;IACrB,QAAQ,CAAC,WAAW,CAAC,EAAE,OAAO,CAAC;IAC/B,QAAQ,CAAC,cAAc,CAAC,EAAE,OAAO,CAAC;IAClC,QAAQ,CAAC,sBAAsB,CAAC,EAAE,SAAS,CAAC,GAAG,CAAC;IAChD,QAAQ,CAAC,eAAe,CAAC,EAAE,eAAe,CAAC;CAC9C,CAAC"}
1
+ {"version":3,"file":"requests.d.ts","sourceRoot":"","sources":["../../src/tsServer/requests.ts"],"names":[],"mappings":"AAWA,OAAO,SAAS,MAAM,YAAY,CAAC;AACnC,OAAO,KAAK,GAAG,MAAM,8BAA8B,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C,oBAAY,UAAU;IAClB,MAAM,WAAW;IACjB,QAAQ,aAAa;CACxB;AAED,yBAAiB,cAAc,CAAC;IAE5B,MAAa,SAAS;iBAIE,MAAM,EAAE,MAAM;QAHlC,SAAgB,IAAI,eAAe;oBAGf,MAAM,EAAE,MAAM;KAErC;IAEM,MAAM,SAAS;;KAAiC,CAAC;IAEjD,MAAM,QAAQ;;KAAgC,CAAC;IAEtD,KAAY,QAAQ,CAAC,CAAC,SAAS,GAAG,CAAC,QAAQ,IAAI,CAAC,GAAG,SAAS,GAAG,OAAO,SAAS,GAAG,OAAO,QAAQ,CAAC;CACrG;AAED,MAAM,WAAW,sBAAsB;IACnC,CAAC,YAAY,CAAC,sBAAsB,CAAC,EAAE,CAAC,GAAG,CAAC,iCAAiC,EAAE,GAAG,CAAC,8BAA8B,CAAC,CAAC;IACnH,CAAC,YAAY,CAAC,MAAM,CAAC,EAAE,CAAC,GAAG,CAAC,iBAAiB,EAAE,IAAI,CAAC,CAAC;IACrD,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC;IAClD,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,eAAe,CAAC,EAAE,CAAC,GAAG,CAAC,+BAA+B,EAAE,GAAG,CAAC,uBAAuB,CAAC,CAAC;IACnG,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,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC;IACjD,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;IACzF,CAAC,YAAY,CAAC,UAAU,CAAC,EAAE,CAAC,GAAG,CAAC,qBAAqB,EAAE,GAAG,CAAC,QAAQ,CAAC,CAAC;CACxE;AAED,oBAAY,UAAU,GAAG;IACrB,QAAQ,CAAC,WAAW,CAAC,EAAE,OAAO,CAAC;IAC/B,QAAQ,CAAC,cAAc,CAAC,EAAE,OAAO,CAAC;IAClC,QAAQ,CAAC,sBAAsB,CAAC,EAAE,SAAS,CAAC,GAAG,CAAC;IAChD,QAAQ,CAAC,eAAe,CAAC,EAAE,eAAe,CAAC;CAC9C,CAAC"}
@@ -10,11 +10,10 @@
10
10
  */
11
11
  import ChildProcess from 'node:child_process';
12
12
  import path from 'node:path';
13
- import API from '../utils/api.js';
14
13
  export class NodeTsServerProcessFactory {
15
14
  fork(version, args, kind, configuration) {
16
15
  const tsServerPath = version.tsServerPath;
17
- const useIpc = version.version?.gte(API.v460);
16
+ const useIpc = false; // version.version?.gte(API.v460);
18
17
  const runtimeArgs = [...args];
19
18
  if (useIpc) {
20
19
  runtimeArgs.push('--useNodeIpc');
@@ -1 +1 @@
1
- {"version":3,"file":"serverProcess.js","sourceRoot":"","sources":["../../src/tsServer/serverProcess.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"serverProcess.js","sourceRoot":"","sources":["../../src/tsServer/serverProcess.ts"],"names":[],"mappings":"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"}
@@ -36,9 +36,9 @@ export class TypeScriptServerSpawner {
36
36
  this._logger.logIgnoringVerbosity(LogLevel.Error, `<${kind}> Could not create log directory`);
37
37
  }
38
38
  }
39
- const process = processFactory.fork(version, args, "main" /* TsServerProcessKind.Main */, configuration);
39
+ const tsProcess = processFactory.fork(version, args, "main" /* TsServerProcessKind.Main */, configuration);
40
40
  this._logger.log('Starting tsserver');
41
- return new ProcessBasedTsServer(kind, this.kindToServerType(kind), process, tsServerLogFile, canceller, version, this._tracer);
41
+ return new ProcessBasedTsServer(kind, this.kindToServerType(kind), tsProcess, tsServerLogFile, canceller, version, this._tracer);
42
42
  }
43
43
  kindToServerType(kind) {
44
44
  switch (kind) {
@@ -1 +1 @@
1
- {"version":3,"file":"spawner.js","sourceRoot":"","sources":["../../src/tsServer/spawner.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"spawner.js","sourceRoot":"","sources":["../../src/tsServer/spawner.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAChG;;;;;GAKG;AAEH,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,GAAG,MAAM,iBAAiB,CAAC;AAClC,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAU,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAEtD,OAAO,EAAE,2BAA2B,EAAE,MAAM,mBAAmB,CAAC;AAEhE,OAAO,EAAqB,oBAAoB,EAAuB,MAAM,aAAa,CAAC;AAC3F,OAAO,EAAE,0BAA0B,EAAE,MAAM,oBAAoB,CAAC;AAGhE,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAE7D,MAAM,OAAO,uBAAuB;IAChC,YACqB,WAAgB,EAChB,qBAA4C,EAC5C,OAAe,EACf,OAAe;QAHf,gBAAW,GAAX,WAAW,CAAK;QAChB,0BAAqB,GAArB,qBAAqB,CAAuB;QAC5C,YAAO,GAAP,OAAO,CAAQ;QACf,YAAO,GAAP,OAAO,CAAQ;IAChC,CAAC;IAEE,KAAK,CACR,OAA0B,EAC1B,aAA+B;QAE/B,MAAM,IAAI,wCAA2B,CAAC;QACtC,MAAM,cAAc,GAAG,IAAI,0BAA0B,EAAE,CAAC;QACxD,MAAM,SAAS,GAAG,2BAA2B,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;QACzE,MAAM,EAAE,IAAI,EAAE,eAAe,EAAE,GAAG,IAAI,CAAC,eAAe,wCAA2B,aAAa,EAAE,IAAI,CAAC,WAAW,EAAE,SAAS,CAAC,oBAAoB,CAAC,CAAC;QAElJ,IAAI,IAAI,CAAC,gBAAgB,CAAC,aAAa,CAAC,EAAE;YACtC,IAAI,eAAe,EAAE;gBACjB,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,IAAI,eAAe,eAAe,EAAE,CAAC,CAAC;aAC9F;iBAAM;gBACH,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,QAAQ,CAAC,KAAK,EAAE,IAAI,IAAI,kCAAkC,CAAC,CAAC;aACjG;SACJ;QAED,MAAM,SAAS,GAAG,cAAc,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,yCAA4B,aAAa,CAAC,CAAC;QAC9F,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;QACtC,OAAO,IAAI,oBAAoB,CAC3B,IAAI,EACJ,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,EAC3B,SAAS,EACT,eAAe,EACf,SAAS,EACT,OAAO,EACP,IAAI,CAAC,OAAO,CAAC,CAAC;IACtB,CAAC;IAEO,gBAAgB,CAAC,IAAyB;QAC9C,QAAQ,IAAI,EAAE;YACV;gBACI,OAAO,UAAU,CAAC,MAAM,CAAC;YAE7B,2CAA8B;YAC9B,mDAAkC;YAClC,yDAAqC;YACrC;gBACI,OAAO,UAAU,CAAC,QAAQ,CAAC;SAClC;IACL,CAAC;IAEO,eAAe,CACnB,IAAyB,EACzB,aAA+B;IAC/B,qCAAqC;IACrC,UAAe,EACf,oBAAwC;QAExC,MAAM,IAAI,GAAa,EAAE,CAAC;QAC1B,IAAI,eAAmC,CAAC;QACxC,IAAI,sBAA0C,CAAC;QAE/C,IAAI,IAAI,8CAA+B,EAAE;YACrC,IAAI,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;gBAC1B,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,iBAAiB,CAAC,CAAC;aAChD;iBAAM;gBACH,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;aAC7B;SACJ;QAED,IAAI,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;YAC1B,IAAI,CAAC,IAAI,CAAC,oCAAoC,CAAC,CAAC;SACnD;aAAM;YACH,IAAI,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAC;SAC3C;QAED,MAAM,EAAE,iCAAiC,EAAE,aAAa,EAAE,MAAM,EAAE,WAAW,EAAE,oBAAoB,EAAE,GAAG,aAAa,CAAC;QACtH,IAAI,iCAAiC,IAAI,IAAI,8CAA+B,IAAI,IAAI,wDAAoC,EAAE;YACtH,IAAI,CAAC,IAAI,CAAC,qCAAqC,CAAC,CAAC;SACpD;QACD,oFAAoF;QACpF,sCAAsC;QACtC,IAAI;QACJ,IAAI,oBAAoB,EAAE;YACtB,IAAI,CAAC,IAAI,CAAC,wBAAwB,EAAE,oBAAoB,GAAG,GAAG,CAAC,CAAC;SACnE;QACD,IAAI,IAAI,CAAC,gBAAgB,CAAC,aAAa,CAAC,EAAE;YACtC,MAAM,MAAM,GAAG,IAAI,CAAC,qBAAqB,CAAC,kBAAkB,EAAE,CAAC;YAC/D,IAAI,MAAM,EAAE;gBACR,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;gBACpD,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,gBAAgB,CAAC,QAAQ,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC,CAAC;gBACnF,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC;aAC3C;SACJ;QACD,6CAA6C;QAC7C,gFAAgF;QAChF,oCAAoC;QACpC,iEAAiE;QACjE,QAAQ;QACR,IAAI;QACJ,kEAAkE;QAClE,sCAAsC;QACtC,sFAAsF;QACtF,iHAAiH;QACjH,oDAAoD;QACpD,gGAAgG;QAChG,qFAAqF;QACrF,YAAY;QACZ,QAAQ;QACR,IAAI;QACJ,kCAAkC;QAClC,kEAAkE;QAClE,IAAI;QACJ,IAAI,aAAa,IAAI,aAAa,CAAC,MAAM,EAAE;YACvC,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;SACzD;QACD,IAAI,oBAAoB,IAAI,oBAAoB,CAAC,MAAM,EAAE;YACrD,IAAI,CAAC,IAAI,CAAC,wBAAwB,EAAE,oBAAoB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;SACvE;QACD,IAAI,WAAW,EAAE;YACb,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,kBAAkB,WAAW,EAAE,CAAC,CAAC;YACnD,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,IAAI,WAAW,GAAG,CAAC,CAAC;SAClD;QACD,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,MAAM,IAAI,IAAI,CAAC,CAAC;QACtC,6CAA6C;QAC7C,IAAI,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAC;QAC1C,OAAO,EAAE,IAAI,EAAE,eAAe,EAAE,sBAAsB,EAAE,CAAC;IAC7D,CAAC;IAEO,gBAAgB,CAAC,aAA+B;QACpD,OAAO,aAAa,CAAC,YAAY,KAAK,gBAAgB,CAAC,GAAG,CAAC;IAC/D,CAAC;CACJ"}
@@ -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, _pathLabel?: string | undefined);
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 configuration;
22
+ private userTsserverPath;
27
23
  private logger;
28
- constructor(configuration: TypeScriptServiceConfiguration, logger: Logger);
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;AAClC,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,2BAA2B,CAAC;AAEhF,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;IACvB,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC;IALhC,OAAO,CAAC,IAAI,CAAyB;gBAEjB,MAAM,EAAE,uBAAuB,EAC/B,IAAI,EAAE,MAAM,EACX,MAAM,EAAE,MAAM,EACd,UAAU,CAAC,oBAAQ;IAKxC,IAAW,OAAO,IAAI,MAAM,CAE3B;IAED,IAAW,YAAY,IAAI,MAAM,CAEhC;IAED,IAAW,SAAS,IAAI,MAAM,CAE7B;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,aAAa;IAAkC,OAAO,CAAC,MAAM;gBAA7D,aAAa,EAAE,8BAA8B,EAAU,MAAM,EAAE,MAAM;IAEzF,qBAAqB,IAAI,iBAAiB,GAAG,IAAI;IAyCjD,mBAAmB,CAAC,gBAAgB,EAAE,MAAM,EAAE,GAAG,iBAAiB,GAAG,IAAI;IAazE,cAAc,IAAI,iBAAiB,GAAG,IAAI;CAWpD"}
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, _pathLabel) {
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 path.resolve(this.path, 'tsserver.js');
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(configuration, logger) {
94
- this.configuration = configuration;
86
+ constructor(userTsserverPath, logger) {
87
+ this.userTsserverPath = userTsserverPath;
95
88
  this.logger = logger;
96
89
  }
97
90
  getUserSettingVersion() {
98
- const { tsserverPath } = this.configuration;
99
- if (!tsserverPath) {
91
+ if (!this.userTsserverPath) {
100
92
  return null;
101
93
  }
102
- this.logger.log(`Resolving user-provided tsserver path "${tsserverPath}"...`);
103
- let resolvedPath = tsserverPath;
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(tsserverPath, { nothrow: true });
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(`Assumed tsserver lib location: "${resolvedPath}"`);
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, undefined);
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 version = new TypeScriptVersion("workspace" /* TypeScriptVersionSource.Workspace */, libFolder, this.logger);
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 bundledVersion = new TypeScriptVersion("bundled" /* TypeScriptVersionSource.Bundled */, path.dirname(file), this.logger, '');
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":"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"}
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;AAClC,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAShE,MAAM,OAAO,iBAAiB;IAE1B,YACoB,MAA+B,EAC/B,IAAY,EACX,MAAc;QAFf,WAAM,GAAN,MAAM,CAAyB;QAC/B,SAAI,GAAJ,IAAI,CAAQ;QACX,WAAM,GAAN,MAAM,CAAQ;QAE/B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACrB,CAAC;IAED,IAAW,YAAY;QACnB,OAAO,IAAI,CAAC,IAAI,CAAC;IACrB,CAAC;IAED,IAAW,OAAO;QACd,OAAO,IAAI,CAAC,OAAO,KAAK,IAAI,CAAC;IACjC,CAAC;IAED,IAAW,OAAO;QACd,IAAI,IAAI,CAAC,IAAI,EAAE;YACX,OAAO,IAAI,CAAC,IAAI,CAAC;SACpB;QACD,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QACzD,OAAO,IAAI,CAAC,IAAI,CAAC;IACrB,CAAC;IAED,IAAW,aAAa;QACpB,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;QAC7B,OAAO,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC;IAChD,CAAC;IAEO,oBAAoB,CAAC,UAAkB;QAC3C,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,2CAA2C,UAAU,MAAM,CAAC,CAAC;QAC7E,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE;YAC5B,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,oCAAoC,CAAC,CAAC;YACtD,OAAO,IAAI,CAAC;SACf;QAED,MAAM,CAAC,GAAG,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACrC,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,EAAE;YACf,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,6DAA6D,CAAC,CAAC;YAC/E,OAAO,IAAI,CAAC;SACf;QACD,MAAM,EAAE,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QAC1B,MAAM,UAAU,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACrC,IAAI,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC;QACrD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE;YAC1B,mCAAmC;YACnC,IAAI,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,KAAK,OAAO,EAAE;gBACvC,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC;aAC1D;SACJ;QACD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE;YAC1B,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,wCAAwC,QAAQ,GAAG,CAAC,CAAC;YACrE,OAAO,IAAI,CAAC;SACf;QAED,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,yCAAyC,QAAQ,GAAG,CAAC,CAAC;QACtE,MAAM,QAAQ,GAAG,EAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,QAAQ,EAAE,CAAC;QACtD,IAAI,IAAI,GAAQ,IAAI,CAAC;QACrB,IAAI;YACA,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;SAC/B;QAAC,OAAO,GAAG,EAAE;YACV,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,0CAA0C,CAAC,CAAC;YAC5D,OAAO,IAAI,CAAC;SACf;QACD,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACxB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,kDAAkD,CAAC,CAAC;YACpE,OAAO,IAAI,CAAC;SACf;QACD,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,mCAAmC,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC;QACpE,OAAO,GAAG,CAAC,iBAAiB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC/C,CAAC;CACJ;AAED,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,6BAA6B,EAAE,+BAA+B,EAAE,2BAA2B,CAAC,CAAC;AAE5H,MAAM,OAAO,yBAAyB;IAClC,YAA2B,gBAAoC,EAAU,MAAc;QAA5D,qBAAgB,GAAhB,gBAAgB,CAAoB;QAAU,WAAM,GAAN,MAAM,CAAQ;IAAG,CAAC;IAEpF,qBAAqB;QACxB,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE;YACxB,OAAO,IAAI,CAAC;SACf;QACD,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,0CAA0C,IAAI,CAAC,gBAAgB,MAAM,CAAC,CAAC;QACvF,IAAI,YAAY,GAAG,IAAI,CAAC,gBAAgB,CAAC;QACzC,2DAA2D;QAC3D,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE;YAChC,MAAM,UAAU,GAAG,KAAK,CAAC,IAAI,CAAC,YAAY,EAAE,EAAE,OAAO,EAAC,IAAI,EAAE,CAAC,CAAC;YAC9D,IAAI,UAAU,EAAE;gBACZ,YAAY,GAAG,UAAU,CAAC;aAC7B;YACD,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,2CAA2C,UAAU,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,UAAU,GAAG,CAAC,CAAC;SACzG;QACD,yBAAyB;QACzB,IAAI,IAAI,GAAG,EAAE,CAAC,SAAS,CAAC,YAAY,EAAE,EAAE,cAAc,EAAE,KAAK,EAAE,CAAC,CAAC;QACjE,IAAI,IAAI,EAAE,cAAc,EAAE,EAAE;YACxB,YAAY,GAAG,EAAE,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC;YAC7C,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,4CAA4C,YAAY,GAAG,CAAC,CAAC;SAChF;QACD,qBAAqB;QACrB,IAAI,GAAG,EAAE,CAAC,SAAS,CAAC,YAAY,EAAE,EAAE,cAAc,EAAE,KAAK,EAAE,CAAC,CAAC;QAC7D,IAAI,IAAI,EAAE,MAAM,EAAE,EAAE;YAChB,IAAI,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,KAAK,aAAa,EAAE;gBAC/C,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,+BAA+B,YAAY,EAAE,CAAC,CAAC;gBAC/D,OAAO,IAAI,iBAAiB,2DAAsC,YAAY,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;aAChG;YACD,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;YAC1C,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,6CAA6C,YAAY,EAAE,CAAC,CAAC;SAChF;QACD,iCAAiC;QACjC,IAAI;YACA,MAAM,eAAe,GAAG,SAAS,CAAC,EAAE,GAAG,EAAE,YAAY,EAAE,CAAC,CAAC;YACzD,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,oCAAoC,eAAe,GAAG,CAAC,CAAC;YACxE,IAAI,eAAe,EAAE;gBACjB,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE,KAAK,EAAE,aAAa,CAAC,CAAC;gBAC9E,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,gCAAgC,YAAY,GAAG,CAAC,CAAC;aACpE;SACJ;QAAC,MAAM;YACJ,SAAS;SACZ;QACD,OAAO,IAAI,iBAAiB,2DAAsC,YAAY,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IACjG,CAAC;IAEM,mBAAmB,CAAC,gBAA0B;QACjD,KAAK,MAAM,CAAC,IAAI,gBAAgB,EAAE;YAC9B,MAAM,SAAS,GAAG,gBAAgB,CAAC,CAAC,EAAE,cAAc,CAAC,CAAC;YACtD,IAAI,SAAS,EAAE;gBACX,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC;gBACzD,MAAM,OAAO,GAAG,IAAI,iBAAiB,sDAAoC,YAAY,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;gBACpG,IAAI,OAAO,CAAC,OAAO,EAAE;oBACjB,OAAO,OAAO,CAAC;iBAClB;aACJ;SACJ;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAEM,cAAc;QACjB,MAAM,OAAO,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC/C,IAAI;YACA,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;YAC3C,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,aAAa,CAAC,CAAC;YAClE,MAAM,cAAc,GAAG,IAAI,iBAAiB,kDAAkC,YAAY,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;YACzG,OAAO,cAAc,CAAC;SACzB;QAAC,OAAO,CAAC,EAAE;YACR,sEAAsE;YACtE,OAAO,IAAI,CAAC;SACf;IACL,CAAC;CACJ"}
@@ -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":"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"}
package/lib/tsp-client.js CHANGED
@@ -21,27 +21,24 @@ class ServerInitializingIndicator {
21
21
  reset() {
22
22
  if (this._loadingProjectName) {
23
23
  this._loadingProjectName = undefined;
24
- if (this._progressReporter) {
25
- this._progressReporter.done();
26
- this._progressReporter = undefined;
24
+ if (this._task) {
25
+ const task = this._task;
26
+ this._task = undefined;
27
+ task.then(reporter => reporter.done());
27
28
  }
28
29
  }
29
30
  }
30
- async startedLoadingProject(projectName) {
31
+ startedLoadingProject(projectName) {
31
32
  // TS projects are loaded sequentially. Cancel existing task because it should always be resolved before
32
33
  // the incoming project loading task is.
33
34
  this.reset();
34
35
  this._loadingProjectName = projectName;
35
- this._progressReporter = await this.lspClient.createProgressReporter();
36
- this._progressReporter.begin('Initializing JS/TS language features…');
36
+ this._task = this.lspClient.createProgressReporter();
37
+ this._task.then(reporter => reporter.begin('Initializing JS/TS language features…'));
37
38
  }
38
39
  finishedLoadingProject(projectName) {
39
40
  if (this._loadingProjectName === projectName) {
40
- this._loadingProjectName = undefined;
41
- if (this._progressReporter) {
42
- this._progressReporter.done();
43
- this._progressReporter = undefined;
44
- }
41
+ this.reset();
45
42
  }
46
43
  }
47
44
  }
@@ -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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"}
@@ -24,7 +24,7 @@ const configuration = {
24
24
  lspClient,
25
25
  tsserverLogVerbosity: TsServerLogLevel.Off,
26
26
  };
27
- const typescriptVersionProvider = new TypeScriptVersionProvider(configuration, logger);
27
+ const typescriptVersionProvider = new TypeScriptVersionProvider(configuration.tsserverPath, logger);
28
28
  const bundled = typescriptVersionProvider.bundledVersion();
29
29
  let server;
30
30
  before(() => {
@@ -1 +1 @@
1
- {"version":3,"file":"tsp-client.spec.js","sourceRoot":"","sources":["../src/tsp-client.spec.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"tsp-client.spec.js","sourceRoot":"","sources":["../src/tsp-client.spec.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,15 @@
1
+ import type * as lsp from 'vscode-languageserver/node.js';
2
+ export declare const enum MarkdownStringTextNewlineStyle {
3
+ Paragraph = 0,
4
+ Break = 1
5
+ }
6
+ export declare class MarkdownString {
7
+ value: string;
8
+ constructor(value?: string);
9
+ appendText(value: string, newlineStyle?: MarkdownStringTextNewlineStyle): MarkdownString;
10
+ appendMarkdown(value: string): MarkdownString;
11
+ appendCodeblock(langId: string, code: string): MarkdownString;
12
+ toMarkupContent(): lsp.MarkupContent;
13
+ }
14
+ export declare function escapeMarkdownSyntaxTokens(text: string): string;
15
+ //# sourceMappingURL=MarkdownString.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"MarkdownString.d.ts","sourceRoot":"","sources":["../../src/utils/MarkdownString.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,KAAK,GAAG,MAAM,+BAA+B,CAAC;AAE1D,0BAAkB,8BAA8B;IAC5C,SAAS,IAAI;IACb,KAAK,IAAI;CACZ;AAED,qBAAa,cAAc;IACJ,KAAK;gBAAL,KAAK,SAAK;IAE7B,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,YAAY,GAAE,8BAAyE,GAAG,cAAc;IASlI,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,cAAc;IAK7C,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,cAAc;IAS7D,eAAe,IAAI,GAAG,CAAC,aAAa;CAMvC;AAED,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAG/D"}