typescript-language-server 0.6.3 → 0.7.1

package/CHANGELOG.md

@@ -1,6 +1,82 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [0.7.1] - 2021-11-10
+
+ - fix: add missing `semver` dependency (#288)
+
+## [0.7.0] - 2021-11-09
+
+### Breaking
+
+Changes to default options sent to tsserver could affect behavior (hopefully for the better). Read changes below for more details.
+
+### Changes
+
+- **feat**: include import specifier for import completions (#281)
+   For completions that import from another package, the completions will include a "detail" field with the name of the module.
+
+   Also aligned some other logic with the typescript language services used in VSCode:
+    * annotate the completions with the local name of the import when completing a path in import foo from '...'
+    * update completion "sortText" regardless if the completion "isRecommended"
+
+- **feat**: allow skip destructive actions on running OrganizeImports (#228)
+   Add support for the new skipDestructiveCodeActions argument to TypeScript's organize imports feature - [1] to support [2].
+
+   Support is added in two places:
+     * Automatically inferring the proper value based on diagnostics for the file when returning code actions.
+     * Supporting sending it when manually executing the organize imports action.
+
+   Also added documentation to the readme about the supported commands that can be manually executed.
+
+   [1] https://github.com/microsoft/TypeScript/issues/43051
+   [2] https://github.com/apexskier/nova-typescript/issues/273
+
+- **feat**: support running server on files without root workspace (#286)
+   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`.
+
+- **feat**: add `disableAutomaticTypingAcquisition` option to disable automatic type acquisition (#285)
+- **feat**: update default tsserver options (#284)
+  Set the following additional options by default:
+    ```
+    allowRenameOfImportPath: true,
+    displayPartsForJSDoc: true,
+    generateReturnInDocTemplate: true,
+    includeAutomaticOptionalChainCompletions: true,
+    includeCompletionsForImportStatements: true,
+    includeCompletionsWithSnippetText: true,
+    ```
+    This aligns more with the default options of the typescript language services in VSCode.
+- **feat**: announce support for "source.organizeImports.ts-ls" action (#283)
+    Announcing support for that code action allows editors that support
+    running code actions on save to automatically run the code action if
+    the user has configured the editor with settings like
+
+    ```js
+      "codeActionsOnSave": {
+        "source.organizeImports": true,
+        // or
+        "source.organizeImports.ts-ls": true,
+      },
+    ```
+ - **chore**: change default log level from "warn" to "info" (#287)
+
+## [0.6.5] - 2021-11-03
+
+ - fix: normalize client and tsserver paths (#275)
+   This should ensure consistent behavior regradless of the platform. Previously some functionality could be malfunctioning on Windows depending on the LSP client used due to using non-normalized file paths.
+ - Handle the `APPLY_COMPLETION_CODE_ACTION` command internally (#270)
+   This means that the clients that have implemented a custom handling for the `_typescript.applyCompletionCodeAction` command can remove that code.
+   Without removing the custom handling everything should work as before but some edge cases might work better when custom handling is removed.
+ - fix: ignore empty code blocks in content returned from `textDocument/hover` (#276)
+ - fix: remove unsupported --node-ipc and --socket options (#278)
+
+## [0.6.4] - 2021-10-12
+
+ - Fix broken logging (#267)
+ - Add support for `workspace/didChangeConfiguration` and setting formatting options per language (#268)
+ - Add option to set inlayHints preferences by language (#266)
+
 ## [0.6.3] - 2021-10-27
 
  - Implement experimental inlay hints (#259) ([documentation](https://github.com/typescript-language-server/typescript-language-server#typescriptinlayhints-experimental-supported-from-typescript-v442))

package/README.md

@@ -11,13 +11,13 @@ Based on concepts and ideas from https://github.com/prabirshrestha/typescript-la
 
 Maintained by a [community of contributors](https://github.com/typescript-language-server/typescript-language-server/graphs/contributors) like you
 
-# Installing
+## Installing
 
 ```sh
 npm install -g typescript-language-server
 ```
 
-# Running the language server
+## Running the language server
 
 ```
 typescript-language-server --stdio
@@ -32,10 +32,8 @@ typescript-language-server --stdio
   Options:
 
     -V, --version                          output the version number
-    --stdio                                use stdio
-    --node-ipc                             use node-ipc
-    --log-level <log-level>                A number indicating the log level (4 = log, 3 = info, 2 = warn, 1 = error). Defaults to `2`.
-    --socket <port>                        use socket. example: --socket=5000
+    --stdio                                use stdio (required option)
+    --log-level <log-level>                A number indicating the log level (4 = log, 3 = info, 2 = warn, 1 = error). Defaults to `3`.
     --tsserver-log-file <tsServerLogFile>  Specify a tsserver log file. example: --tsserver-log-file=ts-logs.txt
     --tsserver-log-verbosity <verbosity>   Specify tsserver log verbosity (off, terse, normal, verbose). Defaults to `normal`. example: --tsserver-log-verbosity=verbose
     --tsserver-path <path>                 Specify path to tsserver. example: --tsserver-path=tsserver
@@ -49,6 +47,7 @@ The language server accepts various settings through the `initializationOptions`
 | Setting           | Type     | Description                                                                                                                                                                                                                                                          |
 |:------------------|:---------|:---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | hostInfo          | string   | Information about the host, for example `"Emacs 24.4"` or `"Sublime Text v3075"`. **Default**: `undefined`                                                                                                                                                           |
+| disableAutomaticTypingAcquisition | boolean | Disables tsserver from automatically fetching missing type definitions (`@types` packages) for external modules. |
 | logVerbosity      | string   | The verbosity level of the information printed in the log by `tsserver`. Accepts values: `"off"`, `"terse"`, `"normal"`, `"requesttime"`, `"verbose"`. **Default**: `undefined` (`"off"`).                                                                                         |
 | 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` |
 | plugins           | object[] | An array of `{ name: string, location: string }` objects for registering a Typescript plugins. **Default**: []                                                                                                                                                         |
@@ -85,6 +84,10 @@ interface UserPreferences {
      * values, with insertion text to replace preceding `.` tokens with `?.`.
      */
     includeAutomaticOptionalChainCompletions: boolean;
+    /**
+     * Allows import module names to be resolved in the initial completions request.
+     * @default false
+     */
     allowIncompleteCompletions: boolean;
     importModuleSpecifierPreference: "shortest" | "project-relative" | "relative" | "non-relative";
     /** Determines whether we import `foo/index.ts` as "foo", "foo/index", or "foo/index.js" */
@@ -104,33 +107,107 @@ From the `preferences` options listed above, this server explicilty sets the fol
 
 ```js
 {
-  includeCompletionsForModuleExports: true,
-  includeCompletionsWithInsertText: true,
+    allowIncompleteCompletions: true,
+    allowRenameOfImportPath: true,
+    allowTextChangesInNewFiles: true,
+    displayPartsForJSDoc: true,
+    generateReturnInDocTemplate: true,
+    includeAutomaticOptionalChainCompletions: true,
+    includeCompletionsForImportStatements: true,
+    includeCompletionsForModuleExports: true,
+    includeCompletionsWithInsertText: true,
+    includeCompletionsWithSnippetText: true,
 }
 ```
 
-# Supported Protocol features
+## workspace/didChangeConfiguration
 
-- [x] textDocument/didChange (incremental)
-- [x] textDocument/didClose
-- [x] textDocument/didOpen
-- [x] textDocument/didSave
+Some of the preferences can be controlled through the `workspace/didChangeConfiguration` notification. Below is a list of supported options that can be passed. Note that the settings are specified separately for the typescript and javascript files so `[language]` can be either `javascript` or `typescript`.
 
-- [x] textDocument/codeAction
-- [x] textDocument/completion (incl. completion/resolve)
-- [x] textDocument/definition
-- [x] textDocument/documentHighlight
-- [x] textDocument/documentSymbol
-- [x] textDocument/executeCommand
-- [x] textDocument/formatting
-- [x] textDocument/rangeFormatting
-- [x] textDocument/hover
-- [x] textDocument/rename
-- [x] textDocument/references
-- [x] textDocument/signatureHelp
-- [x] workspace/symbol
+```ts
+// Formatting preferences
+[language].format.baseIndentSize: number;
+[language].format.convertTabsToSpaces: boolean;
+[language].format.indentSize: number;
+[language].format.indentStyle: 'None' | 'Block' | 'Smart';
+[language].format.insertSpaceAfterCommaDelimiter: boolean;
+[language].format.insertSpaceAfterConstructor: boolean;
+[language].format.insertSpaceAfterFunctionKeywordForAnonymousFunctions: boolean;
+[language].format.insertSpaceAfterKeywordsInControlFlowStatements: boolean;
+[language].format.insertSpaceAfterOpeningAndBeforeClosingEmptyBraces: boolean;
+[language].format.insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces: boolean;
+[language].format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBraces: boolean;
+[language].format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets: boolean;
+[language].format.insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis: boolean;
+[language].format.insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces: boolean;
+[language].format.insertSpaceAfterSemicolonInForStatements: boolean;
+[language].format.insertSpaceAfterTypeAssertion: boolean;
+[language].format.insertSpaceBeforeAndAfterBinaryOperators: boolean;
+[language].format.insertSpaceBeforeFunctionParenthesis: boolean;
+[language].format.insertSpaceBeforeTypeAnnotation: boolean;
+[language].format.newLineCharacter: string;
+[language].format.placeOpenBraceOnNewLineForControlBlocks: boolean;
+[language].format.placeOpenBraceOnNewLineForFunctions: boolean;
+[language].format.semicolons: 'ignore' | 'insert' | 'remove';
+[language].format.tabSize: number;
+[language].format.trimTrailingWhitespace: boolean;
+// Inlay Hints preferences
+[language].inlayHints.includeInlayEnumMemberValueHints: boolean;
+[language].inlayHints.includeInlayFunctionLikeReturnTypeHints: boolean;
+[language].inlayHints.includeInlayFunctionParameterTypeHints: boolean;
+[language].inlayHints.includeInlayParameterNameHints: 'none' | 'literals' | 'all';
+[language].inlayHints.includeInlayParameterNameHintsWhenArgumentMatchesName: boolean;
+[language].inlayHints.includeInlayPropertyDeclarationTypeHints: boolean;
+[language].inlayHints.includeInlayVariableTypeHints: boolean;
+```
+
+## Code actions on save
+
+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):
+
+```js
+"codeActionsOnSave": {
+    "source.organizeImports": true,
+    // or
+    "source.organizeImports.ts-ls": true,
+}
+```
+
+## Workspace commands (`workspace/executeCommand`)
+
+See [LSP specification](https://microsoft.github.io/language-server-protocol/specifications/specification-3-17/#workspace_executeCommand).
+
+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.
 
-## `typescript/inlayHints` (experimental, supported from Typescript v4.4.2)
+Supported commands:
+
+`lsp` refers to the language server protocol, `tsp` refers to the typescript server protocol.
+
+* `_typescript.applyWorkspaceEdit`
+    ```ts
+    type Arguments = [lsp.WorkspaceEdit]
+    ```
+* `_typescript.applyCodeAction`
+    ```ts
+    type Arguments = [tsp.CodeAction]
+    ```
+* `_typescript.applyRefactoring`
+    ```ts
+    type Arguments = [tsp.GetEditsForRefactorRequestArgs]
+    ```
+* `_typescript.organizeImports`
+    ```ts
+    // The "skipDestructiveCodeActions" argument is supported from Typescript 4.4+
+    type Arguments = [string] | [string, { skipDestructiveCodeActions?: boolean }]
+    ```
+* `_typescript.applyRenameFile`
+    ```ts
+    type Arguments = [{ sourceUri: string; targetUri: string; }]
+    ```
+
+## Inlay hints (`typescript/inlayHints`) (experimental)
+
+Supports experimental inline hints.
 
 ```ts
 type Request = {
@@ -156,9 +233,9 @@ For the request to return any results, some or all of the following options need
 ```ts
 // Not officially part of UserPreferences yet but you can send them along with the UserPreferences just fine:
 export interface InlayHintsOptions extends UserPreferences {
-    includeInlayParameterNameHints: "none" | "literals" | "all";
+    includeInlayParameterNameHints: 'none' | 'literals' | 'all';
     includeInlayParameterNameHintsWhenArgumentMatchesName: boolean;
-    includeInlayFunctionParameterTypeHints: boolean,
+    includeInlayFunctionParameterTypeHints: boolean;
     includeInlayVariableTypeHints: boolean;
     includeInlayPropertyDeclarationTypeHints: boolean;
     includeInlayFunctionLikeReturnTypeHints: boolean;
@@ -166,7 +243,115 @@ export interface InlayHintsOptions extends UserPreferences {
 }
 ```
 
-# Development
+## Callers and callees (`textDocument/calls`) (experimental)
+
+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.
+
+```ts
+type Request = {
+    /**
+     * The text document.
+     */
+    textDocument: TextDocumentIdentifier;
+    /**
+     * The position inside the text document.
+     */
+    position: Position;
+    /**
+     * Outgoing direction for callees.
+     * The default is incoming for callers.
+     */
+    direction?: CallDirection;
+}
+
+export enum CallDirection {
+    /**
+     * Incoming calls aka. callers
+     */
+    Incoming = 'incoming',
+    /**
+     * Outgoing calls aka. callees
+     */
+    Outgoing = 'outgoing',
+}
+
+type Result = {
+    /**
+     * The symbol of a definition for which the request was made.
+     *
+     * If no definition is found at a given text document position, the symbol is undefined.
+     */
+    symbol?: DefinitionSymbol;
+    /**
+     * List of calls.
+     */
+    calls: Call[];
+}
+
+interface Call {
+    /**
+     * Actual location of a call to a definition.
+     */
+    location: Location;
+    /**
+     * Symbol refered to by this call. For outgoing calls this is a callee,
+     * otherwise a caller.
+     */
+    symbol: DefinitionSymbol;
+}
+
+interface DefinitionSymbol {
+    /**
+     * The name of this symbol.
+     */
+    name: string;
+    /**
+     * More detail for this symbol, e.g the signature of a function.
+     */
+    detail?: string;
+    /**
+     * The kind of this symbol.
+     */
+    kind: SymbolKind;
+    /**
+     * The range enclosing this symbol not including leading/trailing whitespace but everything else
+     * like comments. This information is typically used to determine if the the clients cursor is
+     * inside the symbol to reveal in the symbol in the UI.
+     */
+    location: Location;
+    /**
+     * The range that should be selected and revealed when this symbol is being picked, e.g the name of a function.
+     * Must be contained by the the `range`.
+     */
+    selectionRange: Range;
+}
+```
+
+## Supported Protocol features
+
+- [x] textDocument/didChange (incremental)
+- [x] textDocument/didClose
+- [x] textDocument/didOpen
+- [x] textDocument/didSave
+- [x] textDocument/codeAction
+- [x] textDocument/completion (incl. completion/resolve)
+- [x] textDocument/definition
+- [x] textDocument/documentHighlight
+- [x] textDocument/documentSymbol
+- [x] textDocument/executeCommand
+- [x] textDocument/formatting
+- [x] textDocument/rangeFormatting
+- [x] textDocument/hover
+- [x] textDocument/rename
+- [x] textDocument/references
+- [x] textDocument/signatureHelp
+- [x] textDocument/calls (experimental)
+- [x] typescript/inlayHints (experimental, supported from Typescript v4.4.2)
+- [x] workspace/symbol
+- [x] workspace/didChangeConfiguration
+- [x] workspace/executeCommand
+
+## Development
 
 ### Build
 
@@ -174,7 +359,7 @@ export interface InlayHintsOptions extends UserPreferences {
 yarn
 ```
 
-## Test
+### Test
 
 ```sh
 yarn test

package/lib/cli.js

@@ -30,32 +30,27 @@ const commander_1 = require("commander");
 const utils_1 = require("./utils");
 const lsp_connection_1 = require("./lsp-connection");
 const lsp = __importStar(require("vscode-languageserver/node"));
+const DEFAULT_LOG_LEVEL = lsp.MessageType.Info;
 const program = new commander_1.Command('typescript-language-server')
     // eslint-disable-next-line @typescript-eslint/no-require-imports, @typescript-eslint/no-var-requires
     .version(require('../package.json').version)
-    .option('--stdio', 'use stdio')
-    .option('--node-ipc', 'use node-ipc')
+    .requiredOption('--stdio', 'use stdio')
     .option('--log-level <logLevel>', 'A number indicating the log level (4 = log, 3 = info, 2 = warn, 1 = error). Defaults to `2`.')
-    .option('--socket <port>', 'use socket. example: --socket=5000')
     .option('--tsserver-log-file <tsserverLogFile>', 'Specify a tsserver log file. example: --tsserver-log-file ts-logs.txt')
     .option('--tsserver-log-verbosity <tsserverLogVerbosity>', 'Specify a tsserver log verbosity (terse, normal, verbose). Defaults to `normal`.' +
     ' example: --tsserver-log-verbosity verbose')
     .option('--tsserver-path <path>', `Specify path to tsserver. example: --tsserver-path=${(0, utils_1.getTsserverExecutable)()}`)
     .parse(process.argv);
 const options = program.opts();
-if (!(options.stdio || options.socket || options.nodeIpc)) {
-    console.error('Connection type required (stdio, node-ipc, socket). Refer to --help for more details.');
-    process.exit(1);
-}
 if (options.tsserverLogFile && !options.tsserverLogVerbosity) {
     options.tsserverLogVerbosity = 'normal';
 }
-let logLevel = lsp.MessageType.Warning;
+let logLevel = DEFAULT_LOG_LEVEL;
 if (options.logLevel) {
     logLevel = parseInt(options.logLevel, 10);
     if (logLevel && (logLevel < 1 || logLevel > 4)) {
         console.error(`Invalid '--log-level ${logLevel}'. Falling back to 'info' level.`);
-        logLevel = lsp.MessageType.Warning;
+        logLevel = DEFAULT_LOG_LEVEL;
     }
 }
 (0, lsp_connection_1.createLspConnection)({

package/lib/cli.js.map

@@ -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,MAAM,CAAC,SAAS,EAAE,WAAW,CAAC;KAC9B,MAAM,CAAC,YAAY,EAAE,cAAc,CAAC;KACpC,MAAM,CAAC,wBAAwB,EAAE,8FAA8F,CAAC;KAChI,MAAM,CAAC,iBAAiB,EAAE,oCAAoC,CAAC;KAC/D,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,CAAC,CAAC,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE;IACvD,OAAO,CAAC,KAAK,CAAC,uFAAuF,CAAC,CAAC;IACvG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;CACnB;AAED,IAAI,OAAO,CAAC,eAAe,IAAI,CAAC,OAAO,CAAC,oBAAoB,EAAE;IAC1D,OAAO,CAAC,oBAAoB,GAAG,QAAQ,CAAC;CAC3C;AAED,IAAI,QAAQ,GAAG,GAAG,CAAC,WAAW,CAAC,OAAO,CAAC;AACvC,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,GAAG,CAAC,WAAW,CAAC,OAAO,CAAC;KACtC;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"}
+{"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

@@ -4,8 +4,11 @@ export declare const Commands: {
     APPLY_REFACTORING: string;
     ORGANIZE_IMPORTS: string;
     APPLY_RENAME_FILE: string;
-    /** Commands below should be implemented by the client */
     APPLY_COMPLETION_CODE_ACTION: string;
+    /** Commands below should be implemented by the client */
     SELECT_REFACTORING: string;
 };
+export declare const CodeActions: {
+    SourceOrganizeImportsTsLs: string;
+};
 //# sourceMappingURL=commands.d.ts.map

package/lib/commands.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"commands.d.ts","sourceRoot":"","sources":["../src/commands.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,QAAQ;;;;;;IAMjB,yDAAyD;;;CAG5D,CAAC"}
+{"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

@@ -6,15 +6,18 @@
  * You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Commands = void 0;
+exports.CodeActions = exports.Commands = void 0;
 exports.Commands = {
     APPLY_WORKSPACE_EDIT: '_typescript.applyWorkspaceEdit',
     APPLY_CODE_ACTION: '_typescript.applyCodeAction',
     APPLY_REFACTORING: '_typescript.applyRefactoring',
     ORGANIZE_IMPORTS: '_typescript.organizeImports',
     APPLY_RENAME_FILE: '_typescript.applyRenameFile',
-    /** Commands below should be implemented by the client */
     APPLY_COMPLETION_CODE_ACTION: '_typescript.applyCompletionCodeAction',
+    /** Commands below should be implemented by the client */
     SELECT_REFACTORING: '_typescript.selectRefactoring'
 };
+exports.CodeActions = {
+    SourceOrganizeImportsTsLs: 'source.organizeImports.ts-ls'
+};
 //# sourceMappingURL=commands.js.map

package/lib/commands.js.map

@@ -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,yDAAyD;IACzD,4BAA4B,EAAE,uCAAuC;IACrE,kBAAkB,EAAE,+BAA+B;CACtD,CAAC"}
+{"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

@@ -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,CA2D1I;AA6ED,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,GAAG,CAAC,cAAc,EAAE,OAAO,EAAE,GAAG,CAAC,sBAAsB,GAAG,GAAG,CAAC,cAAc,CAK1H"}
+{"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

@@ -36,25 +36,29 @@ function asCompletionItem(entry, file, position, document) {
         kind: asCompletionItemKind(entry.kind),
         sortText: entry.sortText,
         commitCharacters: asCommitCharacters(entry.kind),
+        preselect: entry.isRecommended,
         data: {
             file,
             line: position.line + 1,
             offset: position.character + 1,
             entryNames: [
-                entry.source ? { name: entry.name, source: entry.source } : entry.name
+                entry.source || entry.data ? {
+                    name: entry.name,
+                    source: entry.source,
+                    data: entry.data
+                } : entry.name
             ]
         }
     };
-    if (entry.isRecommended) {
-        // Make sure isRecommended property always comes first
-        // https://github.com/Microsoft/vscode/issues/40325
-        item.preselect = true;
-    }
-    else if (entry.source) {
+    if (entry.source && entry.hasAction) {
         // De-prioritze auto-imports
         // https://github.com/Microsoft/vscode/issues/40311
         item.sortText = '\uffff' + entry.sortText;
     }
+    const { sourceDisplay } = entry;
+    if (sourceDisplay) {
+        item.detail = (0, protocol_translation_1.asPlainText)(sourceDisplay);
+    }
     if (item.kind === lsp.CompletionItemKind.Function || item.kind === lsp.CompletionItemKind.Method) {
         item.insertTextFormat = lsp.InsertTextFormat.Snippet;
     }
@@ -69,7 +73,7 @@ function asCompletionItem(entry, file, position, document) {
     }
     if (entry.kindModifiers) {
         const kindModifiers = new Set(entry.kindModifiers.split(/,|\s+/g));
-        if (kindModifiers.has('optional')) {
+        if (kindModifiers.has(tsp_command_types_1.KindModifiers.optional)) {
             if (!insertText) {
                 insertText = item.label;
             }
@@ -78,9 +82,25 @@ function asCompletionItem(entry, file, position, document) {
             }
             item.label += '?';
         }
-        if (kindModifiers.has('deprecated')) {
+        if (kindModifiers.has(tsp_command_types_1.KindModifiers.deprecated)) {
             item.tags = [lsp.CompletionItemTag.Deprecated];
         }
+        if (kindModifiers.has(tsp_command_types_1.KindModifiers.color)) {
+            item.kind = lsp.CompletionItemKind.Color;
+        }
+        if (entry.kind === tsp_command_types_1.ScriptElementKind.scriptElement) {
+            for (const extModifier of tsp_command_types_1.KindModifiers.fileExtensionKindModifiers) {
+                if (kindModifiers.has(extModifier)) {
+                    if (entry.name.toLowerCase().endsWith(extModifier)) {
+                        item.detail = entry.name;
+                    }
+                    else {
+                        item.detail = entry.name + extModifier;
+                    }
+                    break;
+                }
+            }
+        }
     }
     if (insertText && replacementRange) {
         item.textEdit = lsp.TextEdit.replace(replacementRange, insertText);
@@ -163,25 +183,21 @@ function asCommitCharacters(kind) {
     return commitCharacters.length === 0 ? undefined : commitCharacters;
 }
 function asResolvedCompletionItem(item, details) {
+    var _a;
     item.detail = asDetail(details);
     item.documentation = (0, protocol_translation_1.asDocumentation)(details);
-    Object.assign(item, asCodeActions(details, item.data.file));
+    if ((_a = details.codeActions) === null || _a === void 0 ? void 0 : _a.length) {
+        const filepath = (0, protocol_translation_1.normalizePath)(item.data.file);
+        item.additionalTextEdits = asAdditionalTextEdits(details.codeActions, filepath);
+        item.command = asCommand(details.codeActions, item.data.file);
+    }
     return item;
 }
 exports.asResolvedCompletionItem = asResolvedCompletionItem;
-function asCodeActions(details, filepath) {
-    if (!details.codeActions || !details.codeActions.length) {
-        return {};
-    }
+function asAdditionalTextEdits(codeActions, filepath) {
     // Try to extract out the additionalTextEdits for the current file.
-    // Also check if we still have to apply other workspace edits and commands
-    // using a vscode command
     const additionalTextEdits = [];
-    let hasRemainingCommandsOrEdits = false;
-    for (const tsAction of details.codeActions) {
-        if (tsAction.commands) {
-            hasRemainingCommandsOrEdits = true;
-        }
+    for (const tsAction of codeActions) {
         // Apply all edits in the current file using `additionalTextEdits`
         if (tsAction.changes) {
             for (const change of tsAction.changes) {
@@ -190,29 +206,39 @@ function asCodeActions(details, filepath) {
                         additionalTextEdits.push((0, protocol_translation_1.toTextEdit)(textChange));
                     }
                 }
-                else {
+            }
+        }
+    }
+    return additionalTextEdits.length ? additionalTextEdits : undefined;
+}
+function asCommand(codeActions, filepath) {
+    let hasRemainingCommandsOrEdits = false;
+    for (const tsAction of codeActions) {
+        if (tsAction.commands) {
+            hasRemainingCommandsOrEdits = true;
+            break;
+        }
+        if (tsAction.changes) {
+            for (const change of tsAction.changes) {
+                if (change.fileName !== filepath) {
                     hasRemainingCommandsOrEdits = true;
+                    break;
                 }
             }
         }
     }
-    let command = undefined;
     if (hasRemainingCommandsOrEdits) {
         // Create command that applies all edits not in the current file.
-        command = {
+        return {
             title: '',
             command: commands_1.Commands.APPLY_COMPLETION_CODE_ACTION,
-            arguments: [filepath, details.codeActions.map(codeAction => ({
+            arguments: [filepath, codeActions.map(codeAction => ({
                     commands: codeAction.commands,
                     description: codeAction.description,
                     changes: codeAction.changes.filter(x => x.fileName !== filepath)
                 }))]
         };
     }
-    return {
-        command,
-        additionalTextEdits: additionalTextEdits.length ? additionalTextEdits : undefined
-    };
 }
 function asDetail({ displayParts, sourceDisplay, source: deprecatedSource }) {
     const result = [];