typescript-language-server 0.7.1 → 0.8.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 +24 -0
- package/README.md +13 -1
- package/lib/cli.js +1 -2
- package/lib/cli.js.map +1 -1
- package/lib/completion.d.ts +4 -1
- package/lib/completion.d.ts.map +1 -1
- package/lib/completion.js +142 -10
- package/lib/completion.js.map +1 -1
- package/lib/diagnostic-queue.d.ts +3 -0
- package/lib/diagnostic-queue.d.ts.map +1 -1
- package/lib/diagnostic-queue.js +14 -3
- package/lib/diagnostic-queue.js.map +1 -1
- package/lib/logger.d.ts.map +1 -1
- package/lib/logger.js +1 -0
- package/lib/logger.js.map +1 -1
- package/lib/lsp-connection.d.ts.map +1 -1
- package/lib/lsp-connection.js +2 -0
- package/lib/lsp-connection.js.map +1 -1
- package/lib/lsp-server.d.ts +6 -12
- package/lib/lsp-server.d.ts.map +1 -1
- package/lib/lsp-server.js +140 -71
- package/lib/lsp-server.js.map +1 -1
- package/lib/lsp-server.spec.js +93 -2
- package/lib/lsp-server.spec.js.map +1 -1
- package/lib/protocol-translation.js +6 -9
- package/lib/protocol-translation.js.map +1 -1
- package/lib/semantic-tokens.d.ts +9 -0
- package/lib/semantic-tokens.d.ts.map +1 -0
- package/lib/semantic-tokens.js +47 -0
- package/lib/semantic-tokens.js.map +1 -0
- package/lib/test-utils.d.ts.map +1 -1
- package/lib/test-utils.js +4 -2
- package/lib/test-utils.js.map +1 -1
- package/lib/ts-protocol.d.ts +18 -0
- package/lib/ts-protocol.d.ts.map +1 -1
- package/lib/ts-protocol.js +10 -1
- package/lib/ts-protocol.js.map +1 -1
- package/lib/tsp-client.d.ts +6 -1
- package/lib/tsp-client.d.ts.map +1 -1
- package/lib/tsp-client.js +20 -13
- package/lib/tsp-client.js.map +1 -1
- package/lib/tsp-client.spec.js +74 -82
- package/lib/tsp-client.spec.js.map +1 -1
- package/lib/tsp-command-types.d.ts +2 -1
- package/lib/tsp-command-types.d.ts.map +1 -1
- package/lib/tsp-command-types.js.map +1 -1
- package/lib/utils/SnippetString.d.ts +12 -0
- package/lib/utils/SnippetString.d.ts.map +1 -0
- package/lib/utils/SnippetString.js +69 -0
- package/lib/utils/SnippetString.js.map +1 -0
- package/lib/utils/configuration.d.ts +10 -0
- package/lib/utils/configuration.d.ts.map +1 -0
- package/lib/utils/configuration.js +3 -0
- package/lib/utils/configuration.js.map +1 -0
- package/lib/utils/typeConverters.d.ts +11 -0
- package/lib/utils/typeConverters.d.ts.map +1 -0
- package/lib/utils/typeConverters.js +22 -0
- package/lib/utils/typeConverters.js.map +1 -0
- package/lib/utils/versionProvider.d.ts +29 -0
- package/lib/utils/versionProvider.d.ts.map +1 -0
- package/lib/utils/versionProvider.js +148 -0
- package/lib/utils/versionProvider.js.map +1 -0
- package/lib/utils.d.ts +0 -1
- package/lib/utils.d.ts.map +1 -1
- package/lib/utils.js +1 -8
- package/lib/utils.js.map +1 -1
- package/package.json +30 -17
- package/lib/modules-resolver.d.ts +0 -3
- package/lib/modules-resolver.d.ts.map +0 -1
- package/lib/modules-resolver.js +0 -54
- package/lib/modules-resolver.js.map +0 -1
- package/lib/modules-resolver.spec.d.ts +0 -2
- package/lib/modules-resolver.spec.d.ts.map +0 -1
- package/lib/modules-resolver.spec.js +0 -37
- package/lib/modules-resolver.spec.js.map +0 -1
package/lib/tsp-client.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tsp-client.js","sourceRoot":"","sources":["../src/tsp-client.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,uCAAyB;AACzB,
|
|
1
|
+
{"version":3,"file":"tsp-client.js","sourceRoot":"","sources":["../src/tsp-client.ts"],"names":[],"mappings":"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"}
|
package/lib/tsp-client.spec.js
CHANGED
|
@@ -35,93 +35,85 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
35
35
|
};
|
|
36
36
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
37
37
|
const chai = __importStar(require("chai"));
|
|
38
|
-
const path = __importStar(require("path"));
|
|
39
38
|
const tsp_client_1 = require("./tsp-client");
|
|
40
39
|
const logger_1 = require("./logger");
|
|
41
40
|
const test_utils_1 = require("./test-utils");
|
|
42
|
-
const
|
|
43
|
-
const utils_1 = require("./utils");
|
|
41
|
+
const versionProvider_1 = require("./utils/versionProvider");
|
|
44
42
|
const assert = chai.assert;
|
|
45
|
-
const
|
|
43
|
+
const typescriptVersionProvider = new versionProvider_1.TypeScriptVersionProvider();
|
|
44
|
+
const bundled = typescriptVersionProvider.bundledVersion();
|
|
45
|
+
const server = new tsp_client_1.TspClient({
|
|
46
46
|
logger: new logger_1.ConsoleLogger(),
|
|
47
|
-
tsserverPath:
|
|
47
|
+
tsserverPath: bundled.tsServerPath
|
|
48
48
|
});
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
logger: new logger_1.ConsoleLogger(),
|
|
53
|
-
tsserverPath: bundled
|
|
54
|
-
});
|
|
55
|
-
for (const [serverName, server] of Object.entries({ executableServer, moduleServer })) {
|
|
56
|
-
describe('ts server client using ' + serverName, () => {
|
|
57
|
-
before(() => {
|
|
58
|
-
server.start();
|
|
59
|
-
});
|
|
60
|
-
it('completion', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
61
|
-
const f = (0, test_utils_1.filePath)('module2.ts');
|
|
62
|
-
server.notify("open" /* Open */, {
|
|
63
|
-
file: f,
|
|
64
|
-
fileContent: (0, test_utils_1.readContents)(f)
|
|
65
|
-
});
|
|
66
|
-
const completions = yield server.request("completionInfo" /* CompletionInfo */, {
|
|
67
|
-
file: f,
|
|
68
|
-
line: 1,
|
|
69
|
-
offset: 0,
|
|
70
|
-
prefix: 'im'
|
|
71
|
-
});
|
|
72
|
-
assert.isDefined(completions.body);
|
|
73
|
-
assert.equal(completions.body.entries[1].name, 'ImageBitmap');
|
|
74
|
-
})).timeout(10000);
|
|
75
|
-
it('references', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
76
|
-
const f = (0, test_utils_1.filePath)('module2.ts');
|
|
77
|
-
server.notify("open" /* Open */, {
|
|
78
|
-
file: f,
|
|
79
|
-
fileContent: (0, test_utils_1.readContents)(f)
|
|
80
|
-
});
|
|
81
|
-
const references = yield server.request("references" /* References */, {
|
|
82
|
-
file: f,
|
|
83
|
-
line: 8,
|
|
84
|
-
offset: 16
|
|
85
|
-
});
|
|
86
|
-
assert.isDefined(references.body);
|
|
87
|
-
assert.equal(references.body.symbolName, 'doStuff');
|
|
88
|
-
})).timeout(10000);
|
|
89
|
-
it('inlayHints', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
90
|
-
const f = (0, test_utils_1.filePath)('module2.ts');
|
|
91
|
-
server.notify("open" /* Open */, {
|
|
92
|
-
file: f,
|
|
93
|
-
fileContent: (0, test_utils_1.readContents)(f)
|
|
94
|
-
});
|
|
95
|
-
yield server.request("configure" /* Configure */, {
|
|
96
|
-
preferences: {
|
|
97
|
-
// @ts-expect-error preference exist
|
|
98
|
-
includeInlayFunctionLikeReturnTypeHints: true
|
|
99
|
-
}
|
|
100
|
-
});
|
|
101
|
-
const inlayHints = yield server.request("provideInlayHints" /* ProvideInlayHints */, {
|
|
102
|
-
file: f,
|
|
103
|
-
start: 0,
|
|
104
|
-
length: 1000
|
|
105
|
-
});
|
|
106
|
-
assert.isDefined(inlayHints.body);
|
|
107
|
-
assert.equal(inlayHints.body[0].text, ': boolean');
|
|
108
|
-
})).timeout(10000);
|
|
109
|
-
it('documentHighlight', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
110
|
-
const f = (0, test_utils_1.filePath)('module2.ts');
|
|
111
|
-
server.notify("open" /* Open */, {
|
|
112
|
-
file: f,
|
|
113
|
-
fileContent: (0, test_utils_1.readContents)(f)
|
|
114
|
-
});
|
|
115
|
-
const response = yield server.request("documentHighlights" /* DocumentHighlights */, {
|
|
116
|
-
file: f,
|
|
117
|
-
line: 8,
|
|
118
|
-
offset: 16,
|
|
119
|
-
filesToSearch: [f]
|
|
120
|
-
});
|
|
121
|
-
assert.isDefined(response.body);
|
|
122
|
-
assert.isTrue(response.body.some(({ file }) => file.endsWith('module2.ts')), JSON.stringify(response.body, undefined, 2));
|
|
123
|
-
assert.isFalse(response.body.some(({ file: file_1 }) => file_1.endsWith('module1.ts')), JSON.stringify(response.body, undefined, 2));
|
|
124
|
-
})).timeout(10000);
|
|
49
|
+
describe('ts server client', () => {
|
|
50
|
+
before(() => {
|
|
51
|
+
server.start();
|
|
125
52
|
});
|
|
126
|
-
|
|
53
|
+
it('completion', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
54
|
+
const f = (0, test_utils_1.filePath)('module2.ts');
|
|
55
|
+
server.notify("open" /* Open */, {
|
|
56
|
+
file: f,
|
|
57
|
+
fileContent: (0, test_utils_1.readContents)(f)
|
|
58
|
+
});
|
|
59
|
+
const completions = yield server.request("completionInfo" /* CompletionInfo */, {
|
|
60
|
+
file: f,
|
|
61
|
+
line: 1,
|
|
62
|
+
offset: 0,
|
|
63
|
+
prefix: 'im'
|
|
64
|
+
});
|
|
65
|
+
assert.isDefined(completions.body);
|
|
66
|
+
assert.equal(completions.body.entries[1].name, 'ImageBitmap');
|
|
67
|
+
})).timeout(10000);
|
|
68
|
+
it('references', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
69
|
+
const f = (0, test_utils_1.filePath)('module2.ts');
|
|
70
|
+
server.notify("open" /* Open */, {
|
|
71
|
+
file: f,
|
|
72
|
+
fileContent: (0, test_utils_1.readContents)(f)
|
|
73
|
+
});
|
|
74
|
+
const references = yield server.request("references" /* References */, {
|
|
75
|
+
file: f,
|
|
76
|
+
line: 8,
|
|
77
|
+
offset: 16
|
|
78
|
+
});
|
|
79
|
+
assert.isDefined(references.body);
|
|
80
|
+
assert.equal(references.body.symbolName, 'doStuff');
|
|
81
|
+
})).timeout(10000);
|
|
82
|
+
it('inlayHints', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
83
|
+
const f = (0, test_utils_1.filePath)('module2.ts');
|
|
84
|
+
server.notify("open" /* Open */, {
|
|
85
|
+
file: f,
|
|
86
|
+
fileContent: (0, test_utils_1.readContents)(f)
|
|
87
|
+
});
|
|
88
|
+
yield server.request("configure" /* Configure */, {
|
|
89
|
+
preferences: {
|
|
90
|
+
// @ts-expect-error preference exist
|
|
91
|
+
includeInlayFunctionLikeReturnTypeHints: true
|
|
92
|
+
}
|
|
93
|
+
});
|
|
94
|
+
const inlayHints = yield server.request("provideInlayHints" /* ProvideInlayHints */, {
|
|
95
|
+
file: f,
|
|
96
|
+
start: 0,
|
|
97
|
+
length: 1000
|
|
98
|
+
});
|
|
99
|
+
assert.isDefined(inlayHints.body);
|
|
100
|
+
assert.equal(inlayHints.body[0].text, ': boolean');
|
|
101
|
+
})).timeout(10000);
|
|
102
|
+
it('documentHighlight', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
103
|
+
const f = (0, test_utils_1.filePath)('module2.ts');
|
|
104
|
+
server.notify("open" /* Open */, {
|
|
105
|
+
file: f,
|
|
106
|
+
fileContent: (0, test_utils_1.readContents)(f)
|
|
107
|
+
});
|
|
108
|
+
const response = yield server.request("documentHighlights" /* DocumentHighlights */, {
|
|
109
|
+
file: f,
|
|
110
|
+
line: 8,
|
|
111
|
+
offset: 16,
|
|
112
|
+
filesToSearch: [f]
|
|
113
|
+
});
|
|
114
|
+
assert.isDefined(response.body);
|
|
115
|
+
assert.isTrue(response.body.some(({ file }) => file.endsWith('module2.ts')), JSON.stringify(response.body, undefined, 2));
|
|
116
|
+
assert.isFalse(response.body.some(({ file: file_1 }) => file_1.endsWith('module1.ts')), JSON.stringify(response.body, undefined, 2));
|
|
117
|
+
})).timeout(10000);
|
|
118
|
+
});
|
|
127
119
|
//# sourceMappingURL=tsp-client.spec.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tsp-client.spec.js","sourceRoot":"","sources":["../src/tsp-client.spec.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,2CAA6B;AAC7B,
|
|
1
|
+
{"version":3,"file":"tsp-client.spec.js","sourceRoot":"","sources":["../src/tsp-client.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -84,7 +84,8 @@ export declare const enum CommandTypes {
|
|
|
84
84
|
PrepareCallHierarchy = "prepareCallHierarchy",
|
|
85
85
|
ProvideCallHierarchyIncomingCalls = "provideCallHierarchyIncomingCalls",
|
|
86
86
|
ProvideCallHierarchyOutgoingCalls = "provideCallHierarchyOutgoingCalls",
|
|
87
|
-
ProvideInlayHints = "provideInlayHints"
|
|
87
|
+
ProvideInlayHints = "provideInlayHints",
|
|
88
|
+
EncodedSemanticClassificationsFull = "encodedSemanticClassifications-full"
|
|
88
89
|
}
|
|
89
90
|
export declare const enum EventTypes {
|
|
90
91
|
ConfigFileDiag = "configFileDiag",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tsp-command-types.d.ts","sourceRoot":"","sources":["../src/tsp-command-types.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH;;;;;;;;;;;;;gFAagF;AAEhF,0BAAkB,YAAY;IAC1B,aAAa,kBAAkB;IAC/B,KAAK,UAAU;IACf,eAAe,oBAAoB;IACnC,yBAAyB,8BAA8B;IACvD,MAAM,WAAW;IACjB,KAAK,UAAU;IACf,cAAc,mBAAmB;IACjC,iBAAiB,2BAA2B;IAC5C,6BAA6B,kCAAkC;IAC/D,qBAAqB,0BAA0B;IAC/C,SAAS,cAAc;IACvB,UAAU,eAAe;IACzB,sBAAsB,2BAA2B;IACjD,cAAc,mBAAmB;IACjC,IAAI,SAAS;IACb,cAAc,mBAAmB;IACjC,MAAM,WAAW;IACjB,WAAW,gBAAgB;IAC3B,MAAM,WAAW;IACjB,gBAAgB,qBAAqB;IACrC,uBAAuB,4BAA4B;IACnD,wBAAwB,6BAA6B;IACrD,yBAAyB,8BAA8B;IACvD,MAAM,WAAW;IACjB,KAAK,UAAU;IACf,OAAO,YAAY;IACnB,WAAW,iBAAiB;IAC5B,kBAAkB;IAClB,WAAW,gBAAgB;IAC3B,kBAAkB,uBAAuB;IACzC,IAAI,SAAS;IACb,SAAS,cAAc;IACvB,UAAU,eAAe;IACzB,MAAM,WAAW;IACjB,MAAM,WAAW;IACjB,MAAM,WAAW;IACjB,aAAa,kBAAkB;IAC/B,MAAM,WAAW;IACjB,cAAc,mBAAmB;IACjC,WAAW,gBAAgB;IAC3B,cAAc,mBAAmB;IACjC,OAAO,YAAY;IACnB,mBAAmB,wBAAwB;IAC3C,oBAAoB,yBAAyB;IAC7C,oBAAoB,yBAAyB;IAC7C,UAAU,eAAe;IACzB,iBAAiB,sBAAsB;IACvC,YAAY,iBAAiB;IAC7B,WAAW,gBAAgB;IAC3B,kBAAkB,uBAAuB;IACzC,kCAAkC,uCAAuC;IACzE,YAAY,iBAAiB;IAC7B,kBAAkB,uBAAuB;IACzC,sBAAsB,2BAA2B;IACjD,qBAAqB,0BAA0B;IAC/C,sBAAsB,2BAA2B;IACjD,mBAAmB,wBAAwB;IAC3C,eAAe,oBAAoB;IACnC,qBAAqB,0BAA0B;IAC/C,eAAe,oBAAoB;IACnC,cAAc,mBAAmB;IACjC,iBAAiB,sBAAsB;IACvC,sBAAsB,2BAA2B;IACjD,gBAAgB,qBAAqB;IACrC,kBAAkB,uBAAuB;IACzC,oBAAoB,yBAAyB;IAC7C,iCAAiC,sCAAsC;IACvE,iCAAiC,sCAAsC;IACvE,iBAAiB,sBAAsB;
|
|
1
|
+
{"version":3,"file":"tsp-command-types.d.ts","sourceRoot":"","sources":["../src/tsp-command-types.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tsp-command-types.js","sourceRoot":"","sources":["../src/tsp-command-types.ts"],"names":[],"mappings":";AAAA;;GAEG;;;
|
|
1
|
+
{"version":3,"file":"tsp-command-types.js","sourceRoot":"","sources":["../src/tsp-command-types.ts"],"names":[],"mappings":";AAAA;;GAEG;;;AAmGH,IAAY,iBA0EX;AA1ED,WAAY,iBAAiB;IACzB,iCAAY,CAAA;IACZ,wCAAmB,CAAA;IACnB,gDAAgD;IAChD,wCAAmB,CAAA;IACnB,4BAA4B;IAC5B,6CAAwB,CAAA;IACxB,oBAAoB;IACpB,6CAAwB,CAAA;IACxB,iBAAiB;IACjB,2CAAsB,CAAA;IACtB,yBAAyB;IACzB,sDAAiC,CAAA;IACjC,qBAAqB;IACrB,mDAA8B,CAAA;IAC9B,mBAAmB;IACnB,yCAAoB,CAAA;IACpB,aAAa;IACb,yCAAoB,CAAA;IACpB,sDAAiC,CAAA;IACjC;;;OAGG;IACH,4CAAuB,CAAA;IACvB,sBAAsB;IACtB,uDAAkC,CAAA;IAClC;;;OAGG;IACH,iDAA4B,CAAA;IAC5B,sBAAsB;IACtB,4DAAuC,CAAA;IACvC,6CAA6C;IAC7C,qDAAgC,CAAA;IAChC,0DAA0D;IAC1D,wDAAmC,CAAA;IACnC,wDAAmC,CAAA;IACnC;;;OAGG;IACH,uDAAkC,CAAA;IAClC,oCAAoC;IACpC,qEAAgD,CAAA;IAChD,iCAAiC;IACjC,kDAA6B,CAAA;IAC7B,iCAAiC;IACjC,oDAA+B,CAAA;IAC/B,+BAA+B;IAC/B,4DAAuC,CAAA;IACvC,gCAAgC;IAChC,mDAA8B,CAAA;IAC9B,4DAAuC,CAAA;IACvC,qDAAgC,CAAA;IAChC,oCAAe,CAAA;IACf,oCAAe,CAAA;IACf,2CAAsB,CAAA;IACtB,uCAAkB,CAAA;IAClB,4CAAuB,CAAA;IACvB,gEAA2C,CAAA;IAC3C;;OAEG;IACH,mDAA8B,CAAA;IAC9B,qBAAqB;IACrB,sCAAiB,CAAA;IACjB,yFAAyF;IACzF,kCAAa,CAAA;IACb,iEAAiE;IACjE,2CAAsB,CAAA;IACtB,uEAAuE;IACvE,2CAAsB,CAAA;AAC1B,CAAC,EA1EW,iBAAiB,GAAjB,yBAAiB,KAAjB,yBAAiB,QA0E5B;AAED,MAAa,aAAa;;AAA1B,sCAoBC;AAnB0B,sBAAQ,GAAG,UAAU,CAAC;AACtB,wBAAU,GAAG,YAAY,CAAC;AAC1B,mBAAK,GAAG,OAAO,CAAC;AAEhB,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"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
export default class SnippetString {
|
|
2
|
+
static isSnippetString(thing: any): thing is SnippetString;
|
|
3
|
+
private static _escape;
|
|
4
|
+
private _tabstop;
|
|
5
|
+
value: string;
|
|
6
|
+
constructor(value?: string);
|
|
7
|
+
appendText(str: string): SnippetString;
|
|
8
|
+
appendTabstop(n?: number): SnippetString;
|
|
9
|
+
appendPlaceholder(value: string | ((snippet: SnippetString) => any), n?: number): SnippetString;
|
|
10
|
+
appendVariable(name: string, defaultValue?: string | ((snippet: SnippetString) => any)): SnippetString;
|
|
11
|
+
}
|
|
12
|
+
//# sourceMappingURL=SnippetString.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"SnippetString.d.ts","sourceRoot":"","sources":["../../src/utils/SnippetString.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,OAAO,OAAO,aAAa;WAChB,eAAe,CAAC,KAAK,EAAE,GAAG,GAAG,KAAK,IAAI,aAAa;IAUjE,OAAO,CAAC,MAAM,CAAC,OAAO;IAItB,OAAO,CAAC,QAAQ,CAAK;IAEd,KAAK,EAAE,MAAM,CAAC;gBAET,KAAK,CAAC,EAAE,MAAM;IAInB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,aAAa;IAKtC,aAAa,CAAC,CAAC,GAAE,MAAwB,GAAG,aAAa;IAMzD,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,CAAC,CAAC,OAAO,EAAE,aAAa,KAAK,GAAG,CAAC,EAAE,CAAC,GAAE,MAAwB,GAAG,aAAa;IAoBhH,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC,OAAO,EAAE,aAAa,KAAK,GAAG,CAAC,GAAG,aAAa;CAoBhH"}
|
|
@@ -0,0 +1,69 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
class SnippetString {
|
|
4
|
+
constructor(value) {
|
|
5
|
+
this._tabstop = 1;
|
|
6
|
+
this.value = value || '';
|
|
7
|
+
}
|
|
8
|
+
static isSnippetString(thing) {
|
|
9
|
+
if (thing instanceof SnippetString) {
|
|
10
|
+
return true;
|
|
11
|
+
}
|
|
12
|
+
if (!thing) {
|
|
13
|
+
return false;
|
|
14
|
+
}
|
|
15
|
+
return typeof thing.value === 'string';
|
|
16
|
+
}
|
|
17
|
+
static _escape(value) {
|
|
18
|
+
return value.replace(/\$|}|\\/g, '\\$&');
|
|
19
|
+
}
|
|
20
|
+
appendText(str) {
|
|
21
|
+
this.value += SnippetString._escape(str);
|
|
22
|
+
return this;
|
|
23
|
+
}
|
|
24
|
+
appendTabstop(n = this._tabstop++) {
|
|
25
|
+
this.value += '$';
|
|
26
|
+
this.value += n;
|
|
27
|
+
return this;
|
|
28
|
+
}
|
|
29
|
+
appendPlaceholder(value, n = this._tabstop++) {
|
|
30
|
+
if (typeof value === 'function') {
|
|
31
|
+
const nested = new SnippetString();
|
|
32
|
+
nested._tabstop = this._tabstop;
|
|
33
|
+
value(nested);
|
|
34
|
+
this._tabstop = nested._tabstop;
|
|
35
|
+
value = nested.value;
|
|
36
|
+
}
|
|
37
|
+
else {
|
|
38
|
+
value = SnippetString._escape(value);
|
|
39
|
+
}
|
|
40
|
+
this.value += '${';
|
|
41
|
+
this.value += n;
|
|
42
|
+
this.value += ':';
|
|
43
|
+
this.value += value;
|
|
44
|
+
this.value += '}';
|
|
45
|
+
return this;
|
|
46
|
+
}
|
|
47
|
+
appendVariable(name, defaultValue) {
|
|
48
|
+
if (typeof defaultValue === 'function') {
|
|
49
|
+
const nested = new SnippetString();
|
|
50
|
+
nested._tabstop = this._tabstop;
|
|
51
|
+
defaultValue(nested);
|
|
52
|
+
this._tabstop = nested._tabstop;
|
|
53
|
+
defaultValue = nested.value;
|
|
54
|
+
}
|
|
55
|
+
else if (typeof defaultValue === 'string') {
|
|
56
|
+
defaultValue = defaultValue.replace(/\$|}/g, '\\$&');
|
|
57
|
+
}
|
|
58
|
+
this.value += '${';
|
|
59
|
+
this.value += name;
|
|
60
|
+
if (defaultValue) {
|
|
61
|
+
this.value += ':';
|
|
62
|
+
this.value += defaultValue;
|
|
63
|
+
}
|
|
64
|
+
this.value += '}';
|
|
65
|
+
return this;
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
exports.default = SnippetString;
|
|
69
|
+
//# sourceMappingURL=SnippetString.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"SnippetString.js","sourceRoot":"","sources":["../../src/utils/SnippetString.ts"],"names":[],"mappings":";;AAAA,MAAqB,aAAa;IAmB9B,YAAY,KAAc;QAJlB,aAAQ,GAAG,CAAC,CAAC;QAKjB,IAAI,CAAC,KAAK,GAAG,KAAK,IAAI,EAAE,CAAC;IAC7B,CAAC;IApBM,MAAM,CAAC,eAAe,CAAC,KAAU;QACpC,IAAI,KAAK,YAAY,aAAa,EAAE;YAChC,OAAO,IAAI,CAAC;SACf;QACD,IAAI,CAAC,KAAK,EAAE;YACR,OAAO,KAAK,CAAC;SAChB;QACD,OAAO,OAAO,KAAK,CAAC,KAAK,KAAK,QAAQ,CAAC;IAC3C,CAAC;IAEO,MAAM,CAAC,OAAO,CAAC,KAAa;QAChC,OAAO,KAAK,CAAC,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;IAC7C,CAAC;IAUM,UAAU,CAAC,GAAW;QACzB,IAAI,CAAC,KAAK,IAAI,aAAa,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACzC,OAAO,IAAI,CAAC;IAChB,CAAC;IAEM,aAAa,CAAC,IAAY,IAAI,CAAC,QAAQ,EAAE;QAC5C,IAAI,CAAC,KAAK,IAAI,GAAG,CAAC;QAClB,IAAI,CAAC,KAAK,IAAI,CAAC,CAAC;QAChB,OAAO,IAAI,CAAC;IAChB,CAAC;IAEM,iBAAiB,CAAC,KAAiD,EAAE,IAAY,IAAI,CAAC,QAAQ,EAAE;QACnG,IAAI,OAAO,KAAK,KAAK,UAAU,EAAE;YAC7B,MAAM,MAAM,GAAG,IAAI,aAAa,EAAE,CAAC;YACnC,MAAM,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;YAChC,KAAK,CAAC,MAAM,CAAC,CAAC;YACd,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC;YAChC,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC;SACxB;aAAM;YACH,KAAK,GAAG,aAAa,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;SACxC;QAED,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC;QACnB,IAAI,CAAC,KAAK,IAAI,CAAC,CAAC;QAChB,IAAI,CAAC,KAAK,IAAI,GAAG,CAAC;QAClB,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC;QACpB,IAAI,CAAC,KAAK,IAAI,GAAG,CAAC;QAElB,OAAO,IAAI,CAAC;IAChB,CAAC;IAEM,cAAc,CAAC,IAAY,EAAE,YAAyD;QACzF,IAAI,OAAO,YAAY,KAAK,UAAU,EAAE;YACpC,MAAM,MAAM,GAAG,IAAI,aAAa,EAAE,CAAC;YACnC,MAAM,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;YAChC,YAAY,CAAC,MAAM,CAAC,CAAC;YACrB,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC;YAChC,YAAY,GAAG,MAAM,CAAC,KAAK,CAAC;SAC/B;aAAM,IAAI,OAAO,YAAY,KAAK,QAAQ,EAAE;YACzC,YAAY,GAAG,YAAY,CAAC,OAAO,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;SACxD;QAED,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC;QACnB,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC;QACnB,IAAI,YAAY,EAAE;YACd,IAAI,CAAC,KAAK,IAAI,GAAG,CAAC;YAClB,IAAI,CAAC,KAAK,IAAI,YAAY,CAAC;SAC9B;QACD,IAAI,CAAC,KAAK,IAAI,GAAG,CAAC;QAClB,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ;AA1ED,gCA0EC"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import { Logger } from '../logger';
|
|
2
|
+
import { LspClient } from '../lsp-client';
|
|
3
|
+
export interface IServerOptions {
|
|
4
|
+
logger: Logger;
|
|
5
|
+
tsserverPath?: string;
|
|
6
|
+
tsserverLogFile?: string;
|
|
7
|
+
tsserverLogVerbosity?: string;
|
|
8
|
+
lspClient: LspClient;
|
|
9
|
+
}
|
|
10
|
+
//# sourceMappingURL=configuration.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"configuration.d.ts","sourceRoot":"","sources":["../../src/utils/configuration.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAE1C,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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"configuration.js","sourceRoot":"","sources":["../../src/utils/configuration.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Helpers for converting FROM LanguageServer types language-server ts types
|
|
3
|
+
*/
|
|
4
|
+
import type * as lsp from 'vscode-languageserver-protocol';
|
|
5
|
+
import type tsp from 'typescript/lib/protocol';
|
|
6
|
+
export declare namespace Position {
|
|
7
|
+
const fromLocation: (tslocation: tsp.Location) => lsp.Position;
|
|
8
|
+
const toLocation: (position: lsp.Position) => tsp.Location;
|
|
9
|
+
const toFileLocationRequestArgs: (file: string, position: lsp.Position) => tsp.FileLocationRequestArgs;
|
|
10
|
+
}
|
|
11
|
+
//# sourceMappingURL=typeConverters.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"typeConverters.d.ts","sourceRoot":"","sources":["../../src/utils/typeConverters.ts"],"names":[],"mappings":"AAIA;;GAEG;AACH,OAAO,KAAK,KAAK,GAAG,MAAM,gCAAgC,CAAC;AAC3D,OAAO,KAAK,GAAG,MAAM,yBAAyB,CAAC;AAE/C,yBAAiB,QAAQ,CAAC;IACf,MAAM,YAAY,eAAgB,IAAI,QAAQ,KAAG,YAKvD,CAAC;IAEK,MAAM,UAAU,aAAc,YAAY,KAAG,IAAI,QAGtD,CAAC;IAEI,MAAM,yBAAyB,SAAU,MAAM,YAAY,YAAY,KAAG,IAAI,uBAInF,CAAC;CACN"}
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.Position = void 0;
|
|
4
|
+
var Position;
|
|
5
|
+
(function (Position) {
|
|
6
|
+
Position.fromLocation = (tslocation) => {
|
|
7
|
+
return {
|
|
8
|
+
line: tslocation.line - 1,
|
|
9
|
+
character: tslocation.offset - 1
|
|
10
|
+
};
|
|
11
|
+
};
|
|
12
|
+
Position.toLocation = (position) => ({
|
|
13
|
+
line: position.line + 1,
|
|
14
|
+
offset: position.character + 1
|
|
15
|
+
});
|
|
16
|
+
Position.toFileLocationRequestArgs = (file, position) => ({
|
|
17
|
+
file,
|
|
18
|
+
line: position.line + 1,
|
|
19
|
+
offset: position.character + 1
|
|
20
|
+
});
|
|
21
|
+
})(Position = exports.Position || (exports.Position = {}));
|
|
22
|
+
//# sourceMappingURL=typeConverters.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"typeConverters.js","sourceRoot":"","sources":["../../src/utils/typeConverters.ts"],"names":[],"mappings":";;;AAUA,IAAiB,QAAQ,CAkBxB;AAlBD,WAAiB,QAAQ;IACR,qBAAY,GAAG,CAAC,UAAwB,EAAgB,EAAE;QACnE,OAAO;YACH,IAAI,EAAE,UAAU,CAAC,IAAI,GAAG,CAAC;YACzB,SAAS,EAAE,UAAU,CAAC,MAAM,GAAG,CAAC;SACnC,CAAC;IACN,CAAC,CAAC;IAEW,mBAAU,GAAG,CAAC,QAAsB,EAAgB,EAAE,CAAC,CAAC;QACjE,IAAI,EAAE,QAAQ,CAAC,IAAI,GAAG,CAAC;QACvB,MAAM,EAAE,QAAQ,CAAC,SAAS,GAAG,CAAC;KACjC,CAAC,CAAC;IAEU,kCAAyB,GAAG,CAAC,IAAY,EAAE,QAAsB,EAA+B,EAAE,CAAC,CAAC;QAC7G,IAAI;QACJ,IAAI,EAAE,QAAQ,CAAC,IAAI,GAAG,CAAC;QACvB,MAAM,EAAE,QAAQ,CAAC,SAAS,GAAG,CAAC;KACjC,CAAC,CAAC;AACP,CAAC,EAlBgB,QAAQ,GAAR,gBAAQ,KAAR,gBAAQ,QAkBxB"}
|
|
@@ -0,0 +1,29 @@
|
|
|
1
|
+
import API from './api';
|
|
2
|
+
import { IServerOptions } from './configuration';
|
|
3
|
+
export declare const enum TypeScriptVersionSource {
|
|
4
|
+
Bundled = "bundled",
|
|
5
|
+
UserSetting = "user-setting",
|
|
6
|
+
Workspace = "workspace"
|
|
7
|
+
}
|
|
8
|
+
export declare class TypeScriptVersion {
|
|
9
|
+
readonly source: TypeScriptVersionSource;
|
|
10
|
+
readonly path: string;
|
|
11
|
+
private readonly _pathLabel?;
|
|
12
|
+
private _api;
|
|
13
|
+
constructor(source: TypeScriptVersionSource, path: string, _pathLabel?: string | undefined);
|
|
14
|
+
get tscPath(): string;
|
|
15
|
+
get tsServerPath(): string;
|
|
16
|
+
get pathLabel(): string;
|
|
17
|
+
get isValid(): boolean;
|
|
18
|
+
get version(): API | null;
|
|
19
|
+
get versionString(): string | null;
|
|
20
|
+
private getTypeScriptVersion;
|
|
21
|
+
}
|
|
22
|
+
export declare class TypeScriptVersionProvider {
|
|
23
|
+
private configuration?;
|
|
24
|
+
constructor(configuration?: IServerOptions | undefined);
|
|
25
|
+
getUserSettingVersion(): TypeScriptVersion | null;
|
|
26
|
+
getWorkspaceVersion(workspaceFolders: string[]): TypeScriptVersion | null;
|
|
27
|
+
bundledVersion(): TypeScriptVersion | null;
|
|
28
|
+
}
|
|
29
|
+
//# sourceMappingURL=versionProvider.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"versionProvider.d.ts","sourceRoot":"","sources":["../../src/utils/versionProvider.ts"],"names":[],"mappings":"AAQA,OAAO,GAAG,MAAM,OAAO,CAAC;AACxB,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEjD,0BAAkB,uBAAuB;IACrC,OAAO,YAAY;IACnB,WAAW,iBAAiB;IAC5B,SAAS,cAAc;CAC1B;AAED,qBAAa,iBAAiB;aAGN,MAAM,EAAE,uBAAuB;aAC/B,IAAI,EAAE,MAAM;IAC5B,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC;IAJhC,OAAO,CAAC,IAAI,CAAyB;gBAEjB,MAAM,EAAE,uBAAuB,EAC/B,IAAI,EAAE,MAAM,EACX,UAAU,CAAC,oBAAQ;IAKxC,IAAW,OAAO,IAAI,MAAM,CAE3B;IAED,IAAW,YAAY,IAAI,MAAM,CAEhC;IAED,IAAW,SAAS,IAAI,MAAM,CAE7B;IAED,IAAW,OAAO,IAAI,OAAO,CAE5B;IAED,IAAW,OAAO,IAAI,GAAG,GAAG,IAAI,CAM/B;IAED,IAAW,aAAa,IAAI,MAAM,GAAG,IAAI,CAGxC;IAED,OAAO,CAAC,oBAAoB;CAkC/B;AAID,qBAAa,yBAAyB;IACf,OAAO,CAAC,aAAa,CAAC;gBAAd,aAAa,CAAC,4BAAgB;IAElD,qBAAqB,IAAI,iBAAiB,GAAG,IAAI;IAsCjD,mBAAmB,CAAC,gBAAgB,EAAE,MAAM,EAAE,GAAG,iBAAiB,GAAG,IAAI;IAezE,cAAc,IAAI,iBAAiB,GAAG,IAAI;CAapD"}
|
|
@@ -0,0 +1,148 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.TypeScriptVersionProvider = exports.TypeScriptVersion = void 0;
|
|
7
|
+
/*---------------------------------------------------------------------------------------------
|
|
8
|
+
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
9
|
+
* Licensed under the MIT License. See License.txt in the project root for license information.
|
|
10
|
+
*--------------------------------------------------------------------------------------------*/
|
|
11
|
+
const fs_1 = __importDefault(require("fs"));
|
|
12
|
+
const path_1 = __importDefault(require("path"));
|
|
13
|
+
const which_1 = __importDefault(require("which"));
|
|
14
|
+
const pkg_up_1 = __importDefault(require("pkg-up"));
|
|
15
|
+
const api_1 = __importDefault(require("./api"));
|
|
16
|
+
class TypeScriptVersion {
|
|
17
|
+
constructor(source, path, _pathLabel) {
|
|
18
|
+
this.source = source;
|
|
19
|
+
this.path = path;
|
|
20
|
+
this._pathLabel = _pathLabel;
|
|
21
|
+
this._api = null;
|
|
22
|
+
}
|
|
23
|
+
get tscPath() {
|
|
24
|
+
return path_1.default.resolve(this.path, '../bin/tsc');
|
|
25
|
+
}
|
|
26
|
+
get tsServerPath() {
|
|
27
|
+
return path_1.default.resolve(this.path, 'tsserver.js');
|
|
28
|
+
}
|
|
29
|
+
get pathLabel() {
|
|
30
|
+
return typeof this._pathLabel === 'undefined' ? this.path : this._pathLabel;
|
|
31
|
+
}
|
|
32
|
+
get isValid() {
|
|
33
|
+
return this.version !== null;
|
|
34
|
+
}
|
|
35
|
+
get version() {
|
|
36
|
+
if (this._api) {
|
|
37
|
+
return this._api;
|
|
38
|
+
}
|
|
39
|
+
this._api = this.getTypeScriptVersion(this.tsServerPath);
|
|
40
|
+
return this._api;
|
|
41
|
+
}
|
|
42
|
+
get versionString() {
|
|
43
|
+
const version = this.version;
|
|
44
|
+
return version ? version.displayName : null;
|
|
45
|
+
}
|
|
46
|
+
getTypeScriptVersion(serverPath) {
|
|
47
|
+
if (!fs_1.default.existsSync(serverPath)) {
|
|
48
|
+
return null;
|
|
49
|
+
}
|
|
50
|
+
const p = serverPath.split(path_1.default.sep);
|
|
51
|
+
if (p.length <= 2) {
|
|
52
|
+
return null;
|
|
53
|
+
}
|
|
54
|
+
const p2 = p.slice(0, -2);
|
|
55
|
+
const modulePath = p2.join(path_1.default.sep);
|
|
56
|
+
let fileName = path_1.default.join(modulePath, 'package.json');
|
|
57
|
+
if (!fs_1.default.existsSync(fileName)) {
|
|
58
|
+
// Special case for ts dev versions
|
|
59
|
+
if (path_1.default.basename(modulePath) === 'built') {
|
|
60
|
+
fileName = path_1.default.join(modulePath, '..', 'package.json');
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
if (!fs_1.default.existsSync(fileName)) {
|
|
64
|
+
return null;
|
|
65
|
+
}
|
|
66
|
+
const contents = fs_1.default.readFileSync(fileName).toString();
|
|
67
|
+
let desc = null;
|
|
68
|
+
try {
|
|
69
|
+
desc = JSON.parse(contents);
|
|
70
|
+
}
|
|
71
|
+
catch (err) {
|
|
72
|
+
return null;
|
|
73
|
+
}
|
|
74
|
+
if (!desc || !desc.version) {
|
|
75
|
+
return null;
|
|
76
|
+
}
|
|
77
|
+
return desc.version ? api_1.default.fromVersionString(desc.version) : null;
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
|
+
exports.TypeScriptVersion = TypeScriptVersion;
|
|
81
|
+
const MODULE_FOLDERS = ['node_modules/typescript/lib', '.vscode/pnpify/typescript/lib', '.yarn/sdks/typescript/lib'];
|
|
82
|
+
class TypeScriptVersionProvider {
|
|
83
|
+
constructor(configuration) {
|
|
84
|
+
this.configuration = configuration;
|
|
85
|
+
}
|
|
86
|
+
getUserSettingVersion() {
|
|
87
|
+
const { tsserverPath } = this.configuration || {};
|
|
88
|
+
if (!tsserverPath) {
|
|
89
|
+
return null;
|
|
90
|
+
}
|
|
91
|
+
let resolvedPath = tsserverPath;
|
|
92
|
+
// Resolve full path to the binary if path is not absolute.
|
|
93
|
+
if (!path_1.default.isAbsolute(resolvedPath)) {
|
|
94
|
+
const binaryPath = which_1.default.sync(tsserverPath, { nothrow: true });
|
|
95
|
+
if (binaryPath) {
|
|
96
|
+
resolvedPath = binaryPath;
|
|
97
|
+
}
|
|
98
|
+
}
|
|
99
|
+
// Resolve symbolic link.
|
|
100
|
+
let stat = fs_1.default.lstatSync(resolvedPath, { throwIfNoEntry: false });
|
|
101
|
+
if (stat === null || stat === void 0 ? void 0 : stat.isSymbolicLink()) {
|
|
102
|
+
resolvedPath = fs_1.default.realpathSync(resolvedPath);
|
|
103
|
+
}
|
|
104
|
+
// Get directory path
|
|
105
|
+
stat = fs_1.default.lstatSync(resolvedPath, { throwIfNoEntry: false });
|
|
106
|
+
if (stat === null || stat === void 0 ? void 0 : stat.isFile()) {
|
|
107
|
+
resolvedPath = path_1.default.dirname(resolvedPath);
|
|
108
|
+
}
|
|
109
|
+
// Resolve path to the "lib" dir.
|
|
110
|
+
try {
|
|
111
|
+
const packageJsonPath = pkg_up_1.default.sync({ cwd: resolvedPath });
|
|
112
|
+
if (packageJsonPath) {
|
|
113
|
+
resolvedPath = path_1.default.join(path_1.default.dirname(packageJsonPath), 'lib');
|
|
114
|
+
}
|
|
115
|
+
}
|
|
116
|
+
catch (_a) {
|
|
117
|
+
// ignore
|
|
118
|
+
}
|
|
119
|
+
return new TypeScriptVersion("user-setting" /* UserSetting */, resolvedPath);
|
|
120
|
+
}
|
|
121
|
+
getWorkspaceVersion(workspaceFolders) {
|
|
122
|
+
for (const p of workspaceFolders) {
|
|
123
|
+
for (const folder of MODULE_FOLDERS) {
|
|
124
|
+
const libFolder = path_1.default.join(p, folder);
|
|
125
|
+
if (fs_1.default.existsSync(libFolder)) {
|
|
126
|
+
const version = new TypeScriptVersion("workspace" /* Workspace */, libFolder);
|
|
127
|
+
if (version.isValid) {
|
|
128
|
+
return version;
|
|
129
|
+
}
|
|
130
|
+
}
|
|
131
|
+
}
|
|
132
|
+
}
|
|
133
|
+
return null;
|
|
134
|
+
}
|
|
135
|
+
bundledVersion() {
|
|
136
|
+
try {
|
|
137
|
+
const file = require.resolve('typescript');
|
|
138
|
+
const bundledVersion = new TypeScriptVersion("bundled" /* Bundled */, path_1.default.dirname(file), '');
|
|
139
|
+
return bundledVersion;
|
|
140
|
+
}
|
|
141
|
+
catch (e) {
|
|
142
|
+
// window.showMessage('Bundled typescript module not found', 'error');
|
|
143
|
+
return null;
|
|
144
|
+
}
|
|
145
|
+
}
|
|
146
|
+
}
|
|
147
|
+
exports.TypeScriptVersionProvider = TypeScriptVersionProvider;
|
|
148
|
+
//# sourceMappingURL=versionProvider.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"versionProvider.js","sourceRoot":"","sources":["../../src/utils/versionProvider.ts"],"names":[],"mappings":"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"}
|
package/lib/utils.d.ts
CHANGED
package/lib/utils.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAOA,qBAAa,QAAQ,CAAC,CAAC;IACnB,OAAO,EAAE,CAAC,KAAK,EAAE,CAAC,KAAK,IAAI,CAAC;IAC5B,MAAM,EAAE,CAAC,GAAG,CAAC,EAAE,OAAO,KAAK,IAAI,CAAC;IAEhC,OAAO,aAGJ;CACN
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAOA,qBAAa,QAAQ,CAAC,CAAC;IACnB,OAAO,EAAE,CAAC,KAAK,EAAE,CAAC,KAAK,IAAI,CAAC;IAC5B,MAAM,EAAE,CAAC,GAAG,CAAC,EAAE,OAAO,KAAK,IAAI,CAAC;IAEhC,OAAO,aAGJ;CACN"}
|