typescript-language-server 0.6.5 → 0.7.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 +56 -0
- package/README.md +92 -29
- package/lib/cli.js +3 -2
- package/lib/cli.js.map +1 -1
- package/lib/commands.d.ts +3 -0
- package/lib/commands.d.ts.map +1 -1
- package/lib/commands.js +4 -1
- package/lib/commands.js.map +1 -1
- package/lib/completion.d.ts.map +1 -1
- package/lib/completion.js +29 -9
- package/lib/completion.js.map +1 -1
- package/lib/lsp-server.d.ts +2 -1
- package/lib/lsp-server.d.ts.map +1 -1
- package/lib/lsp-server.js +84 -31
- package/lib/lsp-server.js.map +1 -1
- package/lib/lsp-server.spec.js +120 -8
- package/lib/lsp-server.spec.js.map +1 -1
- package/lib/organize-imports.d.ts +2 -1
- package/lib/organize-imports.d.ts.map +1 -1
- package/lib/organize-imports.js +7 -5
- package/lib/organize-imports.js.map +1 -1
- package/lib/organize-imports.spec.js +14 -7
- package/lib/organize-imports.spec.js.map +1 -1
- package/lib/protocol-translation.js +1 -1
- package/lib/protocol-translation.js.map +1 -1
- package/lib/ts-protocol.d.ts +1 -0
- package/lib/ts-protocol.d.ts.map +1 -1
- package/lib/tsp-client.d.ts +1 -0
- package/lib/tsp-client.d.ts.map +1 -1
- package/lib/tsp-client.js +5 -2
- package/lib/tsp-client.js.map +1 -1
- package/lib/tsp-command-types.d.ts +12 -0
- package/lib/tsp-command-types.d.ts.map +1 -1
- package/lib/tsp-command-types.js +21 -1
- package/lib/tsp-command-types.js.map +1 -1
- package/lib/utils/api.d.ts +45 -0
- package/lib/utils/api.d.ts.map +1 -0
- package/lib/utils/api.js +95 -0
- package/lib/utils/api.js.map +1 -0
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,6 +1,62 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
All notable changes to this project will be documented in this file.
|
|
3
3
|
|
|
4
|
+
## [0.7.0] - 2021-11-09
|
|
5
|
+
|
|
6
|
+
### Breaking
|
|
7
|
+
|
|
8
|
+
Changes to default options sent to tsserver could affect behavior (hopefully for the better). Read changes below for more details.
|
|
9
|
+
|
|
10
|
+
### Changes
|
|
11
|
+
|
|
12
|
+
- **feat**: include import specifier for import completions (#281)
|
|
13
|
+
For completions that import from another package, the completions will include a "detail" field with the name of the module.
|
|
14
|
+
|
|
15
|
+
Also aligned some other logic with the typescript language services used in VSCode:
|
|
16
|
+
* annotate the completions with the local name of the import when completing a path in import foo from '...'
|
|
17
|
+
* update completion "sortText" regardless if the completion "isRecommended"
|
|
18
|
+
|
|
19
|
+
- **feat**: allow skip destructive actions on running OrganizeImports (#228)
|
|
20
|
+
Add support for the new skipDestructiveCodeActions argument to TypeScript's organize imports feature - [1] to support [2].
|
|
21
|
+
|
|
22
|
+
Support is added in two places:
|
|
23
|
+
* Automatically inferring the proper value based on diagnostics for the file when returning code actions.
|
|
24
|
+
* Supporting sending it when manually executing the organize imports action.
|
|
25
|
+
|
|
26
|
+
Also added documentation to the readme about the supported commands that can be manually executed.
|
|
27
|
+
|
|
28
|
+
[1] https://github.com/microsoft/TypeScript/issues/43051
|
|
29
|
+
[2] https://github.com/apexskier/nova-typescript/issues/273
|
|
30
|
+
|
|
31
|
+
- **feat**: support running server on files without root workspace (#286)
|
|
32
|
+
The tsserver seems to be good at inferring the project configuration when opening single files without a workspace so don't crash on missing `rootPath`.
|
|
33
|
+
|
|
34
|
+
- **feat**: add `disableAutomaticTypingAcquisition` option to disable automatic type acquisition (#285)
|
|
35
|
+
- **feat**: update default tsserver options (#284)
|
|
36
|
+
Set the following additional options by default:
|
|
37
|
+
```
|
|
38
|
+
allowRenameOfImportPath: true,
|
|
39
|
+
displayPartsForJSDoc: true,
|
|
40
|
+
generateReturnInDocTemplate: true,
|
|
41
|
+
includeAutomaticOptionalChainCompletions: true,
|
|
42
|
+
includeCompletionsForImportStatements: true,
|
|
43
|
+
includeCompletionsWithSnippetText: true,
|
|
44
|
+
```
|
|
45
|
+
This aligns more with the default options of the typescript language services in VSCode.
|
|
46
|
+
- **feat**: announce support for "source.organizeImports.ts-ls" action (#283)
|
|
47
|
+
Announcing support for that code action allows editors that support
|
|
48
|
+
running code actions on save to automatically run the code action if
|
|
49
|
+
the user has configured the editor with settings like
|
|
50
|
+
|
|
51
|
+
```js
|
|
52
|
+
"codeActionsOnSave": {
|
|
53
|
+
"source.organizeImports": true,
|
|
54
|
+
// or
|
|
55
|
+
"source.organizeImports.ts-ls": true,
|
|
56
|
+
},
|
|
57
|
+
```
|
|
58
|
+
- **chore**: change default log level from "warn" to "info" (#287)
|
|
59
|
+
|
|
4
60
|
## [0.6.5] - 2021-11-03
|
|
5
61
|
|
|
6
62
|
- fix: normalize client and tsserver paths (#275)
|
package/README.md
CHANGED
|
@@ -11,13 +11,13 @@ Based on concepts and ideas from https://github.com/prabirshrestha/typescript-la
|
|
|
11
11
|
|
|
12
12
|
Maintained by a [community of contributors](https://github.com/typescript-language-server/typescript-language-server/graphs/contributors) like you
|
|
13
13
|
|
|
14
|
-
|
|
14
|
+
## Installing
|
|
15
15
|
|
|
16
16
|
```sh
|
|
17
17
|
npm install -g typescript-language-server
|
|
18
18
|
```
|
|
19
19
|
|
|
20
|
-
|
|
20
|
+
## Running the language server
|
|
21
21
|
|
|
22
22
|
```
|
|
23
23
|
typescript-language-server --stdio
|
|
@@ -32,8 +32,8 @@ typescript-language-server --stdio
|
|
|
32
32
|
Options:
|
|
33
33
|
|
|
34
34
|
-V, --version output the version number
|
|
35
|
-
--stdio use stdio (
|
|
36
|
-
--log-level <log-level> A number indicating the log level (4 = log, 3 = info, 2 = warn, 1 = error). Defaults to `
|
|
35
|
+
--stdio use stdio (required option)
|
|
36
|
+
--log-level <log-level> A number indicating the log level (4 = log, 3 = info, 2 = warn, 1 = error). Defaults to `3`.
|
|
37
37
|
--tsserver-log-file <tsServerLogFile> Specify a tsserver log file. example: --tsserver-log-file=ts-logs.txt
|
|
38
38
|
--tsserver-log-verbosity <verbosity> Specify tsserver log verbosity (off, terse, normal, verbose). Defaults to `normal`. example: --tsserver-log-verbosity=verbose
|
|
39
39
|
--tsserver-path <path> Specify path to tsserver. example: --tsserver-path=tsserver
|
|
@@ -47,6 +47,7 @@ The language server accepts various settings through the `initializationOptions`
|
|
|
47
47
|
| Setting | Type | Description |
|
|
48
48
|
|:------------------|:---------|:---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
|
|
49
49
|
| hostInfo | string | Information about the host, for example `"Emacs 24.4"` or `"Sublime Text v3075"`. **Default**: `undefined` |
|
|
50
|
+
| disableAutomaticTypingAcquisition | boolean | Disables tsserver from automatically fetching missing type definitions (`@types` packages) for external modules. |
|
|
50
51
|
| logVerbosity | string | The verbosity level of the information printed in the log by `tsserver`. Accepts values: `"off"`, `"terse"`, `"normal"`, `"requesttime"`, `"verbose"`. **Default**: `undefined` (`"off"`). |
|
|
51
52
|
| maxTsServerMemory | number | The maximum size of the V8's old memory section in megabytes (for example `4096` means 4GB). The default value is dynamically configured by Node so can differ per system. Increase for very big projects that exceed allowed memory usage. **Default**: `undefined` |
|
|
52
53
|
| plugins | object[] | An array of `{ name: string, location: string }` objects for registering a Typescript plugins. **Default**: [] |
|
|
@@ -83,6 +84,10 @@ interface UserPreferences {
|
|
|
83
84
|
* values, with insertion text to replace preceding `.` tokens with `?.`.
|
|
84
85
|
*/
|
|
85
86
|
includeAutomaticOptionalChainCompletions: boolean;
|
|
87
|
+
/**
|
|
88
|
+
* Allows import module names to be resolved in the initial completions request.
|
|
89
|
+
* @default false
|
|
90
|
+
*/
|
|
86
91
|
allowIncompleteCompletions: boolean;
|
|
87
92
|
importModuleSpecifierPreference: "shortest" | "project-relative" | "relative" | "non-relative";
|
|
88
93
|
/** Determines whether we import `foo/index.ts` as "foo", "foo/index", or "foo/index.js" */
|
|
@@ -102,8 +107,16 @@ From the `preferences` options listed above, this server explicilty sets the fol
|
|
|
102
107
|
|
|
103
108
|
```js
|
|
104
109
|
{
|
|
105
|
-
|
|
106
|
-
|
|
110
|
+
allowIncompleteCompletions: true,
|
|
111
|
+
allowRenameOfImportPath: true,
|
|
112
|
+
allowTextChangesInNewFiles: true,
|
|
113
|
+
displayPartsForJSDoc: true,
|
|
114
|
+
generateReturnInDocTemplate: true,
|
|
115
|
+
includeAutomaticOptionalChainCompletions: true,
|
|
116
|
+
includeCompletionsForImportStatements: true,
|
|
117
|
+
includeCompletionsForModuleExports: true,
|
|
118
|
+
includeCompletionsWithInsertText: true,
|
|
119
|
+
includeCompletionsWithSnippetText: true,
|
|
107
120
|
}
|
|
108
121
|
```
|
|
109
122
|
|
|
@@ -148,29 +161,53 @@ Some of the preferences can be controlled through the `workspace/didChangeConfig
|
|
|
148
161
|
[language].inlayHints.includeInlayVariableTypeHints: boolean;
|
|
149
162
|
```
|
|
150
163
|
|
|
151
|
-
|
|
164
|
+
## Code actions on save
|
|
152
165
|
|
|
153
|
-
-
|
|
154
|
-
- [x] textDocument/didClose
|
|
155
|
-
- [x] textDocument/didOpen
|
|
156
|
-
- [x] textDocument/didSave
|
|
166
|
+
Server announces support for the `source.organizeImports.ts-ls` code action which allows editors that support running code actions on save to automatically organize imports on saving. The user can enable it with a setting similar to (can vary per-editor):
|
|
157
167
|
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
- [x] workspace/didChangeConfiguration
|
|
168
|
+
```js
|
|
169
|
+
"codeActionsOnSave": {
|
|
170
|
+
"source.organizeImports": true,
|
|
171
|
+
// or
|
|
172
|
+
"source.organizeImports.ts-ls": true,
|
|
173
|
+
}
|
|
174
|
+
```
|
|
175
|
+
|
|
176
|
+
## Workspace commands (`workspace/executeCommand`)
|
|
177
|
+
|
|
178
|
+
See [LSP specification](https://microsoft.github.io/language-server-protocol/specifications/specification-3-17/#workspace_executeCommand).
|
|
179
|
+
|
|
180
|
+
Most of the time, you'll execute commands with arguments retrieved from another request like `textDocument/codeAction`. There are some use cases for calling them manually.
|
|
172
181
|
|
|
173
|
-
|
|
182
|
+
Supported commands:
|
|
183
|
+
|
|
184
|
+
`lsp` refers to the language server protocol, `tsp` refers to the typescript server protocol.
|
|
185
|
+
|
|
186
|
+
* `_typescript.applyWorkspaceEdit`
|
|
187
|
+
```ts
|
|
188
|
+
type Arguments = [lsp.WorkspaceEdit]
|
|
189
|
+
```
|
|
190
|
+
* `_typescript.applyCodeAction`
|
|
191
|
+
```ts
|
|
192
|
+
type Arguments = [tsp.CodeAction]
|
|
193
|
+
```
|
|
194
|
+
* `_typescript.applyRefactoring`
|
|
195
|
+
```ts
|
|
196
|
+
type Arguments = [tsp.GetEditsForRefactorRequestArgs]
|
|
197
|
+
```
|
|
198
|
+
* `_typescript.organizeImports`
|
|
199
|
+
```ts
|
|
200
|
+
// The "skipDestructiveCodeActions" argument is supported from Typescript 4.4+
|
|
201
|
+
type Arguments = [string] | [string, { skipDestructiveCodeActions?: boolean }]
|
|
202
|
+
```
|
|
203
|
+
* `_typescript.applyRenameFile`
|
|
204
|
+
```ts
|
|
205
|
+
type Arguments = [{ sourceUri: string; targetUri: string; }]
|
|
206
|
+
```
|
|
207
|
+
|
|
208
|
+
## Inlay hints (`typescript/inlayHints`) (experimental)
|
|
209
|
+
|
|
210
|
+
Supports experimental inline hints.
|
|
174
211
|
|
|
175
212
|
```ts
|
|
176
213
|
type Request = {
|
|
@@ -206,7 +243,9 @@ export interface InlayHintsOptions extends UserPreferences {
|
|
|
206
243
|
}
|
|
207
244
|
```
|
|
208
245
|
|
|
209
|
-
## `textDocument/calls` (experimental)
|
|
246
|
+
## Callers and callees (`textDocument/calls`) (experimental)
|
|
247
|
+
|
|
248
|
+
Supports showing callers and calles for a given symbol. If the editor has support for appropriate UI, it can generate a tree of callers and calles for a document.
|
|
210
249
|
|
|
211
250
|
```ts
|
|
212
251
|
type Request = {
|
|
@@ -288,7 +327,31 @@ interface DefinitionSymbol {
|
|
|
288
327
|
}
|
|
289
328
|
```
|
|
290
329
|
|
|
291
|
-
|
|
330
|
+
## Supported Protocol features
|
|
331
|
+
|
|
332
|
+
- [x] textDocument/didChange (incremental)
|
|
333
|
+
- [x] textDocument/didClose
|
|
334
|
+
- [x] textDocument/didOpen
|
|
335
|
+
- [x] textDocument/didSave
|
|
336
|
+
- [x] textDocument/codeAction
|
|
337
|
+
- [x] textDocument/completion (incl. completion/resolve)
|
|
338
|
+
- [x] textDocument/definition
|
|
339
|
+
- [x] textDocument/documentHighlight
|
|
340
|
+
- [x] textDocument/documentSymbol
|
|
341
|
+
- [x] textDocument/executeCommand
|
|
342
|
+
- [x] textDocument/formatting
|
|
343
|
+
- [x] textDocument/rangeFormatting
|
|
344
|
+
- [x] textDocument/hover
|
|
345
|
+
- [x] textDocument/rename
|
|
346
|
+
- [x] textDocument/references
|
|
347
|
+
- [x] textDocument/signatureHelp
|
|
348
|
+
- [x] textDocument/calls (experimental)
|
|
349
|
+
- [x] typescript/inlayHints (experimental, supported from Typescript v4.4.2)
|
|
350
|
+
- [x] workspace/symbol
|
|
351
|
+
- [x] workspace/didChangeConfiguration
|
|
352
|
+
- [x] workspace/executeCommand
|
|
353
|
+
|
|
354
|
+
## Development
|
|
292
355
|
|
|
293
356
|
### Build
|
|
294
357
|
|
|
@@ -296,7 +359,7 @@ interface DefinitionSymbol {
|
|
|
296
359
|
yarn
|
|
297
360
|
```
|
|
298
361
|
|
|
299
|
-
|
|
362
|
+
### Test
|
|
300
363
|
|
|
301
364
|
```sh
|
|
302
365
|
yarn test
|
package/lib/cli.js
CHANGED
|
@@ -30,6 +30,7 @@ const commander_1 = require("commander");
|
|
|
30
30
|
const utils_1 = require("./utils");
|
|
31
31
|
const lsp_connection_1 = require("./lsp-connection");
|
|
32
32
|
const lsp = __importStar(require("vscode-languageserver/node"));
|
|
33
|
+
const DEFAULT_LOG_LEVEL = lsp.MessageType.Info;
|
|
33
34
|
const program = new commander_1.Command('typescript-language-server')
|
|
34
35
|
// eslint-disable-next-line @typescript-eslint/no-require-imports, @typescript-eslint/no-var-requires
|
|
35
36
|
.version(require('../package.json').version)
|
|
@@ -44,12 +45,12 @@ const options = program.opts();
|
|
|
44
45
|
if (options.tsserverLogFile && !options.tsserverLogVerbosity) {
|
|
45
46
|
options.tsserverLogVerbosity = 'normal';
|
|
46
47
|
}
|
|
47
|
-
let logLevel =
|
|
48
|
+
let logLevel = DEFAULT_LOG_LEVEL;
|
|
48
49
|
if (options.logLevel) {
|
|
49
50
|
logLevel = parseInt(options.logLevel, 10);
|
|
50
51
|
if (logLevel && (logLevel < 1 || logLevel > 4)) {
|
|
51
52
|
console.error(`Invalid '--log-level ${logLevel}'. Falling back to 'info' level.`);
|
|
52
|
-
logLevel =
|
|
53
|
+
logLevel = DEFAULT_LOG_LEVEL;
|
|
53
54
|
}
|
|
54
55
|
}
|
|
55
56
|
(0, lsp_connection_1.createLspConnection)({
|
package/lib/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";;AACA;;;;;GAKG;;;;;;;;;;;;;;;;;;;;;AAEH,yCAAoC;AACpC,mCAAgD;AAChD,qDAAuD;AACvD,gEAAkD;AAElD,MAAM,OAAO,GAAG,IAAI,mBAAO,CAAC,4BAA4B,CAAC;IACrD,qGAAqG;KACpG,OAAO,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,OAAO,CAAC;KAC3C,cAAc,CAAC,SAAS,EAAE,WAAW,CAAC;KACtC,MAAM,CAAC,wBAAwB,EAAE,8FAA8F,CAAC;KAChI,MAAM,CAAC,uCAAuC,EAAE,uEAAuE,CAAC;KACxH,MAAM,CAAC,iDAAiD,EAAE,kFAAkF;IAC3I,4CAA4C,CAAC;KAC9C,MAAM,CAAC,wBAAwB,EAAE,sDAAsD,IAAA,6BAAqB,GAAE,EAAE,CAAC;KACjH,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;AAEzB,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;AAE/B,IAAI,OAAO,CAAC,eAAe,IAAI,CAAC,OAAO,CAAC,oBAAoB,EAAE;IAC1D,OAAO,CAAC,oBAAoB,GAAG,QAAQ,CAAC;CAC3C;AAED,IAAI,QAAQ,GAAG,
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";;AACA;;;;;GAKG;;;;;;;;;;;;;;;;;;;;;AAEH,yCAAoC;AACpC,mCAAgD;AAChD,qDAAuD;AACvD,gEAAkD;AAElD,MAAM,iBAAiB,GAAG,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC;AAE/C,MAAM,OAAO,GAAG,IAAI,mBAAO,CAAC,4BAA4B,CAAC;IACrD,qGAAqG;KACpG,OAAO,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,OAAO,CAAC;KAC3C,cAAc,CAAC,SAAS,EAAE,WAAW,CAAC;KACtC,MAAM,CAAC,wBAAwB,EAAE,8FAA8F,CAAC;KAChI,MAAM,CAAC,uCAAuC,EAAE,uEAAuE,CAAC;KACxH,MAAM,CAAC,iDAAiD,EAAE,kFAAkF;IAC3I,4CAA4C,CAAC;KAC9C,MAAM,CAAC,wBAAwB,EAAE,sDAAsD,IAAA,6BAAqB,GAAE,EAAE,CAAC;KACjH,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;AAEzB,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;AAE/B,IAAI,OAAO,CAAC,eAAe,IAAI,CAAC,OAAO,CAAC,oBAAoB,EAAE;IAC1D,OAAO,CAAC,oBAAoB,GAAG,QAAQ,CAAC;CAC3C;AAED,IAAI,QAAQ,GAAG,iBAAiB,CAAC;AACjC,IAAI,OAAO,CAAC,QAAQ,EAAE;IAClB,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;IAC1C,IAAI,QAAQ,IAAI,CAAC,QAAQ,GAAG,CAAC,IAAI,QAAQ,GAAG,CAAC,CAAC,EAAE;QAC5C,OAAO,CAAC,KAAK,CAAC,wBAAwB,QAAQ,kCAAkC,CAAC,CAAC;QAClF,QAAQ,GAAG,iBAAiB,CAAC;KAChC;CACJ;AAED,IAAA,oCAAmB,EAAC;IAChB,YAAY,EAAE,OAAO,CAAC,YAAsB;IAC5C,eAAe,EAAE,OAAO,CAAC,eAAyB;IAClD,oBAAoB,EAAE,OAAO,CAAC,oBAA8B;IAC5D,gBAAgB,EAAE,QAA2B;CAChD,CAAC,CAAC,MAAM,EAAE,CAAC"}
|
package/lib/commands.d.ts
CHANGED
package/lib/commands.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commands.d.ts","sourceRoot":"","sources":["../src/commands.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,QAAQ;;;;;;;IAOjB,yDAAyD;;CAE5D,CAAC"}
|
|
1
|
+
{"version":3,"file":"commands.d.ts","sourceRoot":"","sources":["../src/commands.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,QAAQ;;;;;;;IAOjB,yDAAyD;;CAE5D,CAAC;AAEF,eAAO,MAAM,WAAW;;CAEvB,CAAC"}
|
package/lib/commands.js
CHANGED
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
* You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
|
|
7
7
|
*/
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
|
-
exports.Commands = void 0;
|
|
9
|
+
exports.CodeActions = exports.Commands = void 0;
|
|
10
10
|
exports.Commands = {
|
|
11
11
|
APPLY_WORKSPACE_EDIT: '_typescript.applyWorkspaceEdit',
|
|
12
12
|
APPLY_CODE_ACTION: '_typescript.applyCodeAction',
|
|
@@ -17,4 +17,7 @@ exports.Commands = {
|
|
|
17
17
|
/** Commands below should be implemented by the client */
|
|
18
18
|
SELECT_REFACTORING: '_typescript.selectRefactoring'
|
|
19
19
|
};
|
|
20
|
+
exports.CodeActions = {
|
|
21
|
+
SourceOrganizeImportsTsLs: 'source.organizeImports.ts-ls'
|
|
22
|
+
};
|
|
20
23
|
//# sourceMappingURL=commands.js.map
|
package/lib/commands.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commands.js","sourceRoot":"","sources":["../src/commands.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEU,QAAA,QAAQ,GAAG;IACpB,oBAAoB,EAAE,gCAAgC;IACtD,iBAAiB,EAAE,6BAA6B;IAChD,iBAAiB,EAAE,8BAA8B;IACjD,gBAAgB,EAAE,6BAA6B;IAC/C,iBAAiB,EAAE,6BAA6B;IAChD,4BAA4B,EAAE,uCAAuC;IACrE,yDAAyD;IACzD,kBAAkB,EAAE,+BAA+B;CACtD,CAAC"}
|
|
1
|
+
{"version":3,"file":"commands.js","sourceRoot":"","sources":["../src/commands.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEU,QAAA,QAAQ,GAAG;IACpB,oBAAoB,EAAE,gCAAgC;IACtD,iBAAiB,EAAE,6BAA6B;IAChD,iBAAiB,EAAE,8BAA8B;IACjD,gBAAgB,EAAE,6BAA6B;IAC/C,iBAAiB,EAAE,6BAA6B;IAChD,4BAA4B,EAAE,uCAAuC;IACrE,yDAAyD;IACzD,kBAAkB,EAAE,+BAA+B;CACtD,CAAC;AAEW,QAAA,WAAW,GAAG;IACvB,yBAAyB,EAAE,8BAA8B;CAC5D,CAAC"}
|
package/lib/completion.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"completion.d.ts","sourceRoot":"","sources":["../src/completion.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,GAAG,MAAM,4BAA4B,CAAC;AAClD,OAAO,KAAK,GAAG,MAAM,yBAAyB,CAAC;AAC/C,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAKzC,UAAU,gBAAiB,SAAQ,GAAG,CAAC,cAAc;IACjD,IAAI,EAAE,GAAG,CAAC,4BAA4B,CAAC;CAC1C;AAED,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,GAAG,CAAC,eAAe,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,CAAC,QAAQ,EAAE,QAAQ,EAAE,WAAW,GAAG,gBAAgB,
|
|
1
|
+
{"version":3,"file":"completion.d.ts","sourceRoot":"","sources":["../src/completion.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,GAAG,MAAM,4BAA4B,CAAC;AAClD,OAAO,KAAK,GAAG,MAAM,yBAAyB,CAAC;AAC/C,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAKzC,UAAU,gBAAiB,SAAQ,GAAG,CAAC,cAAc;IACjD,IAAI,EAAE,GAAG,CAAC,4BAA4B,CAAC;CAC1C;AAED,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,GAAG,CAAC,eAAe,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,CAAC,QAAQ,EAAE,QAAQ,EAAE,WAAW,GAAG,gBAAgB,CAoF1I;AA6ED,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,GAAG,CAAC,cAAc,EAAE,OAAO,EAAE,GAAG,CAAC,sBAAsB,GAAG,GAAG,CAAC,cAAc,CAS1H"}
|
package/lib/completion.js
CHANGED
|
@@ -36,25 +36,29 @@ function asCompletionItem(entry, file, position, document) {
|
|
|
36
36
|
kind: asCompletionItemKind(entry.kind),
|
|
37
37
|
sortText: entry.sortText,
|
|
38
38
|
commitCharacters: asCommitCharacters(entry.kind),
|
|
39
|
+
preselect: entry.isRecommended,
|
|
39
40
|
data: {
|
|
40
41
|
file,
|
|
41
42
|
line: position.line + 1,
|
|
42
43
|
offset: position.character + 1,
|
|
43
44
|
entryNames: [
|
|
44
|
-
entry.source
|
|
45
|
+
entry.source || entry.data ? {
|
|
46
|
+
name: entry.name,
|
|
47
|
+
source: entry.source,
|
|
48
|
+
data: entry.data
|
|
49
|
+
} : entry.name
|
|
45
50
|
]
|
|
46
51
|
}
|
|
47
52
|
};
|
|
48
|
-
if (entry.
|
|
49
|
-
// Make sure isRecommended property always comes first
|
|
50
|
-
// https://github.com/Microsoft/vscode/issues/40325
|
|
51
|
-
item.preselect = true;
|
|
52
|
-
}
|
|
53
|
-
else if (entry.source) {
|
|
53
|
+
if (entry.source && entry.hasAction) {
|
|
54
54
|
// De-prioritze auto-imports
|
|
55
55
|
// https://github.com/Microsoft/vscode/issues/40311
|
|
56
56
|
item.sortText = '\uffff' + entry.sortText;
|
|
57
57
|
}
|
|
58
|
+
const { sourceDisplay } = entry;
|
|
59
|
+
if (sourceDisplay) {
|
|
60
|
+
item.detail = (0, protocol_translation_1.asPlainText)(sourceDisplay);
|
|
61
|
+
}
|
|
58
62
|
if (item.kind === lsp.CompletionItemKind.Function || item.kind === lsp.CompletionItemKind.Method) {
|
|
59
63
|
item.insertTextFormat = lsp.InsertTextFormat.Snippet;
|
|
60
64
|
}
|
|
@@ -69,7 +73,7 @@ function asCompletionItem(entry, file, position, document) {
|
|
|
69
73
|
}
|
|
70
74
|
if (entry.kindModifiers) {
|
|
71
75
|
const kindModifiers = new Set(entry.kindModifiers.split(/,|\s+/g));
|
|
72
|
-
if (kindModifiers.has(
|
|
76
|
+
if (kindModifiers.has(tsp_command_types_1.KindModifiers.optional)) {
|
|
73
77
|
if (!insertText) {
|
|
74
78
|
insertText = item.label;
|
|
75
79
|
}
|
|
@@ -78,9 +82,25 @@ function asCompletionItem(entry, file, position, document) {
|
|
|
78
82
|
}
|
|
79
83
|
item.label += '?';
|
|
80
84
|
}
|
|
81
|
-
if (kindModifiers.has(
|
|
85
|
+
if (kindModifiers.has(tsp_command_types_1.KindModifiers.deprecated)) {
|
|
82
86
|
item.tags = [lsp.CompletionItemTag.Deprecated];
|
|
83
87
|
}
|
|
88
|
+
if (kindModifiers.has(tsp_command_types_1.KindModifiers.color)) {
|
|
89
|
+
item.kind = lsp.CompletionItemKind.Color;
|
|
90
|
+
}
|
|
91
|
+
if (entry.kind === tsp_command_types_1.ScriptElementKind.scriptElement) {
|
|
92
|
+
for (const extModifier of tsp_command_types_1.KindModifiers.fileExtensionKindModifiers) {
|
|
93
|
+
if (kindModifiers.has(extModifier)) {
|
|
94
|
+
if (entry.name.toLowerCase().endsWith(extModifier)) {
|
|
95
|
+
item.detail = entry.name;
|
|
96
|
+
}
|
|
97
|
+
else {
|
|
98
|
+
item.detail = entry.name + extModifier;
|
|
99
|
+
}
|
|
100
|
+
break;
|
|
101
|
+
}
|
|
102
|
+
}
|
|
103
|
+
}
|
|
84
104
|
}
|
|
85
105
|
if (insertText && replacementRange) {
|
|
86
106
|
item.textEdit = lsp.TextEdit.replace(replacementRange, insertText);
|
package/lib/completion.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"completion.js","sourceRoot":"","sources":["../src/completion.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;;;;;;;;;;;;;;;;;;AAEH,gEAAkD;AAGlD,
|
|
1
|
+
{"version":3,"file":"completion.js","sourceRoot":"","sources":["../src/completion.ts"],"names":[],"mappings":"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"}
|
package/lib/lsp-server.d.ts
CHANGED
|
@@ -21,10 +21,12 @@ export declare class LspServer {
|
|
|
21
21
|
private diagnosticQueue?;
|
|
22
22
|
private logger;
|
|
23
23
|
private workspaceConfiguration;
|
|
24
|
+
private workspaceRoot;
|
|
24
25
|
private readonly documents;
|
|
25
26
|
constructor(options: IServerOptions);
|
|
26
27
|
closeAll(): void;
|
|
27
28
|
protected findTsserverPath(): string;
|
|
29
|
+
private getTypeScriptVersion;
|
|
28
30
|
initialize(params: TypeScriptInitializeParams): Promise<TypeScriptInitializeResult>;
|
|
29
31
|
protected getLogFile(logVerbosity: string | undefined): string | undefined;
|
|
30
32
|
protected doGetLogFile(): string | undefined;
|
|
@@ -70,7 +72,6 @@ export declare class LspServer {
|
|
|
70
72
|
protected applyRenameFile(sourceUri: string, targetUri: string): Promise<void>;
|
|
71
73
|
protected getEditsForFileRename(sourceUri: string, targetUri: string): Promise<ReadonlyArray<tsp.FileCodeEdits>>;
|
|
72
74
|
documentHighlight(arg: lsp.TextDocumentPositionParams): Promise<lsp.DocumentHighlight[]>;
|
|
73
|
-
private rootPath;
|
|
74
75
|
private lastFileOrDummy;
|
|
75
76
|
workspaceSymbol(params: lsp.WorkspaceSymbolParams): Promise<lsp.SymbolInformation[]>;
|
|
76
77
|
/**
|
package/lib/lsp-server.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lsp-server.d.ts","sourceRoot":"","sources":["../src/lsp-server.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,GAAG,MAAM,4BAA4B,CAAC;AAClD,OAAO,KAAK,QAAQ,MAAM,+BAA+B,CAAC;AAC1D,OAAO,KAAK,aAAa,MAAM,oCAAoC,CAAC;AACpE,OAAO,GAAG,MAAM,yBAAyB,CAAC;AAO1C,OAAO,EAAE,MAAM,EAAmB,MAAM,UAAU,CAAC;AAEnD,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AASzC,OAAO,EAAgB,WAAW,EAAE,MAAM,YAAY,CAAC;AAOvD,OAAO,EAAE,0BAA0B,EAAmC,0BAA0B,EAA+B,2CAA2C,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"lsp-server.d.ts","sourceRoot":"","sources":["../src/lsp-server.ts"],"names":[],"mappings":"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"}
|