typescript-language-server 0.11.2 → 1.0.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.
- package/CHANGELOG.md +28 -0
- package/README.md +32 -6
- package/lib/calls.d.ts +3 -3
- package/lib/calls.d.ts.map +1 -1
- package/lib/calls.js +18 -46
- package/lib/calls.js.map +1 -1
- package/lib/cli.js +8 -32
- package/lib/cli.js.map +1 -1
- package/lib/commands.js +1 -4
- package/lib/commands.js.map +1 -1
- package/lib/completion.d.ts +6 -6
- package/lib/completion.d.ts.map +1 -1
- package/lib/completion.js +76 -116
- package/lib/completion.js.map +1 -1
- package/lib/diagnostic-queue.d.ts +5 -5
- package/lib/diagnostic-queue.d.ts.map +1 -1
- package/lib/diagnostic-queue.js +7 -14
- package/lib/diagnostic-queue.js.map +1 -1
- package/lib/document-symbol.d.ts +2 -2
- package/lib/document-symbol.d.ts.map +1 -1
- package/lib/document-symbol.js +16 -22
- package/lib/document-symbol.js.map +1 -1
- package/lib/document.d.ts +1 -1
- package/lib/document.d.ts.map +1 -1
- package/lib/document.js +6 -34
- package/lib/document.js.map +1 -1
- package/lib/features/fix-all.d.ts +4 -4
- package/lib/features/fix-all.d.ts.map +1 -1
- package/lib/features/fix-all.js +17 -44
- package/lib/features/fix-all.js.map +1 -1
- package/lib/file-lsp-server.spec.js +17 -18
- package/lib/file-lsp-server.spec.js.map +1 -1
- package/lib/hover.d.ts +2 -2
- package/lib/hover.d.ts.map +1 -1
- package/lib/hover.js +8 -12
- package/lib/hover.js.map +1 -1
- package/lib/logger.d.ts +12 -4
- package/lib/logger.d.ts.map +1 -1
- package/lib/logger.js +36 -43
- package/lib/logger.js.map +1 -1
- package/lib/lsp-client.d.ts +3 -3
- package/lib/lsp-client.d.ts.map +1 -1
- package/lib/lsp-client.js +4 -31
- package/lib/lsp-client.js.map +1 -1
- package/lib/lsp-connection.d.ts +1 -1
- package/lib/lsp-connection.d.ts.map +1 -1
- package/lib/lsp-connection.js +10 -37
- package/lib/lsp-connection.js.map +1 -1
- package/lib/lsp-protocol.calls.proposed.d.ts +1 -1
- package/lib/lsp-protocol.calls.proposed.d.ts.map +1 -1
- package/lib/lsp-protocol.calls.proposed.js +7 -32
- package/lib/lsp-protocol.calls.proposed.js.map +1 -1
- package/lib/lsp-protocol.inlayHints.proposed.d.ts +2 -2
- package/lib/lsp-protocol.inlayHints.proposed.d.ts.map +1 -1
- package/lib/lsp-protocol.inlayHints.proposed.js +2 -28
- package/lib/lsp-protocol.inlayHints.proposed.js.map +1 -1
- package/lib/lsp-server.d.ts +13 -9
- package/lib/lsp-server.d.ts.map +1 -1
- package/lib/lsp-server.js +226 -189
- package/lib/lsp-server.js.map +1 -1
- package/lib/lsp-server.spec.js +243 -245
- package/lib/lsp-server.spec.js.map +1 -1
- package/lib/organize-imports.d.ts +3 -3
- package/lib/organize-imports.d.ts.map +1 -1
- package/lib/organize-imports.js +5 -32
- package/lib/organize-imports.js.map +1 -1
- package/lib/organize-imports.spec.js +9 -34
- package/lib/organize-imports.spec.js.map +1 -1
- package/lib/protocol-translation.d.ts +3 -3
- package/lib/protocol-translation.d.ts.map +1 -1
- package/lib/protocol-translation.js +26 -70
- package/lib/protocol-translation.js.map +1 -1
- package/lib/quickfix.d.ts +3 -3
- package/lib/quickfix.d.ts.map +1 -1
- package/lib/quickfix.js +7 -35
- package/lib/quickfix.js.map +1 -1
- package/lib/refactor.d.ts +2 -2
- package/lib/refactor.d.ts.map +1 -1
- package/lib/refactor.js +7 -36
- package/lib/refactor.js.map +1 -1
- package/lib/semantic-tokens.d.ts +1 -1
- package/lib/semantic-tokens.d.ts.map +1 -1
- package/lib/semantic-tokens.js +1 -5
- package/lib/semantic-tokens.js.map +1 -1
- package/lib/test-utils.d.ts +4 -2
- package/lib/test-utils.d.ts.map +1 -1
- package/lib/test-utils.js +39 -60
- package/lib/test-utils.js.map +1 -1
- package/lib/ts-protocol.d.ts +7 -4
- package/lib/ts-protocol.d.ts.map +1 -1
- package/lib/ts-protocol.js +4 -31
- package/lib/ts-protocol.js.map +1 -1
- package/lib/tsp-client.d.ts +42 -43
- package/lib/tsp-client.d.ts.map +1 -1
- package/lib/tsp-client.js +23 -46
- package/lib/tsp-client.js.map +1 -1
- package/lib/tsp-client.spec.js +36 -56
- package/lib/tsp-client.spec.js.map +1 -1
- package/lib/tsp-command-types.js +3 -7
- package/lib/tsp-command-types.js.map +1 -1
- package/lib/utils/SnippetString.js +1 -4
- package/lib/utils/SnippetString.js.map +1 -1
- package/lib/utils/api.d.ts +1 -0
- package/lib/utils/api.d.ts.map +1 -1
- package/lib/utils/api.js +3 -28
- package/lib/utils/api.js.map +1 -1
- package/lib/utils/configuration.d.ts +2 -2
- package/lib/utils/configuration.d.ts.map +1 -1
- package/lib/utils/configuration.js +1 -2
- package/lib/utils/errorCodes.js +11 -14
- package/lib/utils/errorCodes.js.map +1 -1
- package/lib/utils/fixNames.js +13 -16
- package/lib/utils/fixNames.js.map +1 -1
- package/lib/utils/modules-resolver.js +7 -34
- package/lib/utils/modules-resolver.js.map +1 -1
- package/lib/utils/modules-resolver.spec.d.ts +1 -1
- package/lib/utils/modules-resolver.spec.d.ts.map +1 -1
- package/lib/utils/modules-resolver.spec.js +11 -34
- package/lib/utils/modules-resolver.spec.js.map +1 -1
- package/lib/utils/typeConverters.d.ts +1 -1
- package/lib/utils/typeConverters.d.ts.map +1 -1
- package/lib/utils/typeConverters.js +2 -5
- package/lib/utils/typeConverters.js.map +1 -1
- package/lib/utils/types.js +2 -29
- package/lib/utils/types.js.map +1 -1
- package/lib/utils/versionProvider.d.ts +3 -3
- package/lib/utils/versionProvider.d.ts.map +1 -1
- package/lib/utils/versionProvider.js +35 -41
- package/lib/utils/versionProvider.js.map +1 -1
- package/lib/utils.js +1 -5
- package/lib/utils.js.map +1 -1
- package/package.json +35 -33
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"document-symbol.js","sourceRoot":"","sources":["../src/document-symbol.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"document-symbol.js","sourceRoot":"","sources":["../src/document-symbol.ts"],"names":[],"mappings":"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"}
|
package/lib/document.d.ts
CHANGED
package/lib/document.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"document.d.ts","sourceRoot":"","sources":["../src/document.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,GAAG,MAAM,
|
|
1
|
+
{"version":3,"file":"document.d.ts","sourceRoot":"","sources":["../src/document.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,GAAG,MAAM,uBAAuB,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAElE,qBAAa,WAAY,YAAW,YAAY;IAC5C,SAAS,CAAC,QAAQ,EAAE,YAAY,CAAC;gBAErB,GAAG,EAAE,GAAG,CAAC,gBAAgB;IAKrC,IAAI,GAAG,IAAI,MAAM,CAEhB;IAED,IAAI,UAAU,IAAI,MAAM,CAEvB;IAED,IAAI,OAAO,IAAI,MAAM,CAEpB;IAED,OAAO,CAAC,KAAK,CAAC,EAAE,GAAG,CAAC,KAAK,GAAG,MAAM;IAIlC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,GAAG,CAAC,QAAQ;IAIxC,QAAQ,CAAC,QAAQ,EAAE,GAAG,CAAC,QAAQ,GAAG,MAAM;IAIxC,IAAI,SAAS,IAAI,MAAM,CAEtB;IAED,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAK7B,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,GAAG,CAAC,KAAK;IAMrC,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,GAAG,CAAC,QAAQ;IAKtC,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAKnC,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,GAAG,CAAC,QAAQ;IAIxC,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,CAAC,8BAA8B,GAAG,IAAI;CAU/E;AAED,qBAAa,YAAY;IACrB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAgB;IACvC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAkC;IAE5D;;OAEG;IACH,IAAI,KAAK,IAAI,MAAM,EAAE,CAEpB;IAED,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,WAAW,GAAG,SAAS;IAY1C,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC,gBAAgB,GAAG,OAAO;IAStD,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,WAAW,GAAG,SAAS;CAS/C"}
|
package/lib/document.js
CHANGED
|
@@ -1,41 +1,15 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
/*
|
|
3
2
|
* Copyright (C) 2017, 2018 TypeFox and others.
|
|
4
3
|
*
|
|
5
4
|
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License.
|
|
6
5
|
* You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
|
|
7
6
|
*/
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
12
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
13
|
-
}
|
|
14
|
-
Object.defineProperty(o, k2, desc);
|
|
15
|
-
}) : (function(o, m, k, k2) {
|
|
16
|
-
if (k2 === undefined) k2 = k;
|
|
17
|
-
o[k2] = m[k];
|
|
18
|
-
}));
|
|
19
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
20
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
21
|
-
}) : function(o, v) {
|
|
22
|
-
o["default"] = v;
|
|
23
|
-
});
|
|
24
|
-
var __importStar = (this && this.__importStar) || function (mod) {
|
|
25
|
-
if (mod && mod.__esModule) return mod;
|
|
26
|
-
var result = {};
|
|
27
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
28
|
-
__setModuleDefault(result, mod);
|
|
29
|
-
return result;
|
|
30
|
-
};
|
|
31
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
32
|
-
exports.LspDocuments = exports.LspDocument = void 0;
|
|
33
|
-
const lsp = __importStar(require("vscode-languageserver/node"));
|
|
34
|
-
const vscode_languageserver_textdocument_1 = require("vscode-languageserver-textdocument");
|
|
35
|
-
class LspDocument {
|
|
7
|
+
import * as lsp from 'vscode-languageserver';
|
|
8
|
+
import { TextDocument } from 'vscode-languageserver-textdocument';
|
|
9
|
+
export class LspDocument {
|
|
36
10
|
constructor(doc) {
|
|
37
11
|
const { uri, languageId, version, text } = doc;
|
|
38
|
-
this.document =
|
|
12
|
+
this.document = TextDocument.create(uri, languageId, version, text);
|
|
39
13
|
}
|
|
40
14
|
get uri() {
|
|
41
15
|
return this.document.uri;
|
|
@@ -86,11 +60,10 @@ class LspDocument {
|
|
|
86
60
|
const end = this.offsetAt(change.range.end);
|
|
87
61
|
newContent = content.substr(0, start) + change.text + content.substr(end);
|
|
88
62
|
}
|
|
89
|
-
this.document =
|
|
63
|
+
this.document = TextDocument.create(this.uri, this.languageId, version, newContent);
|
|
90
64
|
}
|
|
91
65
|
}
|
|
92
|
-
|
|
93
|
-
class LspDocuments {
|
|
66
|
+
export class LspDocuments {
|
|
94
67
|
constructor() {
|
|
95
68
|
this._files = [];
|
|
96
69
|
this.documents = new Map();
|
|
@@ -130,5 +103,4 @@ class LspDocuments {
|
|
|
130
103
|
return document;
|
|
131
104
|
}
|
|
132
105
|
}
|
|
133
|
-
exports.LspDocuments = LspDocuments;
|
|
134
106
|
//# sourceMappingURL=document.js.map
|
package/lib/document.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"document.js","sourceRoot":"","sources":["../src/document.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"document.js","sourceRoot":"","sources":["../src/document.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import * as lsp from 'vscode-languageserver
|
|
2
|
-
import { LspDocuments } from '../document';
|
|
3
|
-
import { TspClient } from '../tsp-client';
|
|
4
|
-
import { CodeActionKind } from '../utils/types';
|
|
1
|
+
import * as lsp from 'vscode-languageserver';
|
|
2
|
+
import { LspDocuments } from '../document.js';
|
|
3
|
+
import { TspClient } from '../tsp-client.js';
|
|
4
|
+
import { CodeActionKind } from '../utils/types.js';
|
|
5
5
|
export declare class TypeScriptAutoFixProvider {
|
|
6
6
|
private readonly client;
|
|
7
7
|
private static kindProviders;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fix-all.d.ts","sourceRoot":"","sources":["../../src/features/fix-all.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,GAAG,MAAM,
|
|
1
|
+
{"version":3,"file":"fix-all.d.ts","sourceRoot":"","sources":["../../src/features/fix-all.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,GAAG,MAAM,uBAAuB,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAI7C,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AA6KnD,qBAAa,yBAAyB;IAWtB,OAAO,CAAC,QAAQ,CAAC,MAAM;IAVnC,OAAO,CAAC,MAAM,CAAC,aAAa,CAI1B;IAEF,WAAkB,KAAK,IAAI,cAAc,EAAE,CAE1C;gBAE4B,MAAM,EAAE,SAAS;IAEjC,kBAAkB,CAAC,KAAK,EAAE,cAAc,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,CAAC,UAAU,EAAE,EAAE,SAAS,EAAE,YAAY,GAAG,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC;CAS5J"}
|
package/lib/features/fix-all.js
CHANGED
|
@@ -1,31 +1,7 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
/*---------------------------------------------------------------------------------------------
|
|
3
2
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
4
3
|
* Licensed under the MIT License. See License.txt in the project root for license information.
|
|
5
4
|
*--------------------------------------------------------------------------------------------*/
|
|
6
|
-
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
7
|
-
if (k2 === undefined) k2 = k;
|
|
8
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
9
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
10
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
11
|
-
}
|
|
12
|
-
Object.defineProperty(o, k2, desc);
|
|
13
|
-
}) : (function(o, m, k, k2) {
|
|
14
|
-
if (k2 === undefined) k2 = k;
|
|
15
|
-
o[k2] = m[k];
|
|
16
|
-
}));
|
|
17
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
18
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
19
|
-
}) : function(o, v) {
|
|
20
|
-
o["default"] = v;
|
|
21
|
-
});
|
|
22
|
-
var __importStar = (this && this.__importStar) || function (mod) {
|
|
23
|
-
if (mod && mod.__esModule) return mod;
|
|
24
|
-
var result = {};
|
|
25
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
26
|
-
__setModuleDefault(result, mod);
|
|
27
|
-
return result;
|
|
28
|
-
};
|
|
29
5
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
30
6
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
31
7
|
return new (P || (P = Promise))(function (resolve, reject) {
|
|
@@ -35,13 +11,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
35
11
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
36
12
|
});
|
|
37
13
|
};
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
const fixNames = __importStar(require("../utils/fixNames"));
|
|
44
|
-
const types_1 = require("../utils/types");
|
|
14
|
+
import * as lsp from 'vscode-languageserver';
|
|
15
|
+
import { toFileRangeRequestArgs, toTextDocumentEdit } from '../protocol-translation.js';
|
|
16
|
+
import * as errorCodes from '../utils/errorCodes.js';
|
|
17
|
+
import * as fixNames from '../utils/fixNames.js';
|
|
18
|
+
import { CodeActionKind } from '../utils/types.js';
|
|
45
19
|
function buildIndividualFixes(fixes, client, file, documents, diagnostics) {
|
|
46
20
|
var _a;
|
|
47
21
|
return __awaiter(this, void 0, void 0, function* () {
|
|
@@ -51,14 +25,14 @@ function buildIndividualFixes(fixes, client, file, documents, diagnostics) {
|
|
|
51
25
|
if (!codes.has(diagnostic.code)) {
|
|
52
26
|
continue;
|
|
53
27
|
}
|
|
54
|
-
const args = Object.assign(Object.assign({},
|
|
55
|
-
const response = yield client.request("getCodeFixes" /* GetCodeFixes */, args);
|
|
28
|
+
const args = Object.assign(Object.assign({}, toFileRangeRequestArgs(file, diagnostic.range)), { errorCodes: [+diagnostic.code] });
|
|
29
|
+
const response = yield client.request("getCodeFixes" /* CommandTypes.GetCodeFixes */, args);
|
|
56
30
|
if (response.type !== 'response') {
|
|
57
31
|
continue;
|
|
58
32
|
}
|
|
59
33
|
const fix = (_a = response.body) === null || _a === void 0 ? void 0 : _a.find(fix => fix.fixName === fixName);
|
|
60
34
|
if (fix) {
|
|
61
|
-
edits.push(...fix.changes.map(change =>
|
|
35
|
+
edits.push(...fix.changes.map(change => toTextDocumentEdit(change, documents)));
|
|
62
36
|
break;
|
|
63
37
|
}
|
|
64
38
|
}
|
|
@@ -75,8 +49,8 @@ function buildCombinedFix(fixes, client, file, documents, diagnostics) {
|
|
|
75
49
|
if (!codes.has(diagnostic.code)) {
|
|
76
50
|
continue;
|
|
77
51
|
}
|
|
78
|
-
const args = Object.assign(Object.assign({},
|
|
79
|
-
const response = yield client.request("getCodeFixes" /* GetCodeFixes */, args);
|
|
52
|
+
const args = Object.assign(Object.assign({}, toFileRangeRequestArgs(file, diagnostic.range)), { errorCodes: [+diagnostic.code] });
|
|
53
|
+
const response = yield client.request("getCodeFixes" /* CommandTypes.GetCodeFixes */, args);
|
|
80
54
|
if (response.type !== 'response' || !((_a = response.body) === null || _a === void 0 ? void 0 : _a.length)) {
|
|
81
55
|
continue;
|
|
82
56
|
}
|
|
@@ -85,7 +59,7 @@ function buildCombinedFix(fixes, client, file, documents, diagnostics) {
|
|
|
85
59
|
continue;
|
|
86
60
|
}
|
|
87
61
|
if (!fix.fixId) {
|
|
88
|
-
edits.push(...fix.changes.map(change =>
|
|
62
|
+
edits.push(...fix.changes.map(change => toTextDocumentEdit(change, documents)));
|
|
89
63
|
return edits;
|
|
90
64
|
}
|
|
91
65
|
const combinedArgs = {
|
|
@@ -95,11 +69,11 @@ function buildCombinedFix(fixes, client, file, documents, diagnostics) {
|
|
|
95
69
|
},
|
|
96
70
|
fixId: fix.fixId
|
|
97
71
|
};
|
|
98
|
-
const combinedResponse = yield client.request("getCombinedCodeFix" /* GetCombinedCodeFix */, combinedArgs);
|
|
72
|
+
const combinedResponse = yield client.request("getCombinedCodeFix" /* CommandTypes.GetCombinedCodeFix */, combinedArgs);
|
|
99
73
|
if (combinedResponse.type !== 'response' || !combinedResponse.body) {
|
|
100
74
|
return edits;
|
|
101
75
|
}
|
|
102
|
-
edits.push(...combinedResponse.body.changes.map(change =>
|
|
76
|
+
edits.push(...combinedResponse.body.changes.map(change => toTextDocumentEdit(change, documents)));
|
|
103
77
|
return edits;
|
|
104
78
|
}
|
|
105
79
|
}
|
|
@@ -131,7 +105,7 @@ class SourceFixAll extends SourceAction {
|
|
|
131
105
|
});
|
|
132
106
|
}
|
|
133
107
|
}
|
|
134
|
-
SourceFixAll.kind =
|
|
108
|
+
SourceFixAll.kind = CodeActionKind.SourceFixAllTs;
|
|
135
109
|
class SourceRemoveUnused extends SourceAction {
|
|
136
110
|
constructor() {
|
|
137
111
|
super(...arguments);
|
|
@@ -149,7 +123,7 @@ class SourceRemoveUnused extends SourceAction {
|
|
|
149
123
|
});
|
|
150
124
|
}
|
|
151
125
|
}
|
|
152
|
-
SourceRemoveUnused.kind =
|
|
126
|
+
SourceRemoveUnused.kind = CodeActionKind.SourceRemoveUnusedTs;
|
|
153
127
|
class SourceAddMissingImports extends SourceAction {
|
|
154
128
|
constructor() {
|
|
155
129
|
super(...arguments);
|
|
@@ -167,9 +141,9 @@ class SourceAddMissingImports extends SourceAction {
|
|
|
167
141
|
});
|
|
168
142
|
}
|
|
169
143
|
}
|
|
170
|
-
SourceAddMissingImports.kind =
|
|
144
|
+
SourceAddMissingImports.kind = CodeActionKind.SourceAddMissingImportsTs;
|
|
171
145
|
//#endregion
|
|
172
|
-
class TypeScriptAutoFixProvider {
|
|
146
|
+
export class TypeScriptAutoFixProvider {
|
|
173
147
|
constructor(client) {
|
|
174
148
|
this.client = client;
|
|
175
149
|
}
|
|
@@ -188,7 +162,6 @@ class TypeScriptAutoFixProvider {
|
|
|
188
162
|
});
|
|
189
163
|
}
|
|
190
164
|
}
|
|
191
|
-
exports.TypeScriptAutoFixProvider = TypeScriptAutoFixProvider;
|
|
192
165
|
TypeScriptAutoFixProvider.kindProviders = [
|
|
193
166
|
SourceFixAll,
|
|
194
167
|
SourceRemoveUnused,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fix-all.js","sourceRoot":"","sources":["../../src/features/fix-all.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"fix-all.js","sourceRoot":"","sources":["../../src/features/fix-all.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
/*
|
|
3
2
|
* Copyright (C) 2017, 2018 TypeFox and others.
|
|
4
3
|
*
|
|
@@ -14,53 +13,53 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
14
13
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
15
14
|
});
|
|
16
15
|
};
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
21
|
-
const chai_1 = __importDefault(require("chai"));
|
|
22
|
-
const test_utils_1 = require("./test-utils");
|
|
23
|
-
const assert = chai_1.default.assert;
|
|
16
|
+
import chai from 'chai';
|
|
17
|
+
import { uri, createServer, lastPosition, filePath, readContents, positionAfter } from './test-utils.js';
|
|
18
|
+
const assert = chai.assert;
|
|
24
19
|
let server;
|
|
25
20
|
before(() => __awaiter(void 0, void 0, void 0, function* () {
|
|
26
|
-
server = yield
|
|
27
|
-
rootUri:
|
|
21
|
+
server = yield createServer({
|
|
22
|
+
rootUri: uri(),
|
|
28
23
|
publishDiagnostics: () => { }
|
|
29
24
|
});
|
|
30
25
|
}));
|
|
31
26
|
beforeEach(() => {
|
|
32
27
|
server.closeAll();
|
|
33
28
|
});
|
|
29
|
+
after(() => {
|
|
30
|
+
server.closeAll();
|
|
31
|
+
server.shutdown();
|
|
32
|
+
});
|
|
34
33
|
describe('documentHighlight', () => {
|
|
35
34
|
it('simple test', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
36
35
|
const doc = {
|
|
37
|
-
uri:
|
|
36
|
+
uri: uri('module2.ts'),
|
|
38
37
|
languageId: 'typescript',
|
|
39
38
|
version: 1,
|
|
40
|
-
text:
|
|
39
|
+
text: readContents(filePath('module2.ts'))
|
|
41
40
|
};
|
|
42
41
|
server.didOpenTextDocument({
|
|
43
42
|
textDocument: doc
|
|
44
43
|
});
|
|
45
44
|
const result = yield server.documentHighlight({
|
|
46
45
|
textDocument: doc,
|
|
47
|
-
position:
|
|
46
|
+
position: lastPosition(doc, 'doStuff')
|
|
48
47
|
});
|
|
49
48
|
assert.equal(2, result.length, JSON.stringify(result, undefined, 2));
|
|
50
|
-
}))
|
|
49
|
+
}));
|
|
51
50
|
});
|
|
52
51
|
describe('completions', () => {
|
|
53
52
|
it('receives completion that auto-imports from another module', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
54
53
|
const doc = {
|
|
55
|
-
uri:
|
|
54
|
+
uri: uri('completion.ts'),
|
|
56
55
|
languageId: 'typescript',
|
|
57
56
|
version: 1,
|
|
58
|
-
text:
|
|
57
|
+
text: readContents(filePath('completion.ts'))
|
|
59
58
|
};
|
|
60
59
|
server.didOpenTextDocument({ textDocument: doc });
|
|
61
60
|
const proposals = yield server.completion({
|
|
62
61
|
textDocument: doc,
|
|
63
|
-
position:
|
|
62
|
+
position: positionAfter(doc, 'doStuff')
|
|
64
63
|
});
|
|
65
64
|
assert.isNotNull(proposals);
|
|
66
65
|
const completion = proposals.items.find(item => item.label === 'doStuff');
|
|
@@ -69,6 +68,6 @@ describe('completions', () => {
|
|
|
69
68
|
assert.isDefined(resolvedCompletion.additionalTextEdits);
|
|
70
69
|
assert.isUndefined(resolvedCompletion.command);
|
|
71
70
|
server.didCloseTextDocument({ textDocument: doc });
|
|
72
|
-
}))
|
|
71
|
+
}));
|
|
73
72
|
});
|
|
74
73
|
//# sourceMappingURL=file-lsp-server.spec.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-lsp-server.spec.js","sourceRoot":"","sources":["../src/file-lsp-server.spec.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"file-lsp-server.spec.js","sourceRoot":"","sources":["../src/file-lsp-server.spec.ts"],"names":[],"mappings":"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"}
|
package/lib/hover.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import * as lsp from 'vscode-languageserver
|
|
2
|
-
import tsp from 'typescript/lib/protocol';
|
|
1
|
+
import * as lsp from 'vscode-languageserver';
|
|
2
|
+
import type tsp from 'typescript/lib/protocol.d.js';
|
|
3
3
|
export declare function asSignatureHelp(info: tsp.SignatureHelpItems): lsp.SignatureHelp;
|
|
4
4
|
//# sourceMappingURL=hover.d.ts.map
|
package/lib/hover.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hover.d.ts","sourceRoot":"","sources":["../src/hover.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,GAAG,MAAM,
|
|
1
|
+
{"version":3,"file":"hover.d.ts","sourceRoot":"","sources":["../src/hover.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,GAAG,MAAM,uBAAuB,CAAC;AAC7C,OAAO,KAAK,GAAG,MAAM,8BAA8B,CAAC;AAGpD,wBAAgB,eAAe,CAAC,IAAI,EAAE,GAAG,CAAC,kBAAkB,GAAG,GAAG,CAAC,aAAa,CAM/E"}
|
package/lib/hover.js
CHANGED
|
@@ -1,21 +1,17 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
/*
|
|
3
2
|
* Copyright (C) 2017, 2018 TypeFox and others.
|
|
4
3
|
*
|
|
5
4
|
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License.
|
|
6
5
|
* You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
|
|
7
6
|
*/
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
const protocol_translation_1 = require("./protocol-translation");
|
|
11
|
-
function asSignatureHelp(info) {
|
|
7
|
+
import { asDocumentation, asPlainText } from './protocol-translation.js';
|
|
8
|
+
export function asSignatureHelp(info) {
|
|
12
9
|
return {
|
|
13
10
|
activeSignature: info.selectedItemIndex,
|
|
14
11
|
activeParameter: getActiveParameter(info),
|
|
15
12
|
signatures: info.items.map(asSignatureInformation)
|
|
16
13
|
};
|
|
17
14
|
}
|
|
18
|
-
exports.asSignatureHelp = asSignatureHelp;
|
|
19
15
|
function getActiveParameter(info) {
|
|
20
16
|
const activeSignature = info.items[info.selectedItemIndex];
|
|
21
17
|
if (activeSignature && activeSignature.isVariadic) {
|
|
@@ -26,21 +22,21 @@ function getActiveParameter(info) {
|
|
|
26
22
|
function asSignatureInformation(item) {
|
|
27
23
|
const parameters = item.parameters.map(asParameterInformation);
|
|
28
24
|
const signature = {
|
|
29
|
-
label:
|
|
30
|
-
documentation:
|
|
25
|
+
label: asPlainText(item.prefixDisplayParts),
|
|
26
|
+
documentation: asDocumentation({
|
|
31
27
|
documentation: item.documentation,
|
|
32
28
|
tags: item.tags.filter(x => x.name !== 'param')
|
|
33
29
|
}),
|
|
34
30
|
parameters
|
|
35
31
|
};
|
|
36
|
-
signature.label += parameters.map(parameter => parameter.label).join(
|
|
37
|
-
signature.label +=
|
|
32
|
+
signature.label += parameters.map(parameter => parameter.label).join(asPlainText(item.separatorDisplayParts));
|
|
33
|
+
signature.label += asPlainText(item.suffixDisplayParts);
|
|
38
34
|
return signature;
|
|
39
35
|
}
|
|
40
36
|
function asParameterInformation(parameter) {
|
|
41
37
|
return {
|
|
42
|
-
label:
|
|
43
|
-
documentation:
|
|
38
|
+
label: asPlainText(parameter.displayParts),
|
|
39
|
+
documentation: asDocumentation(parameter)
|
|
44
40
|
};
|
|
45
41
|
}
|
|
46
42
|
//# sourceMappingURL=hover.js.map
|
package/lib/hover.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hover.js","sourceRoot":"","sources":["../src/hover.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"hover.js","sourceRoot":"","sources":["../src/hover.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAEzE,MAAM,UAAU,eAAe,CAAC,IAA4B;IACxD,OAAO;QACH,eAAe,EAAE,IAAI,CAAC,iBAAiB;QACvC,eAAe,EAAE,kBAAkB,CAAC,IAAI,CAAC;QACzC,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,sBAAsB,CAAC;KACrD,CAAC;AACN,CAAC;AAED,SAAS,kBAAkB,CAAC,IAA4B;IACpD,MAAM,eAAe,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;IAC3D,IAAI,eAAe,IAAI,eAAe,CAAC,UAAU,EAAE;QAC/C,OAAO,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,aAAa,EAAE,eAAe,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;KAC9E;IACD,OAAO,IAAI,CAAC,aAAa,CAAC;AAC9B,CAAC;AAED,SAAS,sBAAsB,CAAC,IAA2B;IACvD,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC;IAC/D,MAAM,SAAS,GAA6B;QACxC,KAAK,EAAE,WAAW,CAAC,IAAI,CAAC,kBAAkB,CAAC;QAC3C,aAAa,EAAE,eAAe,CAAC;YAC3B,aAAa,EAAE,IAAI,CAAC,aAAa;YACjC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,OAAO,CAAC;SAClD,CAAC;QACF,UAAU;KACb,CAAC;IACF,SAAS,CAAC,KAAK,IAAI,UAAU,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC,CAAC;IAC9G,SAAS,CAAC,KAAK,IAAI,WAAW,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;IACxD,OAAO,SAAS,CAAC;AACrB,CAAC;AAED,SAAS,sBAAsB,CAAC,SAAqC;IACjE,OAAO;QACH,KAAK,EAAE,WAAW,CAAC,SAAS,CAAC,YAAY,CAAC;QAC1C,aAAa,EAAE,eAAe,CAAC,SAAS,CAAC;KAC5C,CAAC;AACN,CAAC"}
|
package/lib/logger.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { LspClient } from './lsp-client';
|
|
2
|
-
import * as lsp from 'vscode-languageserver
|
|
1
|
+
import { LspClient } from './lsp-client.js';
|
|
2
|
+
import * as lsp from 'vscode-languageserver';
|
|
3
3
|
/**
|
|
4
4
|
* the logger type
|
|
5
5
|
*/
|
|
@@ -19,9 +19,17 @@ export declare class LspClientLogger implements Logger {
|
|
|
19
19
|
info(...arg: any[]): void;
|
|
20
20
|
log(...arg: any[]): void;
|
|
21
21
|
}
|
|
22
|
+
export declare enum ConsoleLogLevel {
|
|
23
|
+
error = "error",
|
|
24
|
+
warn = "warn",
|
|
25
|
+
info = "warn",
|
|
26
|
+
verbose = "verbose"
|
|
27
|
+
}
|
|
22
28
|
export declare class ConsoleLogger implements Logger {
|
|
23
|
-
private
|
|
24
|
-
constructor(
|
|
29
|
+
private level;
|
|
30
|
+
constructor(level?: lsp.MessageType);
|
|
31
|
+
static toMessageTypeLevel(type?: string): lsp.MessageType;
|
|
32
|
+
private print;
|
|
25
33
|
private toStrings;
|
|
26
34
|
error(...arg: any[]): void;
|
|
27
35
|
warn(...arg: any[]): void;
|
package/lib/logger.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,SAAS,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,KAAK,GAAG,MAAM,uBAAuB,CAAC;AAE7C;;GAEG;AACH,MAAM,WAAW,MAAM;IACnB,KAAK,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;IAC3B,IAAI,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;IAC1B,IAAI,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;IAC1B,GAAG,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;CAC5B;AAED,qBAAa,eAAgB,YAAW,MAAM;IAC9B,SAAS,CAAC,MAAM,EAAE,SAAS;IAAE,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,WAAW;gBAAnD,MAAM,EAAE,SAAS,EAAY,KAAK,EAAE,GAAG,CAAC,WAAW;IAEzE,SAAS,CAAC,WAAW,CAAC,QAAQ,EAAE,GAAG,CAAC,WAAW,EAAE,cAAc,EAAE,GAAG,EAAE,GAAG,IAAI;IAiB7E,KAAK,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI;IAI1B,IAAI,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI;IAIzB,IAAI,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI;IAIzB,GAAG,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI;CAG3B;AAED,oBAAY,eAAe;IACvB,KAAK,UAAU;IACf,IAAI,SAAS;IACb,IAAI,SAAS;IACb,OAAO,YAAY;CACtB;AAED,qBAAa,aAAc,YAAW,MAAM;IAC5B,OAAO,CAAC,KAAK;gBAAL,KAAK,GAAE,GAAG,CAAC,WAAkC;IAEjE,MAAM,CAAC,kBAAkB,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,GAAG,CAAC,WAAW;IAczD,OAAO,CAAC,KAAK;IAOb,OAAO,CAAC,SAAS;IAIjB,KAAK,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI;IAG1B,IAAI,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI;IAGzB,IAAI,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI;IAGzB,GAAG,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI;CAG3B;AAED,qBAAa,eAAgB,YAAW,MAAM;IAC9B,OAAO,CAAC,MAAM;IAAU,OAAO,CAAC,MAAM;gBAA9B,MAAM,EAAE,MAAM,EAAU,MAAM,EAAE,MAAM;IAE1D,KAAK,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI;IAI1B,IAAI,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI;IAIzB,IAAI,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI;IAIzB,GAAG,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI;CAG3B"}
|
package/lib/logger.js
CHANGED
|
@@ -1,37 +1,11 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
/*
|
|
3
2
|
* Copyright (C) 2017, 2018 TypeFox and others.
|
|
4
3
|
*
|
|
5
4
|
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License.
|
|
6
5
|
* You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
|
|
7
6
|
*/
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
11
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
12
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
13
|
-
}
|
|
14
|
-
Object.defineProperty(o, k2, desc);
|
|
15
|
-
}) : (function(o, m, k, k2) {
|
|
16
|
-
if (k2 === undefined) k2 = k;
|
|
17
|
-
o[k2] = m[k];
|
|
18
|
-
}));
|
|
19
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
20
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
21
|
-
}) : function(o, v) {
|
|
22
|
-
o["default"] = v;
|
|
23
|
-
});
|
|
24
|
-
var __importStar = (this && this.__importStar) || function (mod) {
|
|
25
|
-
if (mod && mod.__esModule) return mod;
|
|
26
|
-
var result = {};
|
|
27
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
28
|
-
__setModuleDefault(result, mod);
|
|
29
|
-
return result;
|
|
30
|
-
};
|
|
31
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
32
|
-
exports.PrefixingLogger = exports.ConsoleLogger = exports.LspClientLogger = void 0;
|
|
33
|
-
const lsp = __importStar(require("vscode-languageserver/node"));
|
|
34
|
-
class LspClientLogger {
|
|
7
|
+
import * as lsp from 'vscode-languageserver';
|
|
8
|
+
export class LspClientLogger {
|
|
35
9
|
constructor(client, level) {
|
|
36
10
|
this.client = client;
|
|
37
11
|
this.level = level;
|
|
@@ -65,33 +39,53 @@ class LspClientLogger {
|
|
|
65
39
|
this.sendMessage(lsp.MessageType.Log, arg);
|
|
66
40
|
}
|
|
67
41
|
}
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
42
|
+
export var ConsoleLogLevel;
|
|
43
|
+
(function (ConsoleLogLevel) {
|
|
44
|
+
ConsoleLogLevel["error"] = "error";
|
|
45
|
+
ConsoleLogLevel["warn"] = "warn";
|
|
46
|
+
ConsoleLogLevel["info"] = "warn";
|
|
47
|
+
ConsoleLogLevel["verbose"] = "verbose";
|
|
48
|
+
})(ConsoleLogLevel = ConsoleLogLevel || (ConsoleLogLevel = {}));
|
|
49
|
+
export class ConsoleLogger {
|
|
50
|
+
constructor(level = lsp.MessageType.Info) {
|
|
51
|
+
this.level = level;
|
|
52
|
+
}
|
|
53
|
+
static toMessageTypeLevel(type) {
|
|
54
|
+
switch (type) {
|
|
55
|
+
case 'error':
|
|
56
|
+
return lsp.MessageType.Error;
|
|
57
|
+
case 'warn':
|
|
58
|
+
return lsp.MessageType.Warning;
|
|
59
|
+
case 'log':
|
|
60
|
+
return lsp.MessageType.Log;
|
|
61
|
+
case 'info':
|
|
62
|
+
default:
|
|
63
|
+
return lsp.MessageType.Info;
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
print(type, level, ...arg) {
|
|
67
|
+
if (this.level >= level) {
|
|
68
|
+
// eslint-disable-next-line no-console
|
|
69
|
+
console[type](...this.toStrings(arg));
|
|
70
|
+
}
|
|
72
71
|
}
|
|
73
72
|
toStrings(...arg) {
|
|
74
73
|
return arg.map(a => JSON.stringify(a, null, 2));
|
|
75
74
|
}
|
|
76
75
|
error(...arg) {
|
|
77
|
-
|
|
76
|
+
this.print('error', lsp.MessageType.Error, arg);
|
|
78
77
|
}
|
|
79
78
|
warn(...arg) {
|
|
80
|
-
|
|
79
|
+
this.print('error', lsp.MessageType.Warning, arg);
|
|
81
80
|
}
|
|
82
81
|
info(...arg) {
|
|
83
|
-
|
|
84
|
-
console.info(...this.toStrings(arg));
|
|
82
|
+
this.print('error', lsp.MessageType.Info, arg);
|
|
85
83
|
}
|
|
86
84
|
log(...arg) {
|
|
87
|
-
|
|
88
|
-
// eslint-disable-next-line no-console
|
|
89
|
-
console.log(...this.toStrings(arg));
|
|
90
|
-
}
|
|
85
|
+
this.print('error', lsp.MessageType.Log, arg);
|
|
91
86
|
}
|
|
92
87
|
}
|
|
93
|
-
|
|
94
|
-
class PrefixingLogger {
|
|
88
|
+
export class PrefixingLogger {
|
|
95
89
|
constructor(logger, prefix) {
|
|
96
90
|
this.logger = logger;
|
|
97
91
|
this.prefix = prefix;
|
|
@@ -109,5 +103,4 @@ class PrefixingLogger {
|
|
|
109
103
|
this.logger.log(this.prefix, ...arg);
|
|
110
104
|
}
|
|
111
105
|
}
|
|
112
|
-
exports.PrefixingLogger = PrefixingLogger;
|
|
113
106
|
//# sourceMappingURL=logger.js.map
|