typescript-language-server 1.2.0 → 2.0.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (75) hide show
  1. package/CHANGELOG.md +26 -0
  2. package/README.md +28 -2
  3. package/lib/cli.js +6 -6
  4. package/lib/cli.js.map +1 -1
  5. package/lib/completion.d.ts +1 -2
  6. package/lib/completion.d.ts.map +1 -1
  7. package/lib/completion.js +38 -26
  8. package/lib/completion.js.map +1 -1
  9. package/lib/configuration-manager.js +1 -1
  10. package/lib/configuration-manager.js.map +1 -1
  11. package/lib/diagnostic-queue.d.ts +1 -1
  12. package/lib/diagnostic-queue.d.ts.map +1 -1
  13. package/lib/lsp-connection.d.ts +5 -5
  14. package/lib/lsp-connection.d.ts.map +1 -1
  15. package/lib/lsp-connection.js +2 -3
  16. package/lib/lsp-connection.js.map +1 -1
  17. package/lib/lsp-server.d.ts +5 -6
  18. package/lib/lsp-server.d.ts.map +1 -1
  19. package/lib/lsp-server.js +16 -31
  20. package/lib/lsp-server.js.map +1 -1
  21. package/lib/lsp-server.spec.js +319 -96
  22. package/lib/lsp-server.spec.js.map +1 -1
  23. package/lib/test-utils.d.ts +3 -1
  24. package/lib/test-utils.d.ts.map +1 -1
  25. package/lib/test-utils.js +19 -8
  26. package/lib/test-utils.js.map +1 -1
  27. package/lib/ts-protocol.d.ts +27 -7
  28. package/lib/ts-protocol.d.ts.map +1 -1
  29. package/lib/ts-protocol.js +7 -1
  30. package/lib/ts-protocol.js.map +1 -1
  31. package/lib/tsServer/cancellation.d.ts +7 -4
  32. package/lib/tsServer/cancellation.d.ts.map +1 -1
  33. package/lib/tsServer/cancellation.js +7 -8
  34. package/lib/tsServer/cancellation.js.map +1 -1
  35. package/lib/tsServer/logDirectoryProvider.d.ts +13 -0
  36. package/lib/tsServer/logDirectoryProvider.d.ts.map +1 -0
  37. package/lib/tsServer/logDirectoryProvider.js +49 -0
  38. package/lib/tsServer/logDirectoryProvider.js.map +1 -0
  39. package/lib/tsServer/server.d.ts +3 -1
  40. package/lib/tsServer/server.d.ts.map +1 -1
  41. package/lib/tsServer/server.js +8 -7
  42. package/lib/tsServer/server.js.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.d.ts +7 -2
  46. package/lib/tsServer/spawner.d.ts.map +1 -1
  47. package/lib/tsServer/spawner.js +28 -20
  48. package/lib/tsServer/spawner.js.map +1 -1
  49. package/lib/tsServer/tracer.d.ts +26 -0
  50. package/lib/tsServer/tracer.d.ts.map +1 -0
  51. package/lib/tsServer/tracer.js +80 -0
  52. package/lib/tsServer/tracer.js.map +1 -0
  53. package/lib/tsServer/versionProvider.d.ts +7 -7
  54. package/lib/tsServer/versionProvider.d.ts.map +1 -1
  55. package/lib/tsServer/versionProvider.js +26 -20
  56. package/lib/tsServer/versionProvider.js.map +1 -1
  57. package/lib/tsp-client.d.ts +8 -3
  58. package/lib/tsp-client.d.ts.map +1 -1
  59. package/lib/tsp-client.js +4 -5
  60. package/lib/tsp-client.js.map +1 -1
  61. package/lib/tsp-client.spec.js +15 -5
  62. package/lib/tsp-client.spec.js.map +1 -1
  63. package/lib/utils/configuration.d.ts +17 -8
  64. package/lib/utils/configuration.d.ts.map +1 -1
  65. package/lib/utils/configuration.js +43 -1
  66. package/lib/utils/configuration.js.map +1 -1
  67. package/lib/utils/logger.d.ts +65 -0
  68. package/lib/utils/logger.d.ts.map +1 -0
  69. package/lib/utils/logger.js +189 -0
  70. package/lib/utils/logger.js.map +1 -0
  71. package/package.json +14 -14
  72. package/lib/logger.d.ts +0 -48
  73. package/lib/logger.d.ts.map +0 -1
  74. package/lib/logger.js +0 -106
  75. package/lib/logger.js.map +0 -1
@@ -2,6 +2,12 @@
2
2
  * Copyright (c) Microsoft Corporation. All rights reserved.
3
3
  * Licensed under the MIT License. See License.txt in the project root for license information.
4
4
  *--------------------------------------------------------------------------------------------*/
5
+ /*
6
+ * Copyright (C) 2022 TypeFox and others.
7
+ *
8
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License.
9
+ * You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
10
+ */
5
11
  import fs from 'node:fs';
6
12
  import { createRequire } from 'node:module';
7
13
  import path from 'node:path';
@@ -10,11 +16,11 @@ import { pkgUpSync } from 'pkg-up';
10
16
  import API from '../utils/api.js';
11
17
  import { findPathToModule } from '../utils/modules-resolver.js';
12
18
  export class TypeScriptVersion {
13
- constructor(source, path, _pathLabel, logger) {
19
+ constructor(source, path, logger, _pathLabel) {
14
20
  this.source = source;
15
21
  this.path = path;
16
- this._pathLabel = _pathLabel;
17
22
  this.logger = logger;
23
+ this._pathLabel = _pathLabel;
18
24
  this._api = null;
19
25
  }
20
26
  get tscPath() {
@@ -41,14 +47,14 @@ export class TypeScriptVersion {
41
47
  return version ? version.displayName : null;
42
48
  }
43
49
  getTypeScriptVersion(serverPath) {
44
- this.logger?.info(`Resolving TypeScript version from path "${serverPath}"...`);
50
+ this.logger.log(`Resolving TypeScript version from path "${serverPath}"...`);
45
51
  if (!fs.existsSync(serverPath)) {
46
- this.logger?.info('Server path does not exist on disk');
52
+ this.logger.log('Server path does not exist on disk');
47
53
  return null;
48
54
  }
49
55
  const p = serverPath.split(path.sep);
50
56
  if (p.length <= 2) {
51
- this.logger?.info('Server path is invalid (has less than two path components).');
57
+ this.logger.log('Server path is invalid (has less than two path components).');
52
58
  return null;
53
59
  }
54
60
  const p2 = p.slice(0, -2);
@@ -61,24 +67,24 @@ export class TypeScriptVersion {
61
67
  }
62
68
  }
63
69
  if (!fs.existsSync(fileName)) {
64
- this.logger?.info(`Failed to find package.json at path "${fileName}"`);
70
+ this.logger.log(`Failed to find package.json at path "${fileName}"`);
65
71
  return null;
66
72
  }
67
- this.logger?.info(`Reading version from package.json at "${fileName}"`);
73
+ this.logger.log(`Reading version from package.json at "${fileName}"`);
68
74
  const contents = fs.readFileSync(fileName).toString();
69
75
  let desc = null;
70
76
  try {
71
77
  desc = JSON.parse(contents);
72
78
  }
73
79
  catch (err) {
74
- this.logger?.info('Failed parsing contents of package.json.');
80
+ this.logger.log('Failed parsing contents of package.json.');
75
81
  return null;
76
82
  }
77
83
  if (!desc || !desc.version) {
78
- this.logger?.info('Failed reading version number from package.json.');
84
+ this.logger.log('Failed reading version number from package.json.');
79
85
  return null;
80
86
  }
81
- this.logger?.info(`Resolved TypeScript version to "${desc.version}"`);
87
+ this.logger.log(`Resolved TypeScript version to "${desc.version}"`);
82
88
  return API.fromVersionString(desc.version);
83
89
  }
84
90
  }
@@ -89,11 +95,11 @@ export class TypeScriptVersionProvider {
89
95
  this.logger = logger;
90
96
  }
91
97
  getUserSettingVersion() {
92
- const { tsserverPath } = this.configuration || {};
98
+ const { tsserverPath } = this.configuration;
93
99
  if (!tsserverPath) {
94
100
  return null;
95
101
  }
96
- this.logger?.info(`Resolving user-provided tsserver path "${tsserverPath}"...`);
102
+ this.logger.log(`Resolving user-provided tsserver path "${tsserverPath}"...`);
97
103
  let resolvedPath = tsserverPath;
98
104
  // Resolve full path to the binary if path is not absolute.
99
105
  if (!path.isAbsolute(resolvedPath)) {
@@ -101,39 +107,39 @@ export class TypeScriptVersionProvider {
101
107
  if (binaryPath) {
102
108
  resolvedPath = binaryPath;
103
109
  }
104
- this.logger?.info(`Non-absolute tsserver path resolved to "${binaryPath ? resolvedPath : '<failed>'}"`);
110
+ this.logger.log(`Non-absolute tsserver path resolved to "${binaryPath ? resolvedPath : '<failed>'}"`);
105
111
  }
106
112
  // Resolve symbolic link.
107
113
  let stat = fs.lstatSync(resolvedPath, { throwIfNoEntry: false });
108
114
  if (stat?.isSymbolicLink()) {
109
115
  resolvedPath = fs.realpathSync(resolvedPath);
110
- this.logger?.info(`Symbolic link tsserver path resolved to "${resolvedPath}"`);
116
+ this.logger.log(`Symbolic link tsserver path resolved to "${resolvedPath}"`);
111
117
  }
112
118
  // Get directory path
113
119
  stat = fs.lstatSync(resolvedPath, { throwIfNoEntry: false });
114
120
  if (stat?.isFile()) {
115
121
  resolvedPath = path.dirname(resolvedPath);
116
- this.logger?.info(`Resolved directory path from a file path: ${resolvedPath}`);
122
+ this.logger.log(`Resolved directory path from a file path: ${resolvedPath}`);
117
123
  }
118
124
  // Resolve path to the "lib" dir.
119
125
  try {
120
126
  const packageJsonPath = pkgUpSync({ cwd: resolvedPath });
121
- this.logger?.info(`Resolved package.json location: "${packageJsonPath}"`);
127
+ this.logger.log(`Resolved package.json location: "${packageJsonPath}"`);
122
128
  if (packageJsonPath) {
123
129
  resolvedPath = path.join(path.dirname(packageJsonPath), 'lib');
124
- this.logger?.info(`Assumed tsserver lib location: "${resolvedPath}"`);
130
+ this.logger.log(`Assumed tsserver lib location: "${resolvedPath}"`);
125
131
  }
126
132
  }
127
133
  catch {
128
134
  // ignore
129
135
  }
130
- return new TypeScriptVersion("user-setting" /* TypeScriptVersionSource.UserSetting */, resolvedPath, undefined, this.logger);
136
+ return new TypeScriptVersion("user-setting" /* TypeScriptVersionSource.UserSetting */, resolvedPath, this.logger, undefined);
131
137
  }
132
138
  getWorkspaceVersion(workspaceFolders) {
133
139
  for (const p of workspaceFolders) {
134
140
  const libFolder = findPathToModule(p, MODULE_FOLDERS);
135
141
  if (libFolder) {
136
- const version = new TypeScriptVersion("workspace" /* TypeScriptVersionSource.Workspace */, libFolder);
142
+ const version = new TypeScriptVersion("workspace" /* TypeScriptVersionSource.Workspace */, libFolder, this.logger);
137
143
  if (version.isValid) {
138
144
  return version;
139
145
  }
@@ -145,7 +151,7 @@ export class TypeScriptVersionProvider {
145
151
  const require = createRequire(import.meta.url);
146
152
  try {
147
153
  const file = require.resolve('typescript');
148
- const bundledVersion = new TypeScriptVersion("bundled" /* TypeScriptVersionSource.Bundled */, path.dirname(file), '');
154
+ const bundledVersion = new TypeScriptVersion("bundled" /* TypeScriptVersionSource.Bundled */, path.dirname(file), this.logger, '');
149
155
  return bundledVersion;
150
156
  }
151
157
  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":"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"}
@@ -2,17 +2,21 @@
2
2
  import type tsp from 'typescript/lib/protocol.d.js';
3
3
  import type { CancellationToken } from 'vscode-jsonrpc';
4
4
  import { CommandTypes } from './tsp-command-types.js';
5
- import { Logger } from './logger.js';
5
+ import { Logger } from './utils/logger.js';
6
6
  import API from './utils/api.js';
7
+ import type { ILogDirectoryProvider } from './tsServer/logDirectoryProvider.js';
7
8
  import { ExecConfig, ServerResponse, TypeScriptRequestTypes } from './tsServer/requests.js';
9
+ import { Trace } from './tsServer/tracer.js';
8
10
  import type { TypeScriptVersion } from './tsServer/versionProvider.js';
9
11
  import type { LspClient } from './lsp-client.js';
12
+ import type { TsServerLogLevel } from './utils/configuration.js';
10
13
  export interface TspClientOptions {
11
14
  lspClient: LspClient;
15
+ trace: Trace;
12
16
  typescriptVersion: TypeScriptVersion;
13
17
  logger: Logger;
14
- logFile?: string;
15
- logVerbosity?: string;
18
+ logVerbosity: TsServerLogLevel;
19
+ logDirectoryProvider: ILogDirectoryProvider;
16
20
  disableAutomaticTypingAcquisition?: boolean;
17
21
  maxTsServerMemory?: number;
18
22
  npmLocation?: string;
@@ -29,6 +33,7 @@ export declare class TspClient {
29
33
  private logger;
30
34
  private tsserverLogger;
31
35
  private loadingIndicator;
36
+ private tracer;
32
37
  constructor(options: TspClientOptions);
33
38
  start(): boolean;
34
39
  private serviceExited;
@@ -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
@@ -8,11 +8,12 @@
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 { PrefixingLogger } from './logger.js';
11
+ import { PrefixingLogger } from './utils/logger.js';
12
12
  import API from './utils/api.js';
13
13
  import { ServerResponse } from './tsServer/requests.js';
14
14
  import { TypeScriptServerError } from './tsServer/serverError.js';
15
15
  import { TypeScriptServerSpawner } from './tsServer/spawner.js';
16
+ import Tracer from './tsServer/tracer.js';
16
17
  class ServerInitializingIndicator {
17
18
  constructor(lspClient) {
18
19
  this.lspClient = lspClient;
@@ -52,9 +53,10 @@ export class TspClient {
52
53
  this.logger = new PrefixingLogger(options.logger, '[tsclient]');
53
54
  this.tsserverLogger = new PrefixingLogger(options.logger, '[tsserver]');
54
55
  this.loadingIndicator = new ServerInitializingIndicator(options.lspClient);
56
+ this.tracer = new Tracer(this.tsserverLogger, options.trace);
55
57
  }
56
58
  start() {
57
- const tsServerSpawner = new TypeScriptServerSpawner(this.apiVersion, this.logger);
59
+ const tsServerSpawner = new TypeScriptServerSpawner(this.apiVersion, this.options.logDirectoryProvider, this.logger, this.tracer);
58
60
  const tsServer = tsServerSpawner.spawn(this.options.typescriptVersion, this.options);
59
61
  tsServer.onExit((data) => {
60
62
  this.shutdown();
@@ -77,9 +79,6 @@ export class TspClient {
77
79
  this.primaryTsServer = null;
78
80
  this.loadingIndicator.reset();
79
81
  }
80
- // private static isLoggingEnabled(configuration: TspClientOptions) {
81
- // return configuration.tsServerLogLevel !== TsServerLogLevel.Off;
82
- // }
83
82
  dispatchEvent(event) {
84
83
  switch (event.event) {
85
84
  case "syntaxDiag" /* EventTypes.SyntaxDiag */:
@@ -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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"}
@@ -6,23 +6,33 @@
6
6
  */
7
7
  import * as chai from 'chai';
8
8
  import { TspClient } from './tsp-client.js';
9
- import { ConsoleLogger } from './logger.js';
9
+ import { ConsoleLogger } from './utils/logger.js';
10
10
  import { filePath, readContents, TestLspClient, uri } from './test-utils.js';
11
+ import { Trace } from './tsServer/tracer.js';
11
12
  import { TypeScriptVersionProvider } from './tsServer/versionProvider.js';
13
+ import { TsServerLogLevel } from './utils/configuration.js';
14
+ import { noopLogDirectoryProvider } from './tsServer/logDirectoryProvider.js';
12
15
  const assert = chai.assert;
13
- const typescriptVersionProvider = new TypeScriptVersionProvider();
14
- const bundled = typescriptVersionProvider.bundledVersion();
15
16
  const logger = new ConsoleLogger();
16
17
  const lspClientOptions = {
17
18
  rootUri: uri(),
18
19
  publishDiagnostics: () => { },
19
20
  };
20
21
  const lspClient = new TestLspClient(lspClientOptions, logger);
22
+ const configuration = {
23
+ logger,
24
+ lspClient,
25
+ tsserverLogVerbosity: TsServerLogLevel.Off,
26
+ };
27
+ const typescriptVersionProvider = new TypeScriptVersionProvider(configuration, logger);
28
+ const bundled = typescriptVersionProvider.bundledVersion();
21
29
  let server;
22
30
  before(() => {
23
31
  server = new TspClient({
24
- logger,
25
- lspClient,
32
+ ...configuration,
33
+ logDirectoryProvider: noopLogDirectoryProvider,
34
+ logVerbosity: configuration.tsserverLogVerbosity,
35
+ trace: Trace.Off,
26
36
  typescriptVersion: bundled,
27
37
  });
28
38
  });
@@ -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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"}
@@ -1,10 +1,19 @@
1
- import { Logger } from '../logger.js';
2
- import { LspClient } from '../lsp-client.js';
3
- export interface IServerOptions {
4
- logger: Logger;
5
- tsserverPath?: string;
6
- tsserverLogFile?: string;
7
- tsserverLogVerbosity?: string;
8
- lspClient: LspClient;
1
+ import type { Logger } from '../utils/logger.js';
2
+ import type { LspClient } from '../lsp-client.js';
3
+ export declare enum TsServerLogLevel {
4
+ Off = 0,
5
+ Normal = 1,
6
+ Terse = 2,
7
+ Verbose = 3
8
+ }
9
+ export declare namespace TsServerLogLevel {
10
+ function fromString(value: string): TsServerLogLevel;
11
+ function toString(value: TsServerLogLevel): string;
12
+ }
13
+ export interface TypeScriptServiceConfiguration {
14
+ readonly logger: Logger;
15
+ readonly lspClient: LspClient;
16
+ readonly tsserverLogVerbosity: TsServerLogLevel;
17
+ readonly tsserverPath?: string;
9
18
  }
10
19
  //# sourceMappingURL=configuration.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"configuration.d.ts","sourceRoot":"","sources":["../../src/utils/configuration.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE7C,MAAM,WAAW,cAAc;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,SAAS,EAAE,SAAS,CAAC;CACxB"}
1
+ {"version":3,"file":"configuration.d.ts","sourceRoot":"","sources":["../../src/utils/configuration.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAElD,oBAAY,gBAAgB;IACxB,GAAG,IAAA;IACH,MAAM,IAAA;IACN,KAAK,IAAA;IACL,OAAO,IAAA;CACV;AAED,yBAAiB,gBAAgB,CAAC;IAC9B,SAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,gBAAgB,CAY1D;IAED,SAAgB,QAAQ,CAAC,KAAK,EAAE,gBAAgB,GAAG,MAAM,CAYxD;CACJ;AAED,MAAM,WAAW,8BAA8B;IAC3C,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC;IAC9B,QAAQ,CAAC,oBAAoB,EAAE,gBAAgB,CAAC;IAChD,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC;CAClC"}
@@ -1,2 +1,44 @@
1
- export {};
1
+ /*
2
+ * Copyright (C) 2021.
3
+ *
4
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License.
5
+ * You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
6
+ */
7
+ export var TsServerLogLevel;
8
+ (function (TsServerLogLevel) {
9
+ TsServerLogLevel[TsServerLogLevel["Off"] = 0] = "Off";
10
+ TsServerLogLevel[TsServerLogLevel["Normal"] = 1] = "Normal";
11
+ TsServerLogLevel[TsServerLogLevel["Terse"] = 2] = "Terse";
12
+ TsServerLogLevel[TsServerLogLevel["Verbose"] = 3] = "Verbose";
13
+ })(TsServerLogLevel = TsServerLogLevel || (TsServerLogLevel = {}));
14
+ (function (TsServerLogLevel) {
15
+ function fromString(value) {
16
+ switch (value?.toLowerCase()) {
17
+ case 'normal':
18
+ return TsServerLogLevel.Normal;
19
+ case 'terse':
20
+ return TsServerLogLevel.Terse;
21
+ case 'verbose':
22
+ return TsServerLogLevel.Verbose;
23
+ case 'off':
24
+ default:
25
+ return TsServerLogLevel.Off;
26
+ }
27
+ }
28
+ TsServerLogLevel.fromString = fromString;
29
+ function toString(value) {
30
+ switch (value) {
31
+ case TsServerLogLevel.Normal:
32
+ return 'normal';
33
+ case TsServerLogLevel.Terse:
34
+ return 'terse';
35
+ case TsServerLogLevel.Verbose:
36
+ return 'verbose';
37
+ case TsServerLogLevel.Off:
38
+ default:
39
+ return 'off';
40
+ }
41
+ }
42
+ TsServerLogLevel.toString = toString;
43
+ })(TsServerLogLevel = TsServerLogLevel || (TsServerLogLevel = {}));
2
44
  //# sourceMappingURL=configuration.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"configuration.js","sourceRoot":"","sources":["../../src/utils/configuration.ts"],"names":[],"mappings":""}
1
+ {"version":3,"file":"configuration.js","sourceRoot":"","sources":["../../src/utils/configuration.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAOH,MAAM,CAAN,IAAY,gBAKX;AALD,WAAY,gBAAgB;IACxB,qDAAG,CAAA;IACH,2DAAM,CAAA;IACN,yDAAK,CAAA;IACL,6DAAO,CAAA;AACX,CAAC,EALW,gBAAgB,GAAhB,gBAAgB,KAAhB,gBAAgB,QAK3B;AAED,WAAiB,gBAAgB;IAC7B,SAAgB,UAAU,CAAC,KAAa;QACpC,QAAQ,KAAK,EAAE,WAAW,EAAE,EAAE;YAC1B,KAAK,QAAQ;gBACT,OAAO,gBAAgB,CAAC,MAAM,CAAC;YACnC,KAAK,OAAO;gBACR,OAAO,gBAAgB,CAAC,KAAK,CAAC;YAClC,KAAK,SAAS;gBACV,OAAO,gBAAgB,CAAC,OAAO,CAAC;YACpC,KAAK,KAAK,CAAC;YACX;gBACI,OAAO,gBAAgB,CAAC,GAAG,CAAC;SACnC;IACL,CAAC;IAZe,2BAAU,aAYzB,CAAA;IAED,SAAgB,QAAQ,CAAC,KAAuB;QAC5C,QAAQ,KAAK,EAAE;YACX,KAAK,gBAAgB,CAAC,MAAM;gBACxB,OAAO,QAAQ,CAAC;YACpB,KAAK,gBAAgB,CAAC,KAAK;gBACvB,OAAO,OAAO,CAAC;YACnB,KAAK,gBAAgB,CAAC,OAAO;gBACzB,OAAO,SAAS,CAAC;YACrB,KAAK,gBAAgB,CAAC,GAAG,CAAC;YAC1B;gBACI,OAAO,KAAK,CAAC;SACpB;IACL,CAAC;IAZe,yBAAQ,WAYvB,CAAA;AACL,CAAC,EA5BgB,gBAAgB,GAAhB,gBAAgB,KAAhB,gBAAgB,QA4BhC"}
@@ -0,0 +1,65 @@
1
+ import lsp from 'vscode-languageserver';
2
+ import type { LspClient } from '../lsp-client.js';
3
+ export declare enum LogLevel {
4
+ Error = 0,
5
+ Warning = 1,
6
+ Info = 2,
7
+ Log = 3
8
+ }
9
+ export declare namespace LogLevel {
10
+ function fromString(value?: string): LogLevel;
11
+ function toString(level: LogLevel): string;
12
+ }
13
+ declare type TraceLevel = 'Trace' | 'Info' | 'Error';
14
+ export interface Logger {
15
+ error(...args: any[]): void;
16
+ warn(...args: any[]): void;
17
+ info(...args: any[]): void;
18
+ log(...args: any[]): void;
19
+ /**
20
+ * Logs the arguments regardless of the verbosity level set for the logger.
21
+ */
22
+ logIgnoringVerbosity(level: LogLevel, ...args: any[]): void;
23
+ /**
24
+ * Logs the arguments regardless of the verbosity level in a trace-specific format.
25
+ */
26
+ trace(level: TraceLevel, message: string, data?: any): void;
27
+ }
28
+ export declare class LspClientLogger implements Logger {
29
+ private client;
30
+ private level;
31
+ constructor(client: LspClient, level: lsp.MessageType);
32
+ private sendMessage;
33
+ private logLevelToLspMessageType;
34
+ error(...args: any[]): void;
35
+ warn(...args: any[]): void;
36
+ info(...args: any[]): void;
37
+ log(...args: any[]): void;
38
+ logIgnoringVerbosity(level: LogLevel, ...args: any[]): void;
39
+ trace(level: TraceLevel, message: string, data?: any): void;
40
+ }
41
+ export declare class ConsoleLogger implements Logger {
42
+ private level;
43
+ constructor(level?: LogLevel);
44
+ private print;
45
+ private toStrings;
46
+ error(...args: any[]): void;
47
+ warn(...args: any[]): void;
48
+ info(...args: any[]): void;
49
+ log(...args: any[]): void;
50
+ logIgnoringVerbosity(level: LogLevel, ...args: any[]): void;
51
+ trace(level: TraceLevel, message: string, data?: any): void;
52
+ }
53
+ export declare class PrefixingLogger implements Logger {
54
+ private logger;
55
+ private prefix;
56
+ constructor(logger: Logger, prefix: string);
57
+ error(...args: any[]): void;
58
+ warn(...args: any[]): void;
59
+ info(...args: any[]): void;
60
+ log(...args: any[]): void;
61
+ logIgnoringVerbosity(level: LogLevel, ...args: any[]): void;
62
+ trace(level: TraceLevel, message: string, data?: any): void;
63
+ }
64
+ export {};
65
+ //# sourceMappingURL=logger.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../src/utils/logger.ts"],"names":[],"mappings":"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"}