typescript-language-server 2.1.0 → 2.3.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 (118) hide show
  1. package/CHANGELOG.md +27 -0
  2. package/README.md +2 -0
  3. package/lib/calls.d.ts +1 -1
  4. package/lib/calls.d.ts.map +1 -1
  5. package/lib/calls.js +5 -4
  6. package/lib/calls.js.map +1 -1
  7. package/lib/completion.d.ts +2 -3
  8. package/lib/completion.d.ts.map +1 -1
  9. package/lib/completion.js +29 -31
  10. package/lib/completion.js.map +1 -1
  11. package/lib/configuration-manager.d.ts +2 -3
  12. package/lib/configuration-manager.d.ts.map +1 -1
  13. package/lib/configuration-manager.js +8 -6
  14. package/lib/configuration-manager.js.map +1 -1
  15. package/lib/diagnostic-queue.d.ts +1 -2
  16. package/lib/diagnostic-queue.d.ts.map +1 -1
  17. package/lib/diagnostic-queue.js.map +1 -1
  18. package/lib/document-symbol.d.ts +1 -1
  19. package/lib/document-symbol.d.ts.map +1 -1
  20. package/lib/document-symbol.js +2 -2
  21. package/lib/document-symbol.js.map +1 -1
  22. package/lib/features/fix-all.d.ts.map +1 -1
  23. package/lib/features/fix-all.js +8 -6
  24. package/lib/features/fix-all.js.map +1 -1
  25. package/lib/features/inlay-hints.d.ts.map +1 -1
  26. package/lib/features/inlay-hints.js +2 -1
  27. package/lib/features/inlay-hints.js.map +1 -1
  28. package/lib/features/source-definition.js +2 -1
  29. package/lib/features/source-definition.js.map +1 -1
  30. package/lib/hover.d.ts +1 -1
  31. package/lib/hover.d.ts.map +1 -1
  32. package/lib/lsp-connection.d.ts.map +1 -1
  33. package/lib/lsp-connection.js +2 -0
  34. package/lib/lsp-connection.js.map +1 -1
  35. package/lib/lsp-protocol.inlayHints.proposed.d.ts +5 -5
  36. package/lib/lsp-protocol.inlayHints.proposed.d.ts.map +1 -1
  37. package/lib/lsp-server.d.ts +8 -4
  38. package/lib/lsp-server.d.ts.map +1 -1
  39. package/lib/lsp-server.js +87 -57
  40. package/lib/lsp-server.js.map +1 -1
  41. package/lib/lsp-server.spec.js +6 -6
  42. package/lib/lsp-server.spec.js.map +1 -1
  43. package/lib/organize-imports.d.ts +1 -1
  44. package/lib/organize-imports.d.ts.map +1 -1
  45. package/lib/organize-imports.js.map +1 -1
  46. package/lib/organize-imports.spec.js.map +1 -1
  47. package/lib/protocol-translation.d.ts +2 -2
  48. package/lib/protocol-translation.d.ts.map +1 -1
  49. package/lib/protocol-translation.js +10 -14
  50. package/lib/protocol-translation.js.map +1 -1
  51. package/lib/quickfix.d.ts +1 -1
  52. package/lib/quickfix.d.ts.map +1 -1
  53. package/lib/quickfix.js +1 -1
  54. package/lib/quickfix.js.map +1 -1
  55. package/lib/refactor.d.ts +1 -2
  56. package/lib/refactor.d.ts.map +1 -1
  57. package/lib/refactor.js +4 -4
  58. package/lib/refactor.js.map +1 -1
  59. package/lib/ts-protocol.d.ts +29 -14
  60. package/lib/ts-protocol.d.ts.map +1 -1
  61. package/lib/ts-protocol.js +50 -13
  62. package/lib/ts-protocol.js.map +1 -1
  63. package/lib/tsServer/callbackMap.d.ts +1 -1
  64. package/lib/tsServer/callbackMap.d.ts.map +1 -1
  65. package/lib/tsServer/callbackMap.js.map +1 -1
  66. package/lib/tsServer/requestQueue.d.ts +1 -1
  67. package/lib/tsServer/requestQueue.d.ts.map +1 -1
  68. package/lib/tsServer/requests.d.ts +4 -3
  69. package/lib/tsServer/requests.d.ts.map +1 -1
  70. package/lib/tsServer/requests.js +2 -0
  71. package/lib/tsServer/requests.js.map +1 -1
  72. package/lib/tsServer/server.d.ts +9 -4
  73. package/lib/tsServer/server.d.ts.map +1 -1
  74. package/lib/tsServer/server.js +7 -0
  75. package/lib/tsServer/server.js.map +1 -1
  76. package/lib/tsServer/serverError.d.ts +1 -1
  77. package/lib/tsServer/serverError.d.ts.map +1 -1
  78. package/lib/tsServer/serverError.js +4 -4
  79. package/lib/tsServer/serverError.js.map +1 -1
  80. package/lib/tsServer/serverProcess.d.ts.map +1 -1
  81. package/lib/tsServer/serverProcess.js +9 -2
  82. package/lib/tsServer/serverProcess.js.map +1 -1
  83. package/lib/tsServer/spawner.js +3 -3
  84. package/lib/tsServer/spawner.js.map +1 -1
  85. package/lib/tsServer/tracer.d.ts +2 -2
  86. package/lib/tsServer/tracer.d.ts.map +1 -1
  87. package/lib/tsServer/versionProvider.js +1 -1
  88. package/lib/tsServer/versionProvider.js.map +1 -1
  89. package/lib/tsp-client.d.ts +2 -2
  90. package/lib/tsp-client.d.ts.map +1 -1
  91. package/lib/tsp-client.js +10 -2
  92. package/lib/tsp-client.js.map +1 -1
  93. package/lib/tsp-client.spec.js +11 -9
  94. package/lib/tsp-client.spec.js.map +1 -1
  95. package/lib/utils/SnippetString.js +4 -4
  96. package/lib/utils/SnippetString.js.map +1 -1
  97. package/lib/utils/api.d.ts +2 -0
  98. package/lib/utils/api.d.ts.map +1 -1
  99. package/lib/utils/api.js +17 -15
  100. package/lib/utils/api.js.map +1 -1
  101. package/lib/utils/logger.d.ts +1 -1
  102. package/lib/utils/logger.d.ts.map +1 -1
  103. package/lib/utils/logger.js +1 -3
  104. package/lib/utils/logger.js.map +1 -1
  105. package/lib/utils/previewer.d.ts +1 -1
  106. package/lib/utils/previewer.d.ts.map +1 -1
  107. package/lib/utils/previewer.js.map +1 -1
  108. package/lib/utils/tsconfig.d.ts +1 -1
  109. package/lib/utils/tsconfig.d.ts.map +1 -1
  110. package/lib/utils/tsconfig.js +5 -4
  111. package/lib/utils/tsconfig.js.map +1 -1
  112. package/lib/utils/typeConverters.d.ts +1 -1
  113. package/lib/utils/typeConverters.d.ts.map +1 -1
  114. package/package.json +16 -16
  115. package/lib/tsp-command-types.d.ts +0 -188
  116. package/lib/tsp-command-types.d.ts.map +0 -1
  117. package/lib/tsp-command-types.js +0 -99
  118. package/lib/tsp-command-types.js.map +0 -1
@@ -2,24 +2,40 @@
2
2
  * **IMPORTANT** this module should not depend on `vscode-languageserver` only protocol and types
3
3
  */
4
4
  import lsp from 'vscode-languageserver-protocol';
5
- import type tsp from 'typescript/lib/protocol.d.js';
5
+ import tslib from 'typescript/lib/tsserverlibrary.js';
6
6
  import type { TraceValue } from './tsServer/tracer.js';
7
+ import tsp = tslib.server.protocol;
8
+ export { tslib, tsp };
7
9
  export declare namespace TypeScriptRenameRequest {
8
10
  const type: lsp.RequestType<lsp.TextDocumentPositionParams, void, void>;
9
11
  }
10
- export declare class DisplayPartKind {
11
- static readonly functionName = "functionName";
12
- static readonly methodName = "methodName";
13
- static readonly parameterName = "parameterName";
14
- static readonly propertyName = "propertyName";
15
- static readonly punctuation = "punctuation";
16
- static readonly text = "text";
12
+ declare module 'typescript/lib/tsserverlibrary.js' {
13
+ namespace server.protocol {
14
+ enum CommandTypes {
15
+ EncodedSemanticClassificationsFull = "encodedSemanticClassifications-full"
16
+ }
17
+ }
17
18
  }
18
- export declare enum SemicolonPreference {
19
- Ignore = "ignore",
20
- Insert = "insert",
21
- Remove = "remove"
19
+ export declare const enum EventTypes {
20
+ ConfigFileDiag = "configFileDiag",
21
+ SyntaxDiag = "syntaxDiag",
22
+ SementicDiag = "semanticDiag",
23
+ SuggestionDiag = "suggestionDiag",
24
+ ProjectLoadingStart = "projectLoadingStart",
25
+ ProjectLoadingFinish = "projectLoadingFinish"
22
26
  }
27
+ export declare class KindModifiers {
28
+ static readonly optional = "optional";
29
+ static readonly deprecated = "deprecated";
30
+ static readonly dtsFile = ".d.ts";
31
+ static readonly tsFile = ".ts";
32
+ static readonly tsxFile = ".tsx";
33
+ static readonly jsFile = ".js";
34
+ static readonly jsxFile = ".jsx";
35
+ static readonly jsonFile = ".json";
36
+ static readonly fileExtensionKindModifiers: string[];
37
+ }
38
+ export declare function toSymbolDisplayPartKind(kind: string): tslib.SymbolDisplayPartKind;
23
39
  export interface SupportedFeatures {
24
40
  codeActionDisabledSupport?: boolean;
25
41
  completionInsertReplaceSupport?: boolean;
@@ -71,8 +87,7 @@ interface TsserverOptions {
71
87
  */
72
88
  trace?: TraceValue;
73
89
  }
74
- export declare type TypeScriptInitializeParams = lsp.InitializeParams & {
90
+ export type TypeScriptInitializeParams = lsp.InitializeParams & {
75
91
  initializationOptions?: Partial<TypeScriptInitializationOptions>;
76
92
  };
77
- export {};
78
93
  //# 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,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"}
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,MAAM,mCAAmC,CAAC;AACtD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAEvD,OAAO,GAAG,GAAG,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC;AAEnC,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC;AAEtB,yBAAiB,uBAAuB,CAAC;IAC9B,MAAM,IAAI,6DAAwF,CAAC;CAC7G;AAED,OAAO,QAAQ,mCAAmC,CAAC;IAC/C,UAAU,MAAM,CAAC,QAAQ,CAAC;QACtB,KAAK,YAAY;YAEb,kCAAkC,wCAAwC;SAC7E;KACJ;CACJ;AAED,0BAAkB,UAAU;IACxB,cAAc,mBAAmB;IACjC,UAAU,eAAe;IACzB,YAAY,iBAAiB;IAC7B,cAAc,mBAAmB;IACjC,mBAAmB,wBAAwB;IAC3C,oBAAoB,yBAAyB;CAChD;AAED,qBAAa,aAAa;IACtB,gBAAuB,QAAQ,cAAc;IAC7C,gBAAuB,UAAU,gBAAgB;IACjD,gBAAuB,OAAO,WAAW;IACzC,gBAAuB,MAAM,SAAS;IACtC,gBAAuB,OAAO,UAAU;IACxC,gBAAuB,MAAM,SAAS;IACtC,gBAAuB,OAAO,UAAU;IACxC,gBAAuB,QAAQ,WAAW;IAE1C,gBAAuB,0BAA0B,WAO/C;CACL;AA8BD,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,KAAK,CAAC,qBAAqB,CAEjF;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,MAAM,MAAM,0BAA0B,GAAG,GAAG,CAAC,gBAAgB,GAAG;IAC5D,qBAAqB,CAAC,EAAE,OAAO,CAAC,+BAA+B,CAAC,CAAC;CACpE,CAAC"}
@@ -8,22 +8,59 @@
8
8
  * **IMPORTANT** this module should not depend on `vscode-languageserver` only protocol and types
9
9
  */
10
10
  import lsp from 'vscode-languageserver-protocol';
11
+ import tslib from 'typescript/lib/tsserverlibrary.js';
12
+ var tsp = tslib.server.protocol;
13
+ export { tslib, tsp };
11
14
  export var TypeScriptRenameRequest;
12
15
  (function (TypeScriptRenameRequest) {
13
16
  TypeScriptRenameRequest.type = new lsp.RequestType('_typescript.rename');
14
17
  })(TypeScriptRenameRequest = TypeScriptRenameRequest || (TypeScriptRenameRequest = {}));
15
- export class DisplayPartKind {
18
+ export class KindModifiers {
19
+ }
20
+ KindModifiers.optional = 'optional';
21
+ KindModifiers.deprecated = 'deprecated';
22
+ KindModifiers.dtsFile = '.d.ts';
23
+ KindModifiers.tsFile = '.ts';
24
+ KindModifiers.tsxFile = '.tsx';
25
+ KindModifiers.jsFile = '.js';
26
+ KindModifiers.jsxFile = '.jsx';
27
+ KindModifiers.jsonFile = '.json';
28
+ KindModifiers.fileExtensionKindModifiers = [
29
+ KindModifiers.dtsFile,
30
+ KindModifiers.tsFile,
31
+ KindModifiers.tsxFile,
32
+ KindModifiers.jsFile,
33
+ KindModifiers.jsxFile,
34
+ KindModifiers.jsonFile,
35
+ ];
36
+ const SYMBOL_DISPLAY_PART_KIND_MAP = {
37
+ aliasName: 0,
38
+ className: 1,
39
+ enumName: 2,
40
+ fieldName: 3,
41
+ interfaceName: 4,
42
+ keyword: 5,
43
+ lineBreak: 6,
44
+ numericLiteral: 7,
45
+ stringLiteral: 8,
46
+ localName: 9,
47
+ methodName: 10,
48
+ moduleName: 11,
49
+ operator: 12,
50
+ parameterName: 13,
51
+ propertyName: 14,
52
+ punctuation: 15,
53
+ space: 16,
54
+ text: 17,
55
+ typeParameterName: 18,
56
+ enumMemberName: 19,
57
+ functionName: 20,
58
+ regularExpressionLiteral: 21,
59
+ link: 22,
60
+ linkName: 23,
61
+ linkText: 24,
62
+ };
63
+ export function toSymbolDisplayPartKind(kind) {
64
+ return SYMBOL_DISPLAY_PART_KIND_MAP[kind];
16
65
  }
17
- DisplayPartKind.functionName = 'functionName';
18
- DisplayPartKind.methodName = 'methodName';
19
- DisplayPartKind.parameterName = 'parameterName';
20
- DisplayPartKind.propertyName = 'propertyName';
21
- DisplayPartKind.punctuation = 'punctuation';
22
- DisplayPartKind.text = 'text';
23
- export var SemicolonPreference;
24
- (function (SemicolonPreference) {
25
- SemicolonPreference["Ignore"] = "ignore";
26
- SemicolonPreference["Insert"] = "insert";
27
- SemicolonPreference["Remove"] = "remove";
28
- })(SemicolonPreference = SemicolonPreference || (SemicolonPreference = {}));
29
66
  //# sourceMappingURL=ts-protocol.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"ts-protocol.js","sourceRoot":"","sources":["../src/ts-protocol.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH;;GAEG;AACH,OAAO,GAAG,MAAM,gCAAgC,CAAC;AAIjD,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;AAGzC,MAAM,CAAN,IAAY,mBAIX;AAJD,WAAY,mBAAmB;IAC3B,wCAAiB,CAAA;IACjB,wCAAiB,CAAA;IACjB,wCAAiB,CAAA;AACrB,CAAC,EAJW,mBAAmB,GAAnB,mBAAmB,KAAnB,mBAAmB,QAI9B"}
1
+ {"version":3,"file":"ts-protocol.js","sourceRoot":"","sources":["../src/ts-protocol.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH;;GAEG;AACH,OAAO,GAAG,MAAM,gCAAgC,CAAC;AACjD,OAAO,KAAK,MAAM,mCAAmC,CAAC;AAGtD,IAAO,GAAG,GAAG,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC;AAEnC,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC;AAEtB,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;AAoBD,MAAM,OAAO,aAAa;;AACC,sBAAQ,GAAG,UAAU,CAAC;AACtB,wBAAU,GAAG,YAAY,CAAC;AAC1B,qBAAO,GAAG,OAAO,CAAC;AAClB,oBAAM,GAAG,KAAK,CAAC;AACf,qBAAO,GAAG,MAAM,CAAC;AACjB,oBAAM,GAAG,KAAK,CAAC;AACf,qBAAO,GAAG,MAAM,CAAC;AACjB,sBAAQ,GAAG,OAAO,CAAC;AAEnB,wCAA0B,GAAG;IAChD,aAAa,CAAC,OAAO;IACrB,aAAa,CAAC,MAAM;IACpB,aAAa,CAAC,OAAO;IACrB,aAAa,CAAC,MAAM;IACpB,aAAa,CAAC,OAAO;IACrB,aAAa,CAAC,QAAQ;CACzB,CAAC;AAGN,MAAM,4BAA4B,GAAkF;IAChH,SAAS,EAAE,CAAC;IACZ,SAAS,EAAE,CAAC;IACZ,QAAQ,EAAE,CAAC;IACX,SAAS,EAAE,CAAC;IACZ,aAAa,EAAE,CAAC;IAChB,OAAO,EAAE,CAAC;IACV,SAAS,EAAE,CAAC;IACZ,cAAc,EAAE,CAAC;IACjB,aAAa,EAAE,CAAC;IAChB,SAAS,EAAE,CAAC;IACZ,UAAU,EAAE,EAAE;IACd,UAAU,EAAE,EAAE;IACd,QAAQ,EAAE,EAAE;IACZ,aAAa,EAAE,EAAE;IACjB,YAAY,EAAE,EAAE;IAChB,WAAW,EAAE,EAAE;IACf,KAAK,EAAE,EAAE;IACT,IAAI,EAAE,EAAE;IACR,iBAAiB,EAAE,EAAE;IACrB,cAAc,EAAE,EAAE;IAClB,YAAY,EAAE,EAAE;IAChB,wBAAwB,EAAE,EAAE;IAC5B,IAAI,EAAE,EAAE;IACR,QAAQ,EAAE,EAAE;IACZ,QAAQ,EAAE,EAAE;CACf,CAAC;AAEF,MAAM,UAAU,uBAAuB,CAAC,IAAY;IAChD,OAAO,4BAA4B,CAAC,IAAgD,CAAC,CAAC;AAC1F,CAAC"}
@@ -1,5 +1,5 @@
1
- import type tsp from 'typescript/lib/protocol.d.js';
2
1
  import { ServerResponse } from './requests.js';
2
+ import type { tsp } from '../ts-protocol.js';
3
3
  export interface CallbackItem<R> {
4
4
  readonly onSuccess: (value: R) => void;
5
5
  readonly onError: (err: Error) => void;
@@ -1 +1 @@
1
- {"version":3,"file":"callbackMap.d.ts","sourceRoot":"","sources":["../../src/tsServer/callbackMap.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,GAAG,MAAM,8BAA8B,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAE/C,MAAM,WAAW,YAAY,CAAC,CAAC;IAC3B,QAAQ,CAAC,SAAS,EAAE,CAAC,KAAK,EAAE,CAAC,KAAK,IAAI,CAAC;IACvC,QAAQ,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,KAAK,KAAK,IAAI,CAAC;IACvC,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;CAC7B;AAED,qBAAa,WAAW,CAAC,CAAC,SAAS,GAAG,CAAC,QAAQ;IAC3C,OAAO,CAAC,QAAQ,CAAC,UAAU,CAA2E;IACtG,OAAO,CAAC,QAAQ,CAAC,eAAe,CAA2E;IAEpG,OAAO,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAY5B,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,YAAY,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,EAAE,OAAO,EAAE,OAAO,GAAG,IAAI;IAQxG,KAAK,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,GAAG,SAAS;IAM3F,OAAO,CAAC,MAAM;CAKjB"}
1
+ {"version":3,"file":"callbackMap.d.ts","sourceRoot":"","sources":["../../src/tsServer/callbackMap.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAE7C,MAAM,WAAW,YAAY,CAAC,CAAC;IAC3B,QAAQ,CAAC,SAAS,EAAE,CAAC,KAAK,EAAE,CAAC,KAAK,IAAI,CAAC;IACvC,QAAQ,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,KAAK,KAAK,IAAI,CAAC;IACvC,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;CAC7B;AAED,qBAAa,WAAW,CAAC,CAAC,SAAS,GAAG,CAAC,QAAQ;IAC3C,OAAO,CAAC,QAAQ,CAAC,UAAU,CAA2E;IACtG,OAAO,CAAC,QAAQ,CAAC,eAAe,CAA2E;IAEpG,OAAO,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAY5B,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,YAAY,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,EAAE,OAAO,EAAE,OAAO,GAAG,IAAI;IAQxG,KAAK,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,GAAG,SAAS;IAM3F,OAAO,CAAC,MAAM;CAKjB"}
@@ -1 +1 @@
1
- {"version":3,"file":"callbackMap.js","sourceRoot":"","sources":["../../src/tsServer/callbackMap.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAChG;;;;;GAKG;AAGH,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAS/C,MAAM,OAAO,WAAW;IAAxB;QACqB,eAAU,GAAG,IAAI,GAAG,EAAgE,CAAC;QACrF,oBAAe,GAAG,IAAI,GAAG,EAAgE,CAAC;IAiC/G,CAAC;IA/BU,OAAO,CAAC,KAAa;QACxB,MAAM,YAAY,GAAG,IAAI,cAAc,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QACzD,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE;YAC7C,QAAQ,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;SACpC;QACD,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;QACxB,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,EAAE;YAClD,QAAQ,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;SACpC;QACD,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,CAAC;IACjC,CAAC;IAEM,GAAG,CAAC,GAAW,EAAE,QAA8D,EAAE,OAAgB;QACpG,IAAI,OAAO,EAAE;YACT,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;SAC3C;aAAM;YACH,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;SACtC;IACL,CAAC;IAEM,KAAK,CAAC,GAAW;QACpB,MAAM,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC3E,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACjB,OAAO,QAAQ,CAAC;IACpB,CAAC;IAEO,MAAM,CAAC,GAAW;QACtB,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE;YAC9B,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;SACpC;IACL,CAAC;CACJ"}
1
+ {"version":3,"file":"callbackMap.js","sourceRoot":"","sources":["../../src/tsServer/callbackMap.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAChG;;;;;GAKG;AAEH,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAU/C,MAAM,OAAO,WAAW;IAAxB;QACqB,eAAU,GAAG,IAAI,GAAG,EAAgE,CAAC;QACrF,oBAAe,GAAG,IAAI,GAAG,EAAgE,CAAC;IAiC/G,CAAC;IA/BU,OAAO,CAAC,KAAa;QACxB,MAAM,YAAY,GAAG,IAAI,cAAc,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QACzD,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE;YAC7C,QAAQ,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;SACpC;QACD,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;QACxB,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,EAAE;YAClD,QAAQ,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;SACpC;QACD,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,CAAC;IACjC,CAAC;IAEM,GAAG,CAAC,GAAW,EAAE,QAA8D,EAAE,OAAgB;QACpG,IAAI,OAAO,EAAE;YACT,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;SAC3C;aAAM;YACH,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;SACtC;IACL,CAAC;IAEM,KAAK,CAAC,GAAW;QACpB,MAAM,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC3E,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACjB,OAAO,QAAQ,CAAC;IACpB,CAAC;IAEO,MAAM,CAAC,GAAW;QACtB,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE;YAC9B,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;SACpC;IACL,CAAC;CACJ"}
@@ -1,4 +1,4 @@
1
- import type tsp from 'typescript/lib/protocol.d.js';
1
+ import type { tsp } from '../ts-protocol.js';
2
2
  export declare enum RequestQueueingType {
3
3
  /**
4
4
  * Normal request that is executed in order.
@@ -1 +1 @@
1
- {"version":3,"file":"requestQueue.d.ts","sourceRoot":"","sources":["../../src/tsServer/requestQueue.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,GAAG,MAAM,8BAA8B,CAAC;AAEpD,oBAAY,mBAAmB;IAC3B;;OAEG;IACH,MAAM,IAAI;IAEV;;OAEG;IACH,WAAW,IAAI;IAEf;;;;;OAKG;IACH,KAAK,IAAI;CACZ;AAED,MAAM,WAAW,WAAW;IACxB,QAAQ,CAAC,OAAO,EAAE,GAAG,CAAC,OAAO,CAAC;IAC9B,QAAQ,CAAC,eAAe,EAAE,OAAO,CAAC;IAClC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,YAAY,EAAE,mBAAmB,CAAC;CAC9C;AAED,qBAAa,YAAY;IACrB,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAqB;IAC3C,OAAO,CAAC,cAAc,CAAK;IAE3B,IAAW,MAAM,IAAI,MAAM,CAE1B;IAEM,OAAO,CAAC,IAAI,EAAE,WAAW,GAAG,IAAI;IAgBhC,OAAO,IAAI,WAAW,GAAG,SAAS;IAIlC,uBAAuB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO;IAU7C,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,GAAG,CAAC,OAAO;CAQhE"}
1
+ {"version":3,"file":"requestQueue.d.ts","sourceRoot":"","sources":["../../src/tsServer/requestQueue.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAE7C,oBAAY,mBAAmB;IAC3B;;OAEG;IACH,MAAM,IAAI;IAEV;;OAEG;IACH,WAAW,IAAI;IAEf;;;;;OAKG;IACH,KAAK,IAAI;CACZ;AAED,MAAM,WAAW,WAAW;IACxB,QAAQ,CAAC,OAAO,EAAE,GAAG,CAAC,OAAO,CAAC;IAC9B,QAAQ,CAAC,eAAe,EAAE,OAAO,CAAC;IAClC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,YAAY,EAAE,mBAAmB,CAAC;CAC9C;AAED,qBAAa,YAAY;IACrB,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAqB;IAC3C,OAAO,CAAC,cAAc,CAAK;IAE3B,IAAW,MAAM,IAAI,MAAM,CAE1B;IAEM,OAAO,CAAC,IAAI,EAAE,WAAW,GAAG,IAAI;IAgBhC,OAAO,IAAI,WAAW,GAAG,SAAS;IAIlC,uBAAuB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO;IAU7C,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,GAAG,CAAC,OAAO;CAQhE"}
@@ -1,7 +1,7 @@
1
1
  import vscodeUri from 'vscode-uri';
2
- import type tsp from 'typescript/lib/protocol.d.js';
3
- import { CommandTypes } from '../tsp-command-types.js';
2
+ import { tsp } from '../ts-protocol.js';
4
3
  import { ExecutionTarget } from './server.js';
4
+ import CommandTypes = tsp.CommandTypes;
5
5
  export declare enum ServerType {
6
6
  Syntax = "syntax",
7
7
  Semantic = "semantic"
@@ -56,11 +56,12 @@ export interface TypeScriptRequestTypes {
56
56
  [CommandTypes.Quickinfo]: [tsp.FileLocationRequestArgs, tsp.QuickInfoResponse];
57
57
  [CommandTypes.References]: [tsp.FileLocationRequestArgs, tsp.ReferencesResponse];
58
58
  [CommandTypes.Rename]: [tsp.RenameRequestArgs, tsp.RenameResponse];
59
+ [CommandTypes.SelectionRange]: [tsp.SelectionRangeRequestArgs, tsp.SelectionRangeResponse];
59
60
  [CommandTypes.SignatureHelp]: [tsp.SignatureHelpRequestArgs, tsp.SignatureHelpResponse];
60
61
  [CommandTypes.TypeDefinition]: [tsp.FileLocationRequestArgs, tsp.TypeDefinitionResponse];
61
62
  [CommandTypes.UpdateOpen]: [tsp.UpdateOpenRequestArgs, tsp.Response];
62
63
  }
63
- export declare type ExecConfig = {
64
+ export type ExecConfig = {
64
65
  readonly lowPriority?: boolean;
65
66
  readonly nonRecoverable?: boolean;
66
67
  readonly cancelOnResourceChange?: vscodeUri.URI;
@@ -1 +1 @@
1
- {"version":3,"file":"requests.d.ts","sourceRoot":"","sources":["../../src/tsServer/requests.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"requests.d.ts","sourceRoot":"","sources":["../../src/tsServer/requests.ts"],"names":[],"mappings":"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"}
@@ -8,6 +8,8 @@
8
8
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License.
9
9
  * You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
10
10
  */
11
+ import { tsp } from '../ts-protocol.js';
12
+ var CommandTypes = tsp.CommandTypes;
11
13
  export var ServerType;
12
14
  (function (ServerType) {
13
15
  ServerType["Syntax"] = "syntax";
@@ -1 +1 @@
1
- {"version":3,"file":"requests.js","sourceRoot":"","sources":["../../src/tsServer/requests.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAChG;;;;;GAKG;AAOH,MAAM,CAAN,IAAY,UAGX;AAHD,WAAY,UAAU;IAClB,+BAAiB,CAAA;IACjB,mCAAqB,CAAA;AACzB,CAAC,EAHW,UAAU,GAAV,UAAU,KAAV,UAAU,QAGrB;AAED,MAAM,KAAW,cAAc,CAe9B;AAfD,WAAiB,cAAc;IAE3B,MAAa,SAAS;QAGlB,YACoB,MAAc;YAAd,WAAM,GAAN,MAAM,CAAQ;YAHlB,SAAI,GAAG,WAAW,CAAC;QAI/B,CAAC;KACR;IANY,wBAAS,YAMrB,CAAA;IAEY,wBAAS,GAAG,EAAE,IAAI,EAAE,WAAW,EAAW,CAAC;IAE3C,uBAAQ,GAAG,EAAE,IAAI,EAAE,UAAU,EAAW,CAAC;AAG1D,CAAC,EAfgB,cAAc,GAAd,cAAc,KAAd,cAAc,QAe9B"}
1
+ {"version":3,"file":"requests.js","sourceRoot":"","sources":["../../src/tsServer/requests.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAChG;;;;;GAKG;AAGH,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAGxC,IAAO,YAAY,GAAG,GAAG,CAAC,YAAY,CAAC;AAEvC,MAAM,CAAN,IAAY,UAGX;AAHD,WAAY,UAAU;IAClB,+BAAiB,CAAA;IACjB,mCAAqB,CAAA;AACzB,CAAC,EAHW,UAAU,GAAV,UAAU,KAAV,UAAU,QAGrB;AAED,MAAM,KAAW,cAAc,CAe9B;AAfD,WAAiB,cAAc;IAE3B,MAAa,SAAS;QAGlB,YACoB,MAAc;YAAd,WAAM,GAAN,MAAM,CAAQ;YAHlB,SAAI,GAAG,WAAW,CAAC;QAI/B,CAAC;KACR;IANY,wBAAS,YAMrB,CAAA;IAEY,wBAAS,GAAG,EAAE,IAAI,EAAE,WAAW,EAAW,CAAC;IAE3C,uBAAQ,GAAG,EAAE,IAAI,EAAE,UAAU,EAAW,CAAC;AAG1D,CAAC,EAfgB,cAAc,GAAd,cAAc,KAAd,cAAc,QAe9B"}
@@ -1,7 +1,7 @@
1
1
  /// <reference types="node" resolution-mode="require"/>
2
- import type tsp from 'typescript/lib/protocol.d.js';
3
2
  import { CancellationToken } from 'vscode-jsonrpc';
4
3
  import { ServerResponse, ServerType, TypeScriptRequestTypes } from './requests.js';
4
+ import type { tsp } from '../ts-protocol.js';
5
5
  import type { TspClientOptions } from '../tsp-client.js';
6
6
  import { OngoingRequestCanceller } from './cancellation.js';
7
7
  import type Tracer from './tracer.js';
@@ -14,13 +14,15 @@ export interface TypeScriptServerExitEvent {
14
14
  readonly code: number | null;
15
15
  readonly signal: NodeJS.Signals | null;
16
16
  }
17
- declare type OnEventHandler = (e: tsp.Event) => any;
18
- declare type OnExitHandler = (e: TypeScriptServerExitEvent) => any;
19
- declare type OnErrorHandler = (e: any) => any;
17
+ type OnEventHandler = (e: tsp.Event) => any;
18
+ type OnExitHandler = (e: TypeScriptServerExitEvent) => any;
19
+ type OnErrorHandler = (e: any) => any;
20
+ type OnStdErrHandler = (e: string) => any;
20
21
  export interface ITypeScriptServer {
21
22
  onEvent(handler: OnEventHandler): void;
22
23
  onExit(handler: OnExitHandler): void;
23
24
  onError(handler: OnErrorHandler): void;
25
+ onStdErr(handler: OnStdErrHandler): void;
24
26
  readonly tsServerLogFile: string | undefined;
25
27
  kill(): void;
26
28
  /**
@@ -50,6 +52,7 @@ export interface TsServerProcess {
50
52
  onData(handler: (data: tsp.Response) => void): void;
51
53
  onExit(handler: (code: number | null, signal: NodeJS.Signals | null) => void): void;
52
54
  onError(handler: (error: Error) => void): void;
55
+ onStdErr(handler: (code: string) => void): void;
53
56
  kill(): void;
54
57
  }
55
58
  export declare class ProcessBasedTsServer implements ITypeScriptServer {
@@ -66,9 +69,11 @@ export declare class ProcessBasedTsServer implements ITypeScriptServer {
66
69
  private readonly _eventHandlers;
67
70
  private readonly _exitHandlers;
68
71
  private readonly _errorHandlers;
72
+ private readonly _stdErrHandlers;
69
73
  constructor(_serverId: string, _serverSource: ServerType, _process: TsServerProcess, _tsServerLogFile: string | undefined, _requestCanceller: OngoingRequestCanceller, _version: TypeScriptVersion, _tracer: Tracer);
70
74
  onEvent(handler: OnEventHandler): void;
71
75
  onExit(handler: OnExitHandler): void;
76
+ onStdErr(handler: OnStdErrHandler): void;
72
77
  onError(handler: OnErrorHandler): void;
73
78
  get tsServerLogFile(): string | undefined;
74
79
  private write;
@@ -1 +1 @@
1
- {"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/tsServer/server.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/tsServer/server.ts"],"names":[],"mappings":"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"}
@@ -32,9 +32,13 @@ export class ProcessBasedTsServer {
32
32
  this._eventHandlers = new Set();
33
33
  this._exitHandlers = new Set();
34
34
  this._errorHandlers = new Set();
35
+ this._stdErrHandlers = new Set();
35
36
  this._process.onData(msg => {
36
37
  this.dispatchMessage(msg);
37
38
  });
39
+ this._process.onStdErr(error => {
40
+ this._stdErrHandlers.forEach(handler => handler(error));
41
+ });
38
42
  this._process.onExit((code, signal) => {
39
43
  this._exitHandlers.forEach(handler => handler({ code, signal }));
40
44
  this._callbacks.destroy('server exited');
@@ -50,6 +54,9 @@ export class ProcessBasedTsServer {
50
54
  onExit(handler) {
51
55
  this._exitHandlers.add(handler);
52
56
  }
57
+ onStdErr(handler) {
58
+ this._stdErrHandlers.add(handler);
59
+ }
53
60
  onError(handler) {
54
61
  this._errorHandlers.add(handler);
55
62
  }
@@ -1 +1 @@
1
- {"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/tsServer/server.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/tsServer/server.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,4 @@
1
- import type tsp from 'typescript/lib/protocol.d.js';
1
+ import type { tsp } from '../ts-protocol.js';
2
2
  import type { TypeScriptVersion } from './versionProvider.js';
3
3
  export declare class TypeScriptServerError extends Error {
4
4
  readonly serverId: string;
@@ -1 +1 @@
1
- {"version":3,"file":"serverError.d.ts","sourceRoot":"","sources":["../../src/tsServer/serverError.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,GAAG,MAAM,8BAA8B,CAAC;AACpD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAE9D,qBAAa,qBAAsB,SAAQ,KAAK;aAWxB,QAAQ,EAAE,MAAM;aAChB,OAAO,EAAE,iBAAiB;IAC1C,OAAO,CAAC,QAAQ,CAAC,QAAQ;aACT,aAAa,EAAE,MAAM,GAAG,SAAS;aACjC,WAAW,EAAE,MAAM,GAAG,SAAS;WAdrC,MAAM,CAChB,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,iBAAiB,EAC1B,QAAQ,EAAE,GAAG,CAAC,QAAQ,GACvB,qBAAqB;IAKxB,OAAO;IAUP,IAAW,eAAe,IAAI,MAAM,GAAG,SAAS,CAE/C;IAED,IAAW,aAAa,IAAI,MAAM,CAEjC;IAED;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,cAAc;CAmBhC"}
1
+ {"version":3,"file":"serverError.d.ts","sourceRoot":"","sources":["../../src/tsServer/serverError.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAE9D,qBAAa,qBAAsB,SAAQ,KAAK;aAWxB,QAAQ,EAAE,MAAM;aAChB,OAAO,EAAE,iBAAiB;IAC1C,OAAO,CAAC,QAAQ,CAAC,QAAQ;aACT,aAAa,EAAE,MAAM,GAAG,SAAS;aACjC,WAAW,EAAE,MAAM,GAAG,SAAS;WAdrC,MAAM,CAChB,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,iBAAiB,EAC1B,QAAQ,EAAE,GAAG,CAAC,QAAQ,GACvB,qBAAqB;IAKxB,OAAO;IAUP,IAAW,eAAe,IAAI,MAAM,GAAG,SAAS,CAE/C;IAED,IAAW,aAAa,IAAI,MAAM,CAEjC;IAED;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,cAAc;CAmBhC"}
@@ -9,6 +9,10 @@
9
9
  * You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
10
10
  */
11
11
  export class TypeScriptServerError extends Error {
12
+ static create(serverId, version, response) {
13
+ const parsedResult = TypeScriptServerError.parseErrorText(response);
14
+ return new TypeScriptServerError(serverId, version, response, parsedResult?.message, parsedResult?.stack);
15
+ }
12
16
  constructor(serverId, version, response, serverMessage, serverStack) {
13
17
  super(`<${serverId}> TypeScript Server Error (${version.versionString})\n${serverMessage}\n${serverStack}`);
14
18
  this.serverId = serverId;
@@ -17,10 +21,6 @@ export class TypeScriptServerError extends Error {
17
21
  this.serverMessage = serverMessage;
18
22
  this.serverStack = serverStack;
19
23
  }
20
- static create(serverId, version, response) {
21
- const parsedResult = TypeScriptServerError.parseErrorText(response);
22
- return new TypeScriptServerError(serverId, version, response, parsedResult?.message, parsedResult?.stack);
23
- }
24
24
  get serverErrorText() {
25
25
  return this.response.message;
26
26
  }
@@ -1 +1 @@
1
- {"version":3,"file":"serverError.js","sourceRoot":"","sources":["../../src/tsServer/serverError.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAChG;;;;;GAKG;AAKH,MAAM,OAAO,qBAAsB,SAAQ,KAAK;IAU5C,YACoB,QAAgB,EAChB,OAA0B,EACzB,QAAsB,EACvB,aAAiC,EACjC,WAA+B;QAE/C,KAAK,CAAC,IAAI,QAAQ,8BAA8B,OAAO,CAAC,aAAa,MAAM,aAAa,KAAK,WAAW,EAAE,CAAC,CAAC;QAN5F,aAAQ,GAAR,QAAQ,CAAQ;QAChB,YAAO,GAAP,OAAO,CAAmB;QACzB,aAAQ,GAAR,QAAQ,CAAc;QACvB,kBAAa,GAAb,aAAa,CAAoB;QACjC,gBAAW,GAAX,WAAW,CAAoB;IAGnD,CAAC;IAjBM,MAAM,CAAC,MAAM,CAChB,QAAgB,EAChB,OAA0B,EAC1B,QAAsB;QAEtB,MAAM,YAAY,GAAG,qBAAqB,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;QACpE,OAAO,IAAI,qBAAqB,CAAC,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,OAAO,EAAE,YAAY,EAAE,KAAK,CAAC,CAAC;IAC9G,CAAC;IAYD,IAAW,eAAe;QACtB,OAAO,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC;IACjC,CAAC;IAED,IAAW,aAAa;QACpB,OAAO,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC;IACjC,CAAC;IAED;;OAEG;IACK,MAAM,CAAC,cAAc,CAAC,QAAsB;QAChD,MAAM,SAAS,GAAG,QAAQ,CAAC,OAAO,CAAC;QACnC,IAAI,SAAS,EAAE;YACX,MAAM,WAAW,GAAG,4BAA4B,CAAC;YACjD,IAAI,SAAS,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE;gBACnC,MAAM,mBAAmB,GAAG,SAAS,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;gBACjE,MAAM,YAAY,GAAG,mBAAmB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;gBACvD,IAAI,YAAY,IAAI,CAAC,EAAE;oBACnB,8CAA8C;oBAC9C,MAAM,KAAK,GAAG,mBAAmB,CAAC,SAAS,CAAC,YAAY,GAAG,CAAC,CAAC,CAAC;oBAC9D,OAAO;wBACH,OAAO,EAAE,mBAAmB,CAAC,SAAS,CAAC,CAAC,EAAE,YAAY,CAAC;wBACvD,KAAK;qBACR,CAAC;iBACL;aACJ;SACJ;QACD,OAAO,SAAS,CAAC;IACrB,CAAC;CACJ"}
1
+ {"version":3,"file":"serverError.js","sourceRoot":"","sources":["../../src/tsServer/serverError.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAChG;;;;;GAKG;AAKH,MAAM,OAAO,qBAAsB,SAAQ,KAAK;IACrC,MAAM,CAAC,MAAM,CAChB,QAAgB,EAChB,OAA0B,EAC1B,QAAsB;QAEtB,MAAM,YAAY,GAAG,qBAAqB,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;QACpE,OAAO,IAAI,qBAAqB,CAAC,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,OAAO,EAAE,YAAY,EAAE,KAAK,CAAC,CAAC;IAC9G,CAAC;IAED,YACoB,QAAgB,EAChB,OAA0B,EACzB,QAAsB,EACvB,aAAiC,EACjC,WAA+B;QAE/C,KAAK,CAAC,IAAI,QAAQ,8BAA8B,OAAO,CAAC,aAAa,MAAM,aAAa,KAAK,WAAW,EAAE,CAAC,CAAC;QAN5F,aAAQ,GAAR,QAAQ,CAAQ;QAChB,YAAO,GAAP,OAAO,CAAmB;QACzB,aAAQ,GAAR,QAAQ,CAAc;QACvB,kBAAa,GAAb,aAAa,CAAoB;QACjC,gBAAW,GAAX,WAAW,CAAoB;IAGnD,CAAC;IAED,IAAW,eAAe;QACtB,OAAO,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC;IACjC,CAAC;IAED,IAAW,aAAa;QACpB,OAAO,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC;IACjC,CAAC;IAED;;OAEG;IACK,MAAM,CAAC,cAAc,CAAC,QAAsB;QAChD,MAAM,SAAS,GAAG,QAAQ,CAAC,OAAO,CAAC;QACnC,IAAI,SAAS,EAAE;YACX,MAAM,WAAW,GAAG,4BAA4B,CAAC;YACjD,IAAI,SAAS,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE;gBACnC,MAAM,mBAAmB,GAAG,SAAS,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;gBACjE,MAAM,YAAY,GAAG,mBAAmB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;gBACvD,IAAI,YAAY,IAAI,CAAC,EAAE;oBACnB,8CAA8C;oBAC9C,MAAM,KAAK,GAAG,mBAAmB,CAAC,SAAS,CAAC,YAAY,GAAG,CAAC,CAAC,CAAC;oBAC9D,OAAO;wBACH,OAAO,EAAE,mBAAmB,CAAC,SAAS,CAAC,CAAC,EAAE,YAAY,CAAC;wBACvD,KAAK;qBACR,CAAC;iBACL;aACJ;SACJ;QACD,OAAO,SAAS,CAAC;IACrB,CAAC;CACJ"}
@@ -1 +1 @@
1
- {"version":3,"file":"serverProcess.d.ts","sourceRoot":"","sources":["../../src/tsServer/serverProcess.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,eAAe,EAAE,sBAAsB,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAC3F,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAEzD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAE9D,qBAAa,0BAA2B,YAAW,sBAAsB;IACrE,IAAI,CACA,OAAO,EAAE,iBAAiB,EAC1B,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,IAAI,EAAE,mBAAmB,EACzB,aAAa,EAAE,gBAAgB,GAChC,eAAe;CAmBrB"}
1
+ {"version":3,"file":"serverProcess.d.ts","sourceRoot":"","sources":["../../src/tsServer/serverProcess.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,eAAe,EAAE,sBAAsB,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAE3F,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAEzD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAE9D,qBAAa,0BAA2B,YAAW,sBAAsB;IACrE,IAAI,CACA,OAAO,EAAE,iBAAiB,EAC1B,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,IAAI,EAAE,mBAAmB,EACzB,aAAa,EAAE,gBAAgB,GAChC,eAAe;CAmBrB"}
@@ -10,10 +10,11 @@
10
10
  */
11
11
  import ChildProcess from 'node:child_process';
12
12
  import path from 'node:path';
13
+ import API from '../utils/api.js';
13
14
  export class NodeTsServerProcessFactory {
14
15
  fork(version, args, kind, configuration) {
15
16
  const tsServerPath = version.tsServerPath;
16
- const useIpc = false; // version.version?.gte(API.v460);
17
+ const useIpc = version.version?.gte(API.v490);
17
18
  const runtimeArgs = [...args];
18
19
  if (useIpc) {
19
20
  runtimeArgs.push('--useNodeIpc');
@@ -80,6 +81,9 @@ class IpcChildServerProcess {
80
81
  onExit(handler) {
81
82
  this._process.on('exit', handler);
82
83
  }
84
+ onStdErr(handler) {
85
+ this._process.stderr.on('data', data => handler(data.toString()));
86
+ }
83
87
  onError(handler) {
84
88
  this._process.on('error', handler);
85
89
  }
@@ -96,7 +100,7 @@ class StdioChildServerProcess {
96
100
  return this._reader;
97
101
  }
98
102
  write(serverRequest) {
99
- this._process.stdin.write(JSON.stringify(serverRequest) + '\r\n', 'utf8');
103
+ this._process.stdin.write(`${JSON.stringify(serverRequest)}\r\n`, 'utf8');
100
104
  }
101
105
  onData(handler) {
102
106
  this.reader.onData(handler);
@@ -104,6 +108,9 @@ class StdioChildServerProcess {
104
108
  onExit(handler) {
105
109
  this._process.on('exit', handler);
106
110
  }
111
+ onStdErr(handler) {
112
+ this._process.stderr.on('data', data => handler(data.toString()));
113
+ }
107
114
  onError(handler) {
108
115
  this._process.on('error', handler);
109
116
  this.reader.onError(handler);
@@ -1 +1 @@
1
- {"version":3,"file":"serverProcess.js","sourceRoot":"","sources":["../../src/tsServer/serverProcess.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"serverProcess.js","sourceRoot":"","sources":["../../src/tsServer/serverProcess.ts"],"names":[],"mappings":"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"}
@@ -79,7 +79,7 @@ export class TypeScriptServerSpawner {
79
79
  // args.push('--enableTelemetry');
80
80
  // }
81
81
  if (cancellationPipeName) {
82
- args.push('--cancellationPipeName', cancellationPipeName + '*');
82
+ args.push('--cancellationPipeName', `${cancellationPipeName}*`);
83
83
  }
84
84
  if (this.isLoggingEnabled(configuration)) {
85
85
  const logDir = this._logDirectoryProvider.getNewLogDirectory();
@@ -108,10 +108,10 @@ export class TypeScriptServerSpawner {
108
108
  // if (pluginPaths.length !== 0) {
109
109
  // args.push('--pluginProbeLocations', pluginPaths.join(','));
110
110
  // }
111
- if (globalPlugins && globalPlugins.length) {
111
+ if (globalPlugins?.length) {
112
112
  args.push('--globalPlugins', globalPlugins.join(','));
113
113
  }
114
- if (pluginProbeLocations && pluginProbeLocations.length) {
114
+ if (pluginProbeLocations?.length) {
115
115
  args.push('--pluginProbeLocations', pluginProbeLocations.join(','));
116
116
  }
117
117
  if (npmLocation) {
@@ -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,GAAG,oBAAoB,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,EAAE,MAAM,EAAE;YACvB,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;SACzD;QACD,IAAI,oBAAoB,EAAE,MAAM,EAAE;YAC9B,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,11 +1,11 @@
1
- import type tsp from 'typescript/lib/protocol.d.js';
1
+ import type { tsp } from '../ts-protocol.js';
2
2
  import { Logger } from '../utils/logger.js';
3
3
  export declare enum Trace {
4
4
  Off = 0,
5
5
  Messages = 1,
6
6
  Verbose = 2
7
7
  }
8
- export declare type TraceValue = 'off' | 'messages' | 'verbose';
8
+ export type TraceValue = 'off' | 'messages' | 'verbose';
9
9
  export declare namespace Trace {
10
10
  function fromString(value: string): Trace;
11
11
  }
@@ -1 +1 @@
1
- {"version":3,"file":"tracer.d.ts","sourceRoot":"","sources":["../../src/tsServer/tracer.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,GAAG,MAAM,8BAA8B,CAAC;AACpD,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAE5C,oBAAY,KAAK;IACb,GAAG,IAAA;IACH,QAAQ,IAAA;IACR,OAAO,IAAA;CACV;AAED,oBAAY,UAAU,GAAG,KAAK,GAAG,UAAU,GAAG,SAAS,CAAC;AAExD,yBAAiB,KAAK,CAAC;IACnB,SAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,KAAK,CAY/C;CACJ;AAED,UAAU,wBAAwB;IAC9B,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;CACrC;AAED,MAAM,CAAC,OAAO,OAAO,MAAM;IAEnB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,KAAK;gBADL,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,KAAK;IAI1B,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,gBAAgB,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,GAAG,IAAI;IAW1G,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,CAAC,QAAQ,EAAE,IAAI,EAAE,wBAAwB,GAAG,IAAI;IAW7F,qBAAqB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,wBAAwB,GAAG,GAAG;IAOlH,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,CAAC,KAAK,GAAG,IAAI;IAWpD,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,GAAG,GAAG,IAAI;CAKvE"}
1
+ {"version":3,"file":"tracer.d.ts","sourceRoot":"","sources":["../../src/tsServer/tracer.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAE5C,oBAAY,KAAK;IACb,GAAG,IAAA;IACH,QAAQ,IAAA;IACR,OAAO,IAAA;CACV;AAED,MAAM,MAAM,UAAU,GAAG,KAAK,GAAG,UAAU,GAAG,SAAS,CAAC;AAExD,yBAAiB,KAAK,CAAC;IACnB,SAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,KAAK,CAY/C;CACJ;AAED,UAAU,wBAAwB;IAC9B,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;CACrC;AAED,MAAM,CAAC,OAAO,OAAO,MAAM;IAEnB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,KAAK;gBADL,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,KAAK;IAI1B,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,gBAAgB,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,GAAG,IAAI;IAW1G,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,CAAC,QAAQ,EAAE,IAAI,EAAE,wBAAwB,GAAG,IAAI;IAW7F,qBAAqB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,wBAAwB,GAAG,GAAG;IAOlH,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,CAAC,KAAK,GAAG,IAAI;IAWpD,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,GAAG,GAAG,IAAI;CAKvE"}
@@ -73,7 +73,7 @@ export class TypeScriptVersion {
73
73
  this.logger.log('Failed parsing contents of package.json.');
74
74
  return null;
75
75
  }
76
- if (!desc || !desc.version) {
76
+ if (!desc?.version) {
77
77
  this.logger.log('Failed reading version number from package.json.');
78
78
  return null;
79
79
  }