typescript-language-server 2.0.1 → 2.2.0

package/lib/lsp-server.d.ts

@@ -1,9 +1,8 @@
 import * as lsp from 'vscode-languageserver';
 import * as lspcalls from './lsp-protocol.calls.proposed.js';
 import * as lspinlayHints from './lsp-protocol.inlayHints.proposed.js';
-import tsp from 'typescript/lib/protocol.d.js';
 import { LspDocument } from './document.js';
-import { TypeScriptInitializeParams } from './ts-protocol.js';
+import { tsp, TypeScriptInitializeParams } from './ts-protocol.js';
 import { TypeScriptServiceConfiguration } from './utils/configuration.js';
 export declare class LspServer {
     private options;
@@ -20,9 +19,10 @@ export declare class LspServer {
     closeAll(): void;
     shutdown(): void;
     private get tspClient();
-    private findTypescriptVersion;
     initialize(params: TypeScriptInitializeParams): Promise<lsp.InitializeResult>;
+    private findTypescriptVersion;
     private getLogDirectoryPath;
+    private setCompilerOptionsForInferredProjects;
     didChangeConfiguration(params: lsp.DidChangeConfigurationParams): void;
     protected diagnosticsTokenSource: lsp.CancellationTokenSource | undefined;
     protected interuptDiagnostics<R>(f: () => R): R;
@@ -48,7 +48,11 @@ export declare class LspServer {
     completionResolve(item: lsp.CompletionItem): Promise<lsp.CompletionItem>;
     hover(params: lsp.TextDocumentPositionParams): Promise<lsp.Hover>;
     protected getQuickInfo(file: string, position: lsp.Position): Promise<tsp.QuickInfoResponse | undefined>;
-    rename(params: lsp.RenameParams): Promise<lsp.WorkspaceEdit | undefined>;
+    prepareRename(params: lsp.PrepareRenameParams): Promise<lsp.Range | {
+        range: lsp.Range;
+        placeholder: string;
+    } | undefined | null>;
+    rename(params: lsp.RenameParams): Promise<lsp.WorkspaceEdit | undefined | null>;
     references(params: lsp.ReferenceParams): Promise<lsp.Location[]>;
     documentFormatting(params: lsp.DocumentFormattingParams): Promise<lsp.TextEdit[]>;
     documentRangeFormatting(params: lsp.DocumentRangeFormattingParams): Promise<lsp.TextEdit[]>;
@@ -71,7 +75,7 @@ export declare class LspServer {
     foldingRanges(params: lsp.FoldingRangeParams): Promise<lsp.FoldingRange[] | undefined>;
     protected asFoldingRange(span: tsp.OutliningSpan, document: LspDocument): lsp.FoldingRange | undefined;
     protected asFoldingRangeKind(span: tsp.OutliningSpan): lsp.FoldingRangeKind | undefined;
-    protected onTsEvent(event: protocol.Event): Promise<void>;
+    protected onTsEvent(event: tsp.Event): Promise<void>;
     calls(params: lspcalls.CallsParams): Promise<lspcalls.CallsResult>;
     inlayHints(params: lsp.InlayHintParams): Promise<lsp.InlayHint[] | undefined>;
     inlayHintsLegacy(params: lspinlayHints.InlayHintsParams): Promise<lspinlayHints.InlayHintsResult>;

package/lib/lsp-server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lsp-server.d.ts","sourceRoot":"","sources":["../src/lsp-server.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"lsp-server.d.ts","sourceRoot":"","sources":["../src/lsp-server.ts"],"names":[],"mappings":"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"}

package/lib/lsp-server.js

@@ -14,7 +14,7 @@ import API from './utils/api.js';
 import { LogLevel, PrefixingLogger } from './utils/logger.js';
 import { TspClient } from './tsp-client.js';
 import { DiagnosticEventQueue } from './diagnostic-queue.js';
-import { toDocumentHighlight, asTagsDocumentation, uriToPath, toSymbolKind, toLocation, pathToUri, toTextEdit, asPlainText, normalizePath } from './protocol-translation.js';
+import { toDocumentHighlight, uriToPath, toSymbolKind, toLocation, pathToUri, toTextEdit, normalizePath } from './protocol-translation.js';
 import { LspDocuments } from './document.js';
 import { asCompletionItem, asResolvedCompletionItem, getCompletionTriggerCharacter } from './completion.js';
 import { asSignatureHelp, toTsTriggerReason } from './hover.js';
@@ -22,17 +22,23 @@ import { Commands } from './commands.js';
 import { provideQuickFix } from './quickfix.js';
 import { provideRefactors } from './refactor.js';
 import { provideOrganizeImports } from './organize-imports.js';
+import { tsp } from './ts-protocol.js';
 import { collectDocumentSymbols, collectSymbolInformation } from './document-symbol.js';
 import { computeCallers, computeCallees } from './calls.js';
+import { TsServerLogLevel } from './utils/configuration.js';
 import { TypeScriptAutoFixProvider } from './features/fix-all.js';
 import { TypeScriptInlayHintsProvider } from './features/inlay-hints.js';
 import { SourceDefinitionCommand } from './features/source-definition.js';
 import { LogDirectoryProvider } from './tsServer/logDirectoryProvider.js';
 import { Trace } from './tsServer/tracer.js';
 import { TypeScriptVersionProvider } from './tsServer/versionProvider.js';
+import { MarkdownString } from './utils/MarkdownString.js';
+import * as Previewer from './utils/previewer.js';
+import { getInferredProjectCompilerOptions } from './utils/tsconfig.js';
 import { Position, Range } from './utils/typeConverters.js';
 import { CodeActionKind } from './utils/types.js';
 import { ConfigurationManager } from './configuration-manager.js';
+var CommandTypes = tsp.CommandTypes;
 export class LspServer {
     constructor(options) {
         this.options = options;
@@ -65,30 +71,6 @@ export class LspServer {
         }
         return this._tspClient;
     }
-    findTypescriptVersion() {
-        const typescriptVersionProvider = new TypeScriptVersionProvider(this.options, this.logger);
-        // User-provided tsserver path.
-        const userSettingVersion = typescriptVersionProvider.getUserSettingVersion();
-        if (userSettingVersion) {
-            if (userSettingVersion.isValid) {
-                return userSettingVersion;
-            }
-            this.logger.logIgnoringVerbosity(LogLevel.Warning, `Typescript specified through --tsserver-path ignored due to invalid path "${userSettingVersion.path}"`);
-        }
-        // Workspace version.
-        if (this.workspaceRoot) {
-            const workspaceVersion = typescriptVersionProvider.getWorkspaceVersion([this.workspaceRoot]);
-            if (workspaceVersion) {
-                return workspaceVersion;
-            }
-        }
-        // Bundled version
-        const bundledVersion = typescriptVersionProvider.bundledVersion();
-        if (bundledVersion && bundledVersion.isValid) {
-            return bundledVersion;
-        }
-        return null;
-    }
     async initialize(params) {
         this.logger.log('initialize', params);
         if (this._tspClient) {
@@ -108,12 +90,12 @@ export class LspServer {
             globalPlugins.push(plugin.name);
             pluginProbeLocations.push(plugin.location);
         }
-        const typescriptVersion = this.findTypescriptVersion();
+        const typescriptVersion = this.findTypescriptVersion(tsserver?.path);
         if (typescriptVersion) {
             this.logger.logIgnoringVerbosity(LogLevel.Info, `Using Typescript version (${typescriptVersion.source}) ${typescriptVersion.versionString} from path "${typescriptVersion.tsServerPath}"`);
         }
         else {
-            throw Error('Could not find a valid TypeScript installation. Please ensure that the "typescript" dependency is installed in the workspace or that a valid --tsserver-path is specified. Exiting.');
+            throw Error('Could not find a valid TypeScript installation. Please ensure that the "typescript" dependency is installed in the workspace or that a valid `tsserver.path` is specified. Exiting.');
         }
         this.configurationManager.mergeTsPreferences(userInitializationOptions.preferences || {});
         // Setup supported features.
@@ -141,12 +123,13 @@ export class LspServer {
             useLabelDetailsInCompletionEntries: this.features.completionLabelDetails,
         });
         this.diagnosticQueue = new DiagnosticEventQueue(diagnostics => this.options.lspClient.publishDiagnostics(diagnostics), this.documents, this.features, this.logger);
+        const tsserverLogVerbosity = tsserver?.logVerbosity && TsServerLogLevel.fromString(tsserver?.logVerbosity);
         this._tspClient = new TspClient({
             lspClient: this.options.lspClient,
             trace: Trace.fromString(tsserver?.trace || 'off'),
             typescriptVersion,
             logDirectoryProvider: new LogDirectoryProvider(this.getLogDirectoryPath(userInitializationOptions)),
-            logVerbosity: this.options.tsserverLogVerbosity,
+            logVerbosity: tsserverLogVerbosity ?? this.options.tsserverLogVerbosity,
             disableAutomaticTypingAcquisition,
             maxTsServerMemory,
             npmLocation,
@@ -156,10 +139,10 @@ export class LspServer {
             logger: this.options.logger,
             onEvent: this.onTsEvent.bind(this),
             onExit: (exitCode, signal) => {
+                this.shutdown();
                 if (exitCode) {
-                    this.logger.error(`tsserver process has exited (exit code: ${exitCode}, signal: ${signal}). Stopping the server.`);
+                    throw new Error(`tsserver process has exited (exit code: ${exitCode}, signal: ${signal}). Stopping the server.`);
                 }
-                this.shutdown();
             },
         });
         const started = this.tspClient.start();
@@ -173,19 +156,9 @@ export class LspServer {
             process.exit();
         });
         this.typeScriptAutoFixProvider = new TypeScriptAutoFixProvider(this.tspClient);
-        await Promise.all([
-            this.configurationManager.setAndConfigureTspClient(this.workspaceRoot, this._tspClient, hostInfo),
-            this.tspClient.request("compilerOptionsForInferredProjects" /* CommandTypes.CompilerOptionsForInferredProjects */, {
-                options: {
-                    module: "CommonJS" /* tsp.ModuleKind.CommonJS */,
-                    target: "ES2016" /* tsp.ScriptTarget.ES2016 */,
-                    jsx: "Preserve" /* tsp.JsxEmit.Preserve */,
-                    allowJs: true,
-                    allowSyntheticDefaultImports: true,
-                    allowNonTsExtensions: true,
-                },
-            }),
-        ]);
+        this.configurationManager.setAndConfigureTspClient(this.workspaceRoot, this._tspClient, hostInfo);
+        this.setCompilerOptionsForInferredProjects();
+        const prepareSupport = textDocument?.rename?.prepareSupport && this.tspClient.apiVersion.gte(API.v310);
         const initializeResult = {
             capabilities: {
                 textDocumentSync: lsp.TextDocumentSyncKind.Incremental,
@@ -210,6 +183,7 @@ export class LspServer {
                         Commands.APPLY_WORKSPACE_EDIT,
                         Commands.APPLY_CODE_ACTION,
                         Commands.APPLY_REFACTORING,
+                        Commands.CONFIGURE_PLUGIN,
                         Commands.ORGANIZE_IMPORTS,
                         Commands.APPLY_RENAME_FILE,
                         Commands.SOURCE_DEFINITION,
@@ -217,7 +191,7 @@ export class LspServer {
                 },
                 hoverProvider: true,
                 inlayHintProvider: true,
-                renameProvider: true,
+                renameProvider: prepareSupport ? { prepareProvider: true } : true,
                 referencesProvider: true,
                 signatureHelpProvider: {
                     triggerCharacters: ['(', ',', '<'],
@@ -264,6 +238,30 @@ export class LspServer {
         this.logger.log('onInitialize result', initializeResult);
         return initializeResult;
     }
+    findTypescriptVersion(userTsserverPath) {
+        const typescriptVersionProvider = new TypeScriptVersionProvider(userTsserverPath || this.options.tsserverPath, this.logger);
+        // User-provided tsserver path.
+        const userSettingVersion = typescriptVersionProvider.getUserSettingVersion();
+        if (userSettingVersion) {
+            if (userSettingVersion.isValid) {
+                return userSettingVersion;
+            }
+            this.logger.logIgnoringVerbosity(LogLevel.Warning, `Typescript specified through user setting ignored due to invalid path "${userSettingVersion.path}"`);
+        }
+        // Workspace version.
+        if (this.workspaceRoot) {
+            const workspaceVersion = typescriptVersionProvider.getWorkspaceVersion([this.workspaceRoot]);
+            if (workspaceVersion) {
+                return workspaceVersion;
+            }
+        }
+        // Bundled version
+        const bundledVersion = typescriptVersionProvider.bundledVersion();
+        if (bundledVersion && bundledVersion.isValid) {
+            return bundledVersion;
+        }
+        return null;
+    }
     getLogDirectoryPath(initializationOptions) {
         if (initializationOptions.tsserver?.logDirectory) {
             return initializationOptions.tsserver.logDirectory;
@@ -273,8 +271,21 @@ export class LspServer {
         }
         return undefined;
     }
+    setCompilerOptionsForInferredProjects() {
+        const args = {
+            options: {
+                ...getInferredProjectCompilerOptions(this.configurationManager.workspaceConfiguration.implicitProjectConfiguration),
+                allowJs: true,
+                allowNonTsExtensions: true,
+                allowSyntheticDefaultImports: true,
+                resolveJsonModule: true,
+            },
+        };
+        this.tspClient.executeWithoutWaitingForResponse(CommandTypes.CompilerOptionsForInferredProjects, args);
+    }
     didChangeConfiguration(params) {
         this.configurationManager.setWorkspaceConfiguration(params.settings || {});
+        this.setCompilerOptionsForInferredProjects();
         const ignoredDiagnosticCodes = this.configurationManager.workspaceConfiguration.diagnostics?.ignoredCodes || [];
         this.diagnosticQueue?.updateIgnoredDiagnosticCodes(ignoredDiagnosticCodes);
     }
@@ -318,7 +329,7 @@ export class LspServer {
             return;
         }
         if (this.documents.open(file, params.textDocument)) {
-            this.tspClient.notify("open" /* CommandTypes.Open */, {
+            this.tspClient.notify(CommandTypes.Open, {
                 file,
                 fileContent: params.textDocument.text,
                 scriptKindName: this.getScriptKindName(params.textDocument.languageId),
@@ -360,7 +371,7 @@ export class LspServer {
         if (!document) {
             return;
         }
-        this.tspClient.notify("close" /* CommandTypes.Close */, { file });
+        this.tspClient.notify(CommandTypes.Close, { file });
         // We won't be updating diagnostics anymore for that file, so clear them
         // so we don't leave stale ones.
         this.options.lspClient.publishDiagnostics({
@@ -401,7 +412,7 @@ export class LspServer {
                 endLine = endPos.line + 1;
                 endOffset = endPos.character + 1;
             }
-            this.tspClient.notify("change" /* CommandTypes.Change */, {
+            this.tspClient.notify(CommandTypes.Change, {
                 file,
                 line,
                 offset,
@@ -418,19 +429,19 @@ export class LspServer {
     }
     async definition(params) {
         return this.getDefinition({
-            type: this.features.definitionLinkSupport ? "definitionAndBoundSpan" /* CommandTypes.DefinitionAndBoundSpan */ : "definition" /* CommandTypes.Definition */,
+            type: this.features.definitionLinkSupport ? CommandTypes.DefinitionAndBoundSpan : CommandTypes.Definition,
             params,
         });
     }
     async implementation(params) {
         return this.getSymbolLocations({
-            type: "implementation" /* CommandTypes.Implementation */,
+            type: CommandTypes.Implementation,
             params,
         });
     }
     async typeDefinition(params) {
         return this.getSymbolLocations({
-            type: "typeDefinition" /* CommandTypes.TypeDefinition */,
+            type: CommandTypes.TypeDefinition,
             params,
         });
     }
@@ -440,7 +451,7 @@ export class LspServer {
         if (!file) {
             return undefined;
         }
-        if (type === "definitionAndBoundSpan" /* CommandTypes.DefinitionAndBoundSpan */) {
+        if (type === CommandTypes.DefinitionAndBoundSpan) {
             const args = Position.toFileLocationRequestArgs(file, params.position);
             const response = await this.tspClient.request(type, args);
             if (response.type !== 'response' || !response.body) {
@@ -462,7 +473,7 @@ export class LspServer {
                 };
             });
         }
-        return this.getSymbolLocations({ type: "definition" /* CommandTypes.Definition */, params });
+        return this.getSymbolLocations({ type: CommandTypes.Definition, params });
     }
     async getSymbolLocations({ type, params }) {
         const file = uriToPath(params.textDocument.uri);
@@ -483,7 +494,7 @@ export class LspServer {
         if (!file) {
             return [];
         }
-        const response = await this.tspClient.request("navtree" /* CommandTypes.NavTree */, {
+        const response = await this.tspClient.request(CommandTypes.NavTree, {
             file,
         });
         const tree = response.body;
@@ -524,7 +535,7 @@ export class LspServer {
         }
         const completionOptions = this.configurationManager.workspaceConfiguration.completions || {};
         try {
-            const result = await this.interuptDiagnostics(() => this.tspClient.request("completionInfo" /* CommandTypes.CompletionInfo */, {
+            const result = await this.interuptDiagnostics(() => this.tspClient.request(CommandTypes.CompletionInfo, {
                 file,
                 line: params.position.line + 1,
                 offset: params.position.character + 1,
@@ -541,7 +552,7 @@ export class LspServer {
                 if (entry.kind === 'warning') {
                     continue;
                 }
-                const completion = asCompletionItem(entry, optionalReplacementSpan, file, params.position, document, completionOptions, this.features);
+                const completion = asCompletionItem(entry, optionalReplacementSpan, file, params.position, document, this.documents, completionOptions, this.features);
                 if (!completion) {
                     continue;
                 }
@@ -562,12 +573,12 @@ export class LspServer {
     async completionResolve(item) {
         this.logger.log('completion/resolve', item);
         await this.configurationManager.configureGloballyFromDocument(item.data.file);
-        const { body } = await this.interuptDiagnostics(() => this.tspClient.request("completionEntryDetails" /* CommandTypes.CompletionDetails */, item.data));
+        const { body } = await this.interuptDiagnostics(() => this.tspClient.request(CommandTypes.CompletionDetails, item.data));
         const details = body && body.length && body[0];
         if (!details) {
             return item;
         }
-        return asResolvedCompletionItem(item, details, this.tspClient, this.configurationManager.workspaceConfiguration.completions || {}, this.features);
+        return asResolvedCompletionItem(item, details, this.tspClient, this.documents, this.configurationManager.workspaceConfiguration.completions || {}, this.features);
     }
     async hover(params) {
         const file = uriToPath(params.textDocument.uri);
@@ -579,22 +590,20 @@ export class LspServer {
         if (!result || !result.body) {
             return { contents: [] };
         }
-        const range = Range.fromTextSpan(result.body);
-        const contents = [];
-        if (result.body.displayString) {
-            contents.push({ language: 'typescript', value: result.body.displayString });
+        const contents = new MarkdownString();
+        const { displayString, documentation, tags } = result.body;
+        if (displayString) {
+            contents.appendCodeblock('typescript', displayString);
         }
-        const tags = asTagsDocumentation(result.body.tags);
-        const documentation = asPlainText(result.body.documentation);
-        contents.push(documentation + (tags ? '\n\n' + tags : ''));
+        Previewer.addMarkdownDocumentation(contents, documentation, tags, this.documents);
         return {
-            contents,
-            range,
+            contents: contents.toMarkupContent(),
+            range: Range.fromTextSpan(result.body),
         };
     }
     async getQuickInfo(file, position) {
         try {
-            return await this.tspClient.request("quickinfo" /* CommandTypes.Quickinfo */, {
+            return await this.tspClient.request(CommandTypes.Quickinfo, {
                 file,
                 line: position.line + 1,
                 offset: position.character + 1,
@@ -604,19 +613,30 @@ export class LspServer {
             return undefined;
         }
     }
+    async prepareRename(params) {
+        const file = uriToPath(params.textDocument.uri);
+        if (!file) {
+            return null;
+        }
+        const result = await this.tspClient.request(CommandTypes.Rename, Position.toFileLocationRequestArgs(file, params.position));
+        const renameInfo = result.body?.info;
+        if (!renameInfo) {
+            return null;
+        }
+        if (!renameInfo.canRename) {
+            throw new Error(renameInfo.localizedErrorMessage);
+        }
+        return Range.fromTextSpan(renameInfo.triggerSpan);
+    }
     async rename(params) {
         const file = uriToPath(params.textDocument.uri);
         this.logger.log('onRename', params, file);
         if (!file) {
-            return undefined;
+            return null;
         }
-        const result = await this.tspClient.request("rename" /* CommandTypes.Rename */, {
-            file,
-            line: params.position.line + 1,
-            offset: params.position.character + 1,
-        });
+        const result = await this.tspClient.request(CommandTypes.Rename, Position.toFileLocationRequestArgs(file, params.position));
         if (!result.body || !result.body.info.canRename || result.body.locs.length === 0) {
-            return undefined;
+            return null;
         }
         const workspaceEdit = {};
         result.body.locs
@@ -644,7 +664,7 @@ export class LspServer {
         if (!file) {
             return [];
         }
-        const result = await this.tspClient.request("references" /* CommandTypes.References */, {
+        const result = await this.tspClient.request(CommandTypes.References, {
             file,
             line: params.position.line + 1,
             offset: params.position.character + 1,
@@ -664,7 +684,7 @@ export class LspServer {
         }
         const formatOptions = params.options;
         await this.configurationManager.configureGloballyFromDocument(file, formatOptions);
-        const response = await this.tspClient.request("format" /* CommandTypes.Format */, {
+        const response = await this.tspClient.request(CommandTypes.Format, {
             file,
             line: 1,
             offset: 1,
@@ -685,7 +705,7 @@ export class LspServer {
         }
         const formatOptions = params.options;
         await this.configurationManager.configureGloballyFromDocument(file, formatOptions);
-        const response = await this.tspClient.request("format" /* CommandTypes.Format */, {
+        const response = await this.tspClient.request(CommandTypes.Format, {
             file,
             line: params.range.start.line + 1,
             offset: params.range.start.character + 1,
@@ -708,12 +728,12 @@ export class LspServer {
         if (!response || !response.body) {
             return undefined;
         }
-        return asSignatureHelp(response.body, params.context);
+        return asSignatureHelp(response.body, params.context, this.documents);
     }
     async getSignatureHelp(file, params) {
         try {
             const { position, context } = params;
-            return await this.tspClient.request("signatureHelp" /* CommandTypes.SignatureHelp */, {
+            return await this.tspClient.request(CommandTypes.SignatureHelp, {
                 file,
                 line: position.line + 1,
                 offset: position.character + 1,
@@ -772,7 +792,7 @@ export class LspServer {
             errorCodes,
         };
         try {
-            return await this.tspClient.request("getCodeFixes" /* CommandTypes.GetCodeFixes */, args);
+            return await this.tspClient.request(CommandTypes.GetCodeFixes, args);
         }
         catch (err) {
             return undefined;
@@ -785,7 +805,7 @@ export class LspServer {
             kind: context.only?.length === 1 ? context.only[0] : undefined,
         };
         try {
-            return await this.tspClient.request("getApplicableRefactors" /* CommandTypes.GetApplicableRefactors */, args);
+            return await this.tspClient.request(CommandTypes.GetApplicableRefactors, args);
         }
         catch (err) {
             return undefined;
@@ -794,7 +814,7 @@ export class LspServer {
     async getOrganizeImports(args) {
         try {
             await this.configurationManager.configureGloballyFromDocument(args.scope.args.file);
-            return await this.tspClient.request("organizeImports" /* CommandTypes.OrganizeImports */, args);
+            return await this.tspClient.request(CommandTypes.OrganizeImports, args);
         }
         catch (err) {
             return undefined;
@@ -813,13 +833,13 @@ export class LspServer {
             }
             if (codeAction.commands && codeAction.commands.length) {
                 for (const command of codeAction.commands) {
-                    await this.tspClient.request("applyCodeActionCommand" /* CommandTypes.ApplyCodeActionCommand */, { command });
+                    await this.tspClient.request(CommandTypes.ApplyCodeActionCommand, { command });
                 }
             }
         }
         else if (arg.command === Commands.APPLY_REFACTORING && arg.arguments) {
             const args = arg.arguments[0];
-            const { body } = await this.tspClient.request("getEditsForRefactor" /* CommandTypes.GetEditsForRefactor */, args);
+            const { body } = await this.tspClient.request(CommandTypes.GetEditsForRefactor, args);
             if (!body || !body.edits.length) {
                 return;
             }
@@ -839,11 +859,20 @@ export class LspServer {
                 });
             }
         }
+        else if (arg.command === Commands.CONFIGURE_PLUGIN && arg.arguments) {
+            const [pluginName, configuration] = arg.arguments;
+            if (this.tspClient?.apiVersion.gte(API.v314)) {
+                this.tspClient.executeWithoutWaitingForResponse(CommandTypes.ConfigurePlugin, {
+                    configuration,
+                    pluginName,
+                });
+            }
+        }
         else if (arg.command === Commands.ORGANIZE_IMPORTS && arg.arguments) {
             const file = arg.arguments[0];
             const additionalArguments = arg.arguments[1] || {};
             await this.configurationManager.configureGloballyFromDocument(file);
-            const { body } = await this.tspClient.request("organizeImports" /* CommandTypes.OrganizeImports */, {
+            const { body } = await this.tspClient.request(CommandTypes.OrganizeImports, {
                 scope: {
                     type: 'file',
                     args: { file },
@@ -862,7 +891,7 @@ export class LspServer {
                 await this.applyFileCodeEdits(codeAction.changes);
                 if (codeAction.commands && codeAction.commands.length) {
                     for (const command of codeAction.commands) {
-                        await this.tspClient.request("applyCodeActionCommand" /* CommandTypes.ApplyCodeActionCommand */, { command });
+                        await this.tspClient.request(CommandTypes.ApplyCodeActionCommand, { command });
                     }
                 }
                 // Execute only the first code action.
@@ -902,7 +931,7 @@ export class LspServer {
             return [];
         }
         try {
-            const { body } = await this.tspClient.request("getEditsForFileRename" /* CommandTypes.GetEditsForFileRename */, {
+            const { body } = await this.tspClient.request(CommandTypes.GetEditsForFileRename, {
                 oldFilePath,
                 newFilePath,
             });
@@ -920,7 +949,7 @@ export class LspServer {
         }
         let response;
         try {
-            response = await this.tspClient.request("documentHighlights" /* CommandTypes.DocumentHighlights */, {
+            response = await this.tspClient.request(CommandTypes.DocumentHighlights, {
                 file,
                 line: arg.position.line + 1,
                 offset: arg.position.character + 1,
@@ -948,7 +977,7 @@ export class LspServer {
         return this.documents.files[0] || this.workspaceRoot;
     }
     async workspaceSymbol(params) {
-        const result = await this.tspClient.request("navto" /* CommandTypes.Navto */, {
+        const result = await this.tspClient.request(CommandTypes.Navto, {
             file: this.lastFileOrDummy(),
             searchValue: params.query,
         });
@@ -982,7 +1011,7 @@ export class LspServer {
         if (!document) {
             throw new Error("The document should be opened for foldingRanges', file: " + file);
         }
-        const { body } = await this.tspClient.request("getOutliningSpans" /* CommandTypes.GetOutliningSpans */, { file });
+        const { body } = await this.tspClient.request(CommandTypes.GetOutliningSpans, { file });
         if (!body) {
             return undefined;
         }
@@ -1071,7 +1100,7 @@ export class LspServer {
             character: 0,
         });
         try {
-            const result = await this.tspClient.request("provideInlayHints" /* CommandTypes.ProvideInlayHints */, {
+            const result = await this.tspClient.request(CommandTypes.ProvideInlayHints, {
                 file,
                 start: start,
                 length: end - start,
@@ -1128,7 +1157,7 @@ export class LspServer {
     }
     async getSemanticTokens(doc, file, startOffset, endOffset) {
         try {
-            const result = await this.tspClient.request("encodedSemanticClassifications-full" /* CommandTypes.EncodedSemanticClassificationsFull */, {
+            const result = await this.tspClient.request(CommandTypes.EncodedSemanticClassificationsFull, {
                 file,
                 start: startOffset,
                 length: endOffset - startOffset,