typescript-language-server 0.11.0 → 1.0.0

package/lib/lsp-server.js

@@ -1,33 +1,9 @@
-"use strict";
 /*
  * Copyright (C) 2017, 2018 TypeFox and others.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
  */
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -37,34 +13,61 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
+import * as path from 'node:path';
+import fs from 'fs-extra';
+import debounce from 'p-debounce';
+import { temporaryFile } from 'tempy';
+import * as lsp from 'vscode-languageserver';
+import * as lspcalls from './lsp-protocol.calls.proposed.js';
+import * as lspsemanticTokens from './semantic-tokens.js';
+import API from './utils/api.js';
+import { PrefixingLogger } from './logger.js';
+import { TspClient } from './tsp-client.js';
+import { DiagnosticEventQueue } from './diagnostic-queue.js';
+import { toDocumentHighlight, asRange, asTagsDocumentation, uriToPath, toSymbolKind, toLocation, toPosition, pathToUri, toTextEdit, toFileRangeRequestArgs, asPlainText, normalizePath } from './protocol-translation.js';
+import { LspDocuments } from './document.js';
+import { asCompletionItem, asResolvedCompletionItem, getCompletionTriggerCharacter } from './completion.js';
+import { asSignatureHelp } from './hover.js';
+import { Commands } from './commands.js';
+import { provideQuickFix } from './quickfix.js';
+import { provideRefactors } from './refactor.js';
+import { provideOrganizeImports } from './organize-imports.js';
+import { collectDocumentSymbols, collectSymbolInformation } from './document-symbol.js';
+import { computeCallers, computeCallees } from './calls.js';
+import { TypeScriptVersionProvider } from './utils/versionProvider.js';
+import { TypeScriptAutoFixProvider } from './features/fix-all.js';
+import { CodeActionKind } from './utils/types.js';
+const DEFAULT_TSSERVER_PREFERENCES = {
+    allowIncompleteCompletions: true,
+    allowRenameOfImportPath: true,
+    allowTextChangesInNewFiles: true,
+    disableSuggestions: false,
+    displayPartsForJSDoc: true,
+    generateReturnInDocTemplate: true,
+    importModuleSpecifierEnding: 'auto',
+    importModuleSpecifierPreference: 'shortest',
+    includeAutomaticOptionalChainCompletions: true,
+    includeCompletionsForImportStatements: true,
+    includeCompletionsForModuleExports: true,
+    includeCompletionsWithClassMemberSnippets: true,
+    includeCompletionsWithInsertText: true,
+    includeCompletionsWithObjectLiteralMethodSnippets: true,
+    includeCompletionsWithSnippetText: true,
+    includeInlayEnumMemberValueHints: false,
+    includeInlayFunctionLikeReturnTypeHints: false,
+    includeInlayFunctionParameterTypeHints: false,
+    includeInlayParameterNameHints: 'none',
+    includeInlayParameterNameHintsWhenArgumentMatchesName: false,
+    includeInlayPropertyDeclarationTypeHints: false,
+    includeInlayVariableTypeHints: false,
+    includePackageJsonAutoImports: 'auto',
+    jsxAttributeCompletionStyle: 'auto',
+    lazyConfiguredProjectsFromExternalProject: false,
+    providePrefixAndSuffixTextForRename: true,
+    provideRefactorNotApplicableReason: false,
+    quotePreference: 'auto',
+    useLabelDetailsInCompletionEntries: true
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.LspServer = void 0;
-const path = __importStar(require("path"));
-const tempy_1 = __importDefault(require("tempy"));
-const lsp = __importStar(require("vscode-languageserver/node"));
-const lspcalls = __importStar(require("./lsp-protocol.calls.proposed"));
-const lspsemanticTokens = __importStar(require("./semantic-tokens"));
-const fs = __importStar(require("fs-extra"));
-const p_debounce_1 = __importDefault(require("p-debounce"));
-const logger_1 = require("./logger");
-const tsp_client_1 = require("./tsp-client");
-const diagnostic_queue_1 = require("./diagnostic-queue");
-const protocol_translation_1 = require("./protocol-translation");
-const document_1 = require("./document");
-const completion_1 = require("./completion");
-const hover_1 = require("./hover");
-const commands_1 = require("./commands");
-const quickfix_1 = require("./quickfix");
-const refactor_1 = require("./refactor");
-const organize_imports_1 = require("./organize-imports");
-const document_symbol_1 = require("./document-symbol");
-const calls_1 = require("./calls");
-const versionProvider_1 = require("./utils/versionProvider");
-const fix_all_1 = require("./features/fix-all");
-const types_1 = require("./utils/types");
 class ServerInitializingIndicator {
     constructor(lspClient) {
         this.lspClient = lspClient;
@@ -96,15 +99,16 @@ class ServerInitializingIndicator {
         }
     }
 }
-class LspServer {
+export class LspServer {
     constructor(options) {
         this.options = options;
-        this.documents = new document_1.LspDocuments();
+        this.features = {};
+        this.documents = new LspDocuments();
         // True if diagnostic request is currently debouncing or the request is in progress. False only if there are
         // no pending requests.
         this.pendingDebouncedRequest = false;
-        this.doRequestDiagnosticsDebounced = (0, p_debounce_1.default)(() => this.doRequestDiagnostics(), 200);
-        this.logger = new logger_1.PrefixingLogger(options.logger, '[lspserver]');
+        this.doRequestDiagnosticsDebounced = debounce(() => this.doRequestDiagnostics(), 200);
+        this.logger = new PrefixingLogger(options.logger, '[lspserver]');
         this.workspaceConfiguration = {};
     }
     closeAll() {
@@ -112,8 +116,30 @@ class LspServer {
             this.closeDocument(file);
         }
     }
+    shutdown() {
+        if (this._tspClient) {
+            this._tspClient.shutdown();
+            this._tspClient = null;
+        }
+        if (this._loadingIndicator) {
+            this._loadingIndicator.reset();
+            this._loadingIndicator = null;
+        }
+    }
+    get tspClient() {
+        if (!this._tspClient) {
+            throw new Error('TS client not created. Did you forget to send the "initialize" request?');
+        }
+        return this._tspClient;
+    }
+    get loadingIndicator() {
+        if (!this._loadingIndicator) {
+            throw new Error('Loading indicator not created. Did you forget to send the "initialize" request?');
+        }
+        return this._loadingIndicator;
+    }
     findTypescriptVersion() {
-        const typescriptVersionProvider = new versionProvider_1.TypeScriptVersionProvider(this.options, this.logger);
+        const typescriptVersionProvider = new TypeScriptVersionProvider(this.options, this.logger);
         // User-provided tsserver path.
         const userSettingVersion = typescriptVersionProvider.getUserSettingVersion();
         if (userSettingVersion) {
@@ -137,21 +163,23 @@ class LspServer {
         return null;
     }
     initialize(params) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d, _e, _f, _g;
         return __awaiter(this, void 0, void 0, function* () {
             this.logger.log('initialize', params);
+            if (this._tspClient) {
+                throw new Error('The "initialize" request has already called before.');
+            }
             this.initializeParams = params;
             const clientCapabilities = this.initializeParams.capabilities;
             this.options.lspClient.setClientCapabilites(clientCapabilities);
-            this.loadingIndicator = new ServerInitializingIndicator(this.options.lspClient);
-            this.workspaceRoot = this.initializeParams.rootUri ? (0, protocol_translation_1.uriToPath)(this.initializeParams.rootUri) : this.initializeParams.rootPath || undefined;
-            this.diagnosticQueue = new diagnostic_queue_1.DiagnosticEventQueue(diagnostics => this.options.lspClient.publishDiagnostics(diagnostics), this.documents, (_a = clientCapabilities.textDocument) === null || _a === void 0 ? void 0 : _a.publishDiagnostics, this.logger);
+            this._loadingIndicator = new ServerInitializingIndicator(this.options.lspClient);
+            this.workspaceRoot = this.initializeParams.rootUri ? uriToPath(this.initializeParams.rootUri) : this.initializeParams.rootPath || undefined;
+            this.diagnosticQueue = new DiagnosticEventQueue(diagnostics => this.options.lspClient.publishDiagnostics(diagnostics), this.documents, (_a = clientCapabilities.textDocument) === null || _a === void 0 ? void 0 : _a.publishDiagnostics, this.logger);
             const userInitializationOptions = this.initializeParams.initializationOptions || {};
             const { disableAutomaticTypingAcquisition, hostInfo, maxTsServerMemory, npmLocation, locale } = userInitializationOptions;
-            const { logVerbosity, plugins, preferences } = {
+            const { logVerbosity, plugins } = {
                 logVerbosity: userInitializationOptions.logVerbosity || this.options.tsserverLogVerbosity,
-                plugins: userInitializationOptions.plugins || [],
-                preferences: Object.assign({ allowIncompleteCompletions: true, allowRenameOfImportPath: true, allowTextChangesInNewFiles: true, displayPartsForJSDoc: true, generateReturnInDocTemplate: true, includeAutomaticOptionalChainCompletions: true, includeCompletionsForImportStatements: true, includeCompletionsForModuleExports: true, includeCompletionsWithClassMemberSnippets: true, includeCompletionsWithInsertText: true, includeCompletionsWithSnippetText: true, jsxAttributeCompletionStyle: 'auto', providePrefixAndSuffixTextForRename: true }, userInitializationOptions.preferences)
+                plugins: userInitializationOptions.plugins || []
             };
             const logFile = this.getLogFile(logVerbosity);
             const globalPlugins = [];
@@ -167,7 +195,14 @@ class LspServer {
             else {
                 throw Error('Could not find a valid tsserver executable in the workspace or in the $PATH. Please ensure that the "typescript" dependency is installed in either location. Exiting.');
             }
-            this.tspClient = new tsp_client_1.TspClient({
+            const userPreferences = Object.assign(Object.assign({}, DEFAULT_TSSERVER_PREFERENCES), userInitializationOptions.preferences);
+            if (userPreferences.useLabelDetailsInCompletionEntries
+                && ((_d = (_c = (_b = clientCapabilities.textDocument) === null || _b === void 0 ? void 0 : _b.completion) === null || _c === void 0 ? void 0 : _c.completionItem) === null || _d === void 0 ? void 0 : _d.labelDetailsSupport)
+                && ((_e = typescriptVersion.version) === null || _e === void 0 ? void 0 : _e.gte(API.v470))) {
+                this.features.labelDetails = true;
+            }
+            const finalPreferences = Object.assign(Object.assign({}, userPreferences), { useLabelDetailsInCompletionEntries: this.features.labelDetails });
+            this._tspClient = new TspClient({
                 tsserverPath: typescriptVersion.tsServerPath,
                 logFile,
                 logVerbosity,
@@ -180,9 +215,10 @@ class LspServer {
                 logger: this.options.logger,
                 onEvent: this.onTsEvent.bind(this),
                 onExit: (exitCode, signal) => {
-                    this.logger.error(`tsserver process has exited (exit code: ${exitCode}, signal: ${signal}). Stopping the server.`);
-                    // Allow the log to be dispatched to the client.
-                    setTimeout(() => process.exit(1));
+                    if (exitCode) {
+                        this.logger.error(`tsserver process has exited (exit code: ${exitCode}, signal: ${signal}). Stopping the server.`);
+                    }
+                    this.shutdown();
                 }
             });
             const started = this.tspClient.start();
@@ -190,32 +226,29 @@ class LspServer {
                 throw new Error('tsserver process has failed to start.');
             }
             process.on('exit', () => {
-                this.tspClient.shutdown();
-                if (this.loadingIndicator) {
-                    this.loadingIndicator.reset();
-                }
+                this.shutdown();
             });
             process.on('SIGINT', () => {
                 process.exit();
             });
-            this.typeScriptAutoFixProvider = new fix_all_1.TypeScriptAutoFixProvider(this.tspClient);
+            this.typeScriptAutoFixProvider = new TypeScriptAutoFixProvider(this.tspClient);
             yield Promise.all([
-                this.tspClient.request("configure" /* Configure */, Object.assign(Object.assign({}, hostInfo ? { hostInfo } : {}), { formatOptions: {
+                this.tspClient.request("configure" /* CommandTypes.Configure */, Object.assign(Object.assign({}, hostInfo ? { hostInfo } : {}), { formatOptions: {
                         // We can use \n here since the editor should normalize later on to its line endings.
                         newLineCharacter: '\n'
-                    }, preferences })),
-                this.tspClient.request("compilerOptionsForInferredProjects" /* CompilerOptionsForInferredProjects */, {
+                    }, preferences: finalPreferences })),
+                this.tspClient.request("compilerOptionsForInferredProjects" /* CommandTypes.CompilerOptionsForInferredProjects */, {
                     options: {
-                        module: "CommonJS" /* CommonJS */,
-                        target: "ES2016" /* ES2016 */,
-                        jsx: "Preserve" /* Preserve */,
+                        module: "CommonJS" /* tsp.ModuleKind.CommonJS */,
+                        target: "ES2016" /* tsp.ScriptTarget.ES2016 */,
+                        jsx: "Preserve" /* tsp.JsxEmit.Preserve */,
                         allowJs: true,
                         allowSyntheticDefaultImports: true,
                         allowNonTsExtensions: true
                     }
                 })
             ]);
-            const logFileUri = logFile && (0, protocol_translation_1.pathToUri)(logFile, undefined);
+            const logFileUri = logFile && pathToUri(logFile, undefined);
             this.initializeResult = {
                 capabilities: {
                     textDocumentSync: lsp.TextDocumentSyncKind.Incremental,
@@ -223,8 +256,13 @@ class LspServer {
                         triggerCharacters: ['.', '"', '\'', '/', '@', '<'],
                         resolveProvider: true
                     },
-                    codeActionProvider: ((_c = (_b = clientCapabilities.textDocument) === null || _b === void 0 ? void 0 : _b.codeAction) === null || _c === void 0 ? void 0 : _c.codeActionLiteralSupport)
-                        ? { codeActionKinds: [...fix_all_1.TypeScriptAutoFixProvider.kinds.map(kind => kind.value), types_1.CodeActionKind.SourceOrganizeImportsTs.value] } : true,
+                    codeActionProvider: ((_g = (_f = clientCapabilities.textDocument) === null || _f === void 0 ? void 0 : _f.codeAction) === null || _g === void 0 ? void 0 : _g.codeActionLiteralSupport)
+                        ? { codeActionKinds: [
+                                ...TypeScriptAutoFixProvider.kinds.map(kind => kind.value),
+                                CodeActionKind.SourceOrganizeImportsTs.value,
+                                CodeActionKind.QuickFix.value,
+                                CodeActionKind.Refactor.value
+                            ] } : true,
                     definitionProvider: true,
                     documentFormattingProvider: true,
                     documentRangeFormattingProvider: true,
@@ -232,11 +270,11 @@ class LspServer {
                     documentSymbolProvider: true,
                     executeCommandProvider: {
                         commands: [
-                            commands_1.Commands.APPLY_WORKSPACE_EDIT,
-                            commands_1.Commands.APPLY_CODE_ACTION,
-                            commands_1.Commands.APPLY_REFACTORING,
-                            commands_1.Commands.ORGANIZE_IMPORTS,
-                            commands_1.Commands.APPLY_RENAME_FILE
+                            Commands.APPLY_WORKSPACE_EDIT,
+                            Commands.APPLY_CODE_ACTION,
+                            Commands.APPLY_REFACTORING,
+                            Commands.ORGANIZE_IMPORTS,
+                            Commands.APPLY_RENAME_FILE
                         ]
                     },
                     hoverProvider: true,
@@ -297,7 +335,7 @@ class LspServer {
             fs.ensureFileSync(logFile);
             return logFile;
         }
-        return tempy_1.default.file({ name: 'tsserver.log' });
+        return temporaryFile({ name: 'tsserver.log' });
     }
     doGetLogFile() {
         if (process.env.TSSERVER_LOG_FILE) {
@@ -348,7 +386,7 @@ class LspServer {
             this.diagnosticsTokenSource = geterrTokenSource;
             const { files } = this.documents;
             try {
-                return yield this.tspClient.request("geterr" /* Geterr */, { delay: 0, files }, this.diagnosticsTokenSource.token);
+                return yield this.tspClient.request("geterr" /* CommandTypes.Geterr */, { delay: 0, files }, this.diagnosticsTokenSource.token);
             }
             finally {
                 if (this.diagnosticsTokenSource === geterrTokenSource) {
@@ -364,13 +402,13 @@ class LspServer {
         }
     }
     didOpenTextDocument(params) {
-        const file = (0, protocol_translation_1.uriToPath)(params.textDocument.uri);
+        const file = uriToPath(params.textDocument.uri);
         this.logger.log('onDidOpenTextDocument', params, file);
         if (!file) {
             return;
         }
         if (this.documents.open(file, params.textDocument)) {
-            this.tspClient.notify("open" /* Open */, {
+            this.tspClient.notify("open" /* CommandTypes.Open */, {
                 file,
                 fileContent: params.textDocument.text,
                 scriptKindName: this.getScriptKindName(params.textDocument.languageId),
@@ -400,7 +438,7 @@ class LspServer {
         return undefined;
     }
     didCloseTextDocument(params) {
-        const file = (0, protocol_translation_1.uriToPath)(params.textDocument.uri);
+        const file = uriToPath(params.textDocument.uri);
         this.logger.log('onDidCloseTextDocument', params, file);
         if (!file) {
             return;
@@ -412,7 +450,7 @@ class LspServer {
         if (!document) {
             return;
         }
-        this.tspClient.notify("close" /* Close */, { file });
+        this.tspClient.notify("close" /* 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({
@@ -422,7 +460,7 @@ class LspServer {
     }
     didChangeTextDocument(params) {
         const { textDocument } = params;
-        const file = (0, protocol_translation_1.uriToPath)(textDocument.uri);
+        const file = uriToPath(textDocument.uri);
         this.logger.log('onDidChangeTextDocument', params, file);
         if (!file) {
             return;
@@ -453,7 +491,7 @@ class LspServer {
                 endLine = endPos.line + 1;
                 endOffset = endPos.character + 1;
             }
-            this.tspClient.notify("change" /* Change */, {
+            this.tspClient.notify("change" /* CommandTypes.Change */, {
                 file,
                 line,
                 offset,
@@ -495,7 +533,7 @@ class LspServer {
     }
     getDefinition({ type, params }) {
         return __awaiter(this, void 0, void 0, function* () {
-            const file = (0, protocol_translation_1.uriToPath)(params.textDocument.uri);
+            const file = uriToPath(params.textDocument.uri);
             this.logger.log(type, params, file);
             if (!file) {
                 return [];
@@ -505,17 +543,17 @@ class LspServer {
                 line: params.position.line + 1,
                 offset: params.position.character + 1
             });
-            return result.body ? result.body.map(fileSpan => (0, protocol_translation_1.toLocation)(fileSpan, this.documents)) : [];
+            return result.body ? result.body.map(fileSpan => toLocation(fileSpan, this.documents)) : [];
         });
     }
     documentSymbol(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const file = (0, protocol_translation_1.uriToPath)(params.textDocument.uri);
+            const file = uriToPath(params.textDocument.uri);
             this.logger.log('symbol', params, file);
             if (!file) {
                 return [];
             }
-            const response = yield this.tspClient.request("navtree" /* NavTree */, {
+            const response = yield this.tspClient.request("navtree" /* CommandTypes.NavTree */, {
                 file
             });
             const tree = response.body;
@@ -525,13 +563,13 @@ class LspServer {
             if (this.supportHierarchicalDocumentSymbol) {
                 const symbols = [];
                 for (const item of tree.childItems) {
-                    (0, document_symbol_1.collectDocumentSymbols)(item, symbols);
+                    collectDocumentSymbols(item, symbols);
                 }
                 return symbols;
             }
             const symbols = [];
             for (const item of tree.childItems) {
-                (0, document_symbol_1.collectSymbolInformation)(params.textDocument.uri, item, symbols);
+                collectSymbolInformation(params.textDocument.uri, item, symbols);
             }
             return symbols;
         });
@@ -547,7 +585,7 @@ class LspServer {
      */
     completion(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const file = (0, protocol_translation_1.uriToPath)(params.textDocument.uri);
+            const file = uriToPath(params.textDocument.uri);
             this.logger.log('completion', params, file);
             if (!file) {
                 return lsp.CompletionList.create([]);
@@ -557,15 +595,20 @@ class LspServer {
                 throw new Error('The document should be opened for completion, file: ' + file);
             }
             try {
-                const result = yield this.interuptDiagnostics(() => this.tspClient.request("completionInfo" /* CompletionInfo */, {
-                    file,
-                    line: params.position.line + 1,
-                    offset: params.position.character + 1
-                }));
+                const result = yield this.interuptDiagnostics(() => {
+                    var _a, _b;
+                    return this.tspClient.request("completionInfo" /* CommandTypes.CompletionInfo */, {
+                        file,
+                        line: params.position.line + 1,
+                        offset: params.position.character + 1,
+                        triggerCharacter: getCompletionTriggerCharacter((_a = params.context) === null || _a === void 0 ? void 0 : _a.triggerCharacter),
+                        triggerKind: (_b = params.context) === null || _b === void 0 ? void 0 : _b.triggerKind
+                    });
+                });
                 const { body } = result;
                 const completions = (body ? body.entries : [])
                     .filter(entry => entry.kind !== 'warning')
-                    .map(entry => (0, completion_1.asCompletionItem)(entry, file, params.position, document));
+                    .map(entry => asCompletionItem(entry, file, params.position, document, this.features));
                 return lsp.CompletionList.create(completions, body === null || body === void 0 ? void 0 : body.isIncomplete);
             }
             catch (error) {
@@ -582,20 +625,20 @@ class LspServer {
     completionResolve(item) {
         return __awaiter(this, void 0, void 0, function* () {
             this.logger.log('completion/resolve', item);
-            yield this.tspClient.request("configure" /* Configure */, {
+            yield this.tspClient.request("configure" /* CommandTypes.Configure */, {
                 formatOptions: this.getWorkspacePreferencesForDocument(item.data.file).format
             });
-            const { body } = yield this.interuptDiagnostics(() => this.tspClient.request("completionEntryDetails" /* CompletionDetails */, item.data));
+            const { body } = yield this.interuptDiagnostics(() => this.tspClient.request("completionEntryDetails" /* CommandTypes.CompletionDetails */, item.data));
             const details = body && body.length && body[0];
             if (!details) {
                 return item;
             }
-            return (0, completion_1.asResolvedCompletionItem)(item, details, this.tspClient, this.workspaceConfiguration.completions || {});
+            return asResolvedCompletionItem(item, details, this.tspClient, this.workspaceConfiguration.completions || {});
         });
     }
     hover(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const file = (0, protocol_translation_1.uriToPath)(params.textDocument.uri);
+            const file = uriToPath(params.textDocument.uri);
             this.logger.log('hover', params, file);
             if (!file) {
                 return { contents: [] };
@@ -604,13 +647,13 @@ class LspServer {
             if (!result || !result.body) {
                 return { contents: [] };
             }
-            const range = (0, protocol_translation_1.asRange)(result.body);
+            const range = asRange(result.body);
             const contents = [];
             if (result.body.displayString) {
                 contents.push({ language: 'typescript', value: result.body.displayString });
             }
-            const tags = (0, protocol_translation_1.asTagsDocumentation)(result.body.tags);
-            const documentation = (0, protocol_translation_1.asPlainText)(result.body.documentation);
+            const tags = asTagsDocumentation(result.body.tags);
+            const documentation = asPlainText(result.body.documentation);
             contents.push(documentation + (tags ? '\n\n' + tags : ''));
             return {
                 contents,
@@ -621,7 +664,7 @@ class LspServer {
     getQuickInfo(file, position) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                return yield this.tspClient.request("quickinfo" /* Quickinfo */, {
+                return yield this.tspClient.request("quickinfo" /* CommandTypes.Quickinfo */, {
                     file,
                     line: position.line + 1,
                     offset: position.character + 1
@@ -634,12 +677,12 @@ class LspServer {
     }
     rename(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const file = (0, protocol_translation_1.uriToPath)(params.textDocument.uri);
+            const file = uriToPath(params.textDocument.uri);
             this.logger.log('onRename', params, file);
             if (!file) {
                 return undefined;
             }
-            const result = yield this.tspClient.request("rename" /* Rename */, {
+            const result = yield this.tspClient.request("rename" /* CommandTypes.Rename */, {
                 file,
                 line: params.position.line + 1,
                 offset: params.position.character + 1
@@ -652,13 +695,13 @@ class LspServer {
             };
             result.body.locs
                 .forEach((spanGroup) => {
-                const uri = (0, protocol_translation_1.pathToUri)(spanGroup.file, this.documents), textEdits = workspaceEdit.changes[uri] || (workspaceEdit.changes[uri] = []);
+                const uri = pathToUri(spanGroup.file, this.documents), textEdits = workspaceEdit.changes[uri] || (workspaceEdit.changes[uri] = []);
                 spanGroup.locs.forEach((textSpan) => {
                     textEdits.push({
                         newText: `${textSpan.prefixText || ''}${params.newName}${textSpan.suffixText || ''}`,
                         range: {
-                            start: (0, protocol_translation_1.toPosition)(textSpan.start),
-                            end: (0, protocol_translation_1.toPosition)(textSpan.end)
+                            start: toPosition(textSpan.start),
+                            end: toPosition(textSpan.end)
                         }
                     });
                 });
@@ -668,12 +711,12 @@ class LspServer {
     }
     references(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const file = (0, protocol_translation_1.uriToPath)(params.textDocument.uri);
+            const file = uriToPath(params.textDocument.uri);
             this.logger.log('onReferences', params, file);
             if (!file) {
                 return [];
             }
-            const result = yield this.tspClient.request("references" /* References */, {
+            const result = yield this.tspClient.request("references" /* CommandTypes.References */, {
                 file,
                 line: params.position.line + 1,
                 offset: params.position.character + 1
@@ -683,22 +726,22 @@ class LspServer {
             }
             return result.body.refs
                 .filter(fileSpan => params.context.includeDeclaration || !fileSpan.isDefinition)
-                .map(fileSpan => (0, protocol_translation_1.toLocation)(fileSpan, this.documents));
+                .map(fileSpan => toLocation(fileSpan, this.documents));
         });
     }
     documentFormatting(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const file = (0, protocol_translation_1.uriToPath)(params.textDocument.uri);
+            const file = uriToPath(params.textDocument.uri);
             this.logger.log('documentFormatting', params, file);
             if (!file) {
                 return [];
             }
             const formatOptions = this.getFormattingOptions(file, params.options);
             // options are not yet supported in tsserver, but we can send a configure request first
-            yield this.tspClient.request("configure" /* Configure */, {
+            yield this.tspClient.request("configure" /* CommandTypes.Configure */, {
                 formatOptions
             });
-            const response = yield this.tspClient.request("format" /* Format */, {
+            const response = yield this.tspClient.request("format" /* CommandTypes.Format */, {
                 file,
                 line: 1,
                 offset: 1,
@@ -707,24 +750,24 @@ class LspServer {
                 options: formatOptions
             });
             if (response.body) {
-                return response.body.map(e => (0, protocol_translation_1.toTextEdit)(e));
+                return response.body.map(e => toTextEdit(e));
             }
             return [];
         });
     }
     documentRangeFormatting(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const file = (0, protocol_translation_1.uriToPath)(params.textDocument.uri);
+            const file = uriToPath(params.textDocument.uri);
             this.logger.log('documentRangeFormatting', params, file);
             if (!file) {
                 return [];
             }
             const formatOptions = this.getFormattingOptions(file, params.options);
             // options are not yet supported in tsserver, but we can send a configure request first
-            yield this.tspClient.request("configure" /* Configure */, {
+            yield this.tspClient.request("configure" /* CommandTypes.Configure */, {
                 formatOptions
             });
-            const response = yield this.tspClient.request("format" /* Format */, {
+            const response = yield this.tspClient.request("format" /* CommandTypes.Format */, {
                 file,
                 line: params.range.start.line + 1,
                 offset: params.range.start.character + 1,
@@ -733,7 +776,7 @@ class LspServer {
                 options: formatOptions
             });
             if (response.body) {
-                return response.body.map(e => (0, protocol_translation_1.toTextEdit)(e));
+                return response.body.map(e => toTextEdit(e));
             }
             return [];
         });
@@ -760,7 +803,7 @@ class LspServer {
     }
     signatureHelp(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const file = (0, protocol_translation_1.uriToPath)(params.textDocument.uri);
+            const file = uriToPath(params.textDocument.uri);
             this.logger.log('signatureHelp', params, file);
             if (!file) {
                 return undefined;
@@ -769,13 +812,13 @@ class LspServer {
             if (!response || !response.body) {
                 return undefined;
             }
-            return (0, hover_1.asSignatureHelp)(response.body);
+            return asSignatureHelp(response.body);
         });
     }
     getSignatureHelp(file, position) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                return yield this.tspClient.request("signatureHelp" /* SignatureHelp */, {
+                return yield this.tspClient.request("signatureHelp" /* CommandTypes.SignatureHelp */, {
                     file,
                     line: position.line + 1,
                     offset: position.character + 1
@@ -789,23 +832,23 @@ class LspServer {
     codeAction(params) {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
-            const file = (0, protocol_translation_1.uriToPath)(params.textDocument.uri);
+            const file = uriToPath(params.textDocument.uri);
             this.logger.log('codeAction', params, file);
             if (!file) {
                 return [];
             }
-            const args = (0, protocol_translation_1.toFileRangeRequestArgs)(file, params.range);
+            const args = toFileRangeRequestArgs(file, params.range);
             const actions = [];
-            const kinds = (_a = params.context.only) === null || _a === void 0 ? void 0 : _a.map(kind => new types_1.CodeActionKind(kind));
-            if (!kinds || kinds.some(kind => kind.contains(types_1.CodeActionKind.QuickFix))) {
+            const kinds = (_a = params.context.only) === null || _a === void 0 ? void 0 : _a.map(kind => new CodeActionKind(kind));
+            if (!kinds || kinds.some(kind => kind.contains(CodeActionKind.QuickFix))) {
                 const errorCodes = params.context.diagnostics.map(diagnostic => Number(diagnostic.code));
-                actions.push(...(0, quickfix_1.provideQuickFix)(yield this.getCodeFixes(Object.assign(Object.assign({}, args), { errorCodes })), this.documents));
+                actions.push(...provideQuickFix(yield this.getCodeFixes(Object.assign(Object.assign({}, args), { errorCodes })), this.documents));
             }
-            if (!kinds || kinds.some(kind => kind.contains(types_1.CodeActionKind.Refactor))) {
-                actions.push(...(0, refactor_1.provideRefactors)(yield this.getRefactors(args), args));
+            if (!kinds || kinds.some(kind => kind.contains(CodeActionKind.Refactor))) {
+                actions.push(...provideRefactors(yield this.getRefactors(args), args));
             }
             // organize import is provided by tsserver for any line, so we only get it if explicitly requested
-            if (kinds === null || kinds === void 0 ? void 0 : kinds.some(kind => kind.contains(types_1.CodeActionKind.SourceOrganizeImportsTs))) {
+            if (kinds === null || kinds === void 0 ? void 0 : kinds.some(kind => kind.contains(CodeActionKind.SourceOrganizeImportsTs))) {
                 // see this issue for more context about how this argument is used
                 // https://github.com/microsoft/TypeScript/issues/43051
                 const skipDestructiveCodeActions = params.context.diagnostics.some(
@@ -815,7 +858,7 @@ class LspServer {
                     scope: { type: 'file', args },
                     skipDestructiveCodeActions
                 });
-                actions.push(...(0, organize_imports_1.provideOrganizeImports)(response, this.documents));
+                actions.push(...provideOrganizeImports(response, this.documents));
             }
             // TODO: Since we rely on diagnostics pointing at errors in the correct places, we can't proceed if we are not
             // sure that diagnostics are up-to-date. Thus we check `pendingDebouncedRequest` to see if there are *any*
@@ -834,7 +877,7 @@ class LspServer {
     getCodeFixes(args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                return yield this.tspClient.request("getCodeFixes" /* GetCodeFixes */, args);
+                return yield this.tspClient.request("getCodeFixes" /* CommandTypes.GetCodeFixes */, args);
             }
             catch (err) {
                 return undefined;
@@ -844,7 +887,7 @@ class LspServer {
     getRefactors(args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                return yield this.tspClient.request("getApplicableRefactors" /* GetApplicableRefactors */, args);
+                return yield this.tspClient.request("getApplicableRefactors" /* CommandTypes.GetApplicableRefactors */, args);
             }
             catch (err) {
                 return undefined;
@@ -855,10 +898,10 @@ class LspServer {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 // Pass format options to organize imports
-                yield this.tspClient.request("configure" /* Configure */, {
+                yield this.tspClient.request("configure" /* CommandTypes.Configure */, {
                     formatOptions: this.getWorkspacePreferencesForDocument(args.scope.args.file).format
                 });
-                return yield this.tspClient.request("organizeImports" /* OrganizeImports */, args);
+                return yield this.tspClient.request("organizeImports" /* CommandTypes.OrganizeImports */, args);
             }
             catch (err) {
                 return undefined;
@@ -868,26 +911,26 @@ class LspServer {
     executeCommand(arg) {
         return __awaiter(this, void 0, void 0, function* () {
             this.logger.log('executeCommand', arg);
-            if (arg.command === commands_1.Commands.APPLY_WORKSPACE_EDIT && arg.arguments) {
+            if (arg.command === Commands.APPLY_WORKSPACE_EDIT && arg.arguments) {
                 const edit = arg.arguments[0];
                 yield this.options.lspClient.applyWorkspaceEdit({
                     edit
                 });
             }
-            else if (arg.command === commands_1.Commands.APPLY_CODE_ACTION && arg.arguments) {
+            else if (arg.command === Commands.APPLY_CODE_ACTION && arg.arguments) {
                 const codeAction = arg.arguments[0];
                 if (!(yield this.applyFileCodeEdits(codeAction.changes))) {
                     return;
                 }
                 if (codeAction.commands && codeAction.commands.length) {
                     for (const command of codeAction.commands) {
-                        yield this.tspClient.request("applyCodeActionCommand" /* ApplyCodeActionCommand */, { command });
+                        yield this.tspClient.request("applyCodeActionCommand" /* CommandTypes.ApplyCodeActionCommand */, { command });
                     }
                 }
             }
-            else if (arg.command === commands_1.Commands.APPLY_REFACTORING && arg.arguments) {
+            else if (arg.command === Commands.APPLY_REFACTORING && arg.arguments) {
                 const args = arg.arguments[0];
-                const { body } = yield this.tspClient.request("getEditsForRefactor" /* GetEditsForRefactor */, args);
+                const { body } = yield this.tspClient.request("getEditsForRefactor" /* CommandTypes.GetEditsForRefactor */, args);
                 if (!body || !body.edits.length) {
                     return;
                 }
@@ -901,19 +944,19 @@ class LspServer {
                 if (renameLocation) {
                     yield this.options.lspClient.rename({
                         textDocument: {
-                            uri: (0, protocol_translation_1.pathToUri)(args.file, this.documents)
+                            uri: pathToUri(args.file, this.documents)
                         },
-                        position: (0, protocol_translation_1.toPosition)(renameLocation)
+                        position: toPosition(renameLocation)
                     });
                 }
             }
-            else if (arg.command === commands_1.Commands.ORGANIZE_IMPORTS && arg.arguments) {
+            else if (arg.command === Commands.ORGANIZE_IMPORTS && arg.arguments) {
                 const file = arg.arguments[0];
                 const additionalArguments = arg.arguments[1] || {};
-                yield this.tspClient.request("configure" /* Configure */, {
+                yield this.tspClient.request("configure" /* CommandTypes.Configure */, {
                     formatOptions: this.getWorkspacePreferencesForDocument(file).format
                 });
-                const { body } = yield this.tspClient.request("organizeImports" /* OrganizeImports */, {
+                const { body } = yield this.tspClient.request("organizeImports" /* CommandTypes.OrganizeImports */, {
                     scope: {
                         type: 'file',
                         args: { file }
@@ -922,17 +965,17 @@ class LspServer {
                 });
                 yield this.applyFileCodeEdits(body);
             }
-            else if (arg.command === commands_1.Commands.APPLY_RENAME_FILE && arg.arguments) {
+            else if (arg.command === Commands.APPLY_RENAME_FILE && arg.arguments) {
                 const { sourceUri, targetUri } = arg.arguments[0];
                 this.applyRenameFile(sourceUri, targetUri);
             }
-            else if (arg.command === commands_1.Commands.APPLY_COMPLETION_CODE_ACTION && arg.arguments) {
+            else if (arg.command === Commands.APPLY_COMPLETION_CODE_ACTION && arg.arguments) {
                 const [_, codeActions] = arg.arguments;
                 for (const codeAction of codeActions) {
                     yield this.applyFileCodeEdits(codeAction.changes);
                     if (codeAction.commands && codeAction.commands.length) {
                         for (const command of codeAction.commands) {
-                            yield this.tspClient.request("applyCodeActionCommand" /* ApplyCodeActionCommand */, { command });
+                            yield this.tspClient.request("applyCodeActionCommand" /* CommandTypes.ApplyCodeActionCommand */, { command });
                         }
                     }
                     // Execute only the first code action.
@@ -951,7 +994,7 @@ class LspServer {
             }
             const changes = {};
             for (const edit of edits) {
-                changes[(0, protocol_translation_1.pathToUri)(edit.fileName, this.documents)] = edit.textChanges.map(protocol_translation_1.toTextEdit);
+                changes[pathToUri(edit.fileName, this.documents)] = edit.textChanges.map(toTextEdit);
             }
             const { applied } = yield this.options.lspClient.applyWorkspaceEdit({
                 edit: { changes }
@@ -967,13 +1010,13 @@ class LspServer {
     }
     getEditsForFileRename(sourceUri, targetUri) {
         return __awaiter(this, void 0, void 0, function* () {
-            const newFilePath = (0, protocol_translation_1.uriToPath)(targetUri);
-            const oldFilePath = (0, protocol_translation_1.uriToPath)(sourceUri);
+            const newFilePath = uriToPath(targetUri);
+            const oldFilePath = uriToPath(sourceUri);
             if (!newFilePath || !oldFilePath) {
                 return [];
             }
             try {
-                const { body } = yield this.tspClient.request("getEditsForFileRename" /* GetEditsForFileRename */, {
+                const { body } = yield this.tspClient.request("getEditsForFileRename" /* CommandTypes.GetEditsForFileRename */, {
                     oldFilePath,
                     newFilePath
                 });
@@ -986,14 +1029,14 @@ class LspServer {
     }
     documentHighlight(arg) {
         return __awaiter(this, void 0, void 0, function* () {
-            const file = (0, protocol_translation_1.uriToPath)(arg.textDocument.uri);
+            const file = uriToPath(arg.textDocument.uri);
             this.logger.log('documentHighlight', arg, file);
             if (!file) {
                 return [];
             }
             let response;
             try {
-                response = yield this.tspClient.request("documentHighlights" /* DocumentHighlights */, {
+                response = yield this.tspClient.request("documentHighlights" /* CommandTypes.DocumentHighlights */, {
                     file,
                     line: arg.position.line + 1,
                     offset: arg.position.character + 1,
@@ -1010,8 +1053,8 @@ class LspServer {
             for (const item of response.body) {
                 // tsp returns item.file with POSIX path delimiters, whereas file is platform specific.
                 // Converting to a URI and back to a path ensures consistency.
-                if ((0, protocol_translation_1.normalizePath)(item.file) === file) {
-                    const highlights = (0, protocol_translation_1.toDocumentHighlight)(item);
+                if (normalizePath(item.file) === file) {
+                    const highlights = toDocumentHighlight(item);
                     result.push(...highlights);
                 }
             }
@@ -1023,7 +1066,7 @@ class LspServer {
     }
     workspaceSymbol(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const result = yield this.tspClient.request("navto" /* Navto */, {
+            const result = yield this.tspClient.request("navto" /* CommandTypes.Navto */, {
                 file: this.lastFileOrDummy(),
                 searchValue: params.query
             });
@@ -1033,13 +1076,13 @@ class LspServer {
             return result.body.map(item => {
                 return {
                     location: {
-                        uri: (0, protocol_translation_1.pathToUri)(item.file, this.documents),
+                        uri: pathToUri(item.file, this.documents),
                         range: {
-                            start: (0, protocol_translation_1.toPosition)(item.start),
-                            end: (0, protocol_translation_1.toPosition)(item.end)
+                            start: toPosition(item.start),
+                            end: toPosition(item.end)
                         }
                     },
-                    kind: (0, protocol_translation_1.toSymbolKind)(item.kind),
+                    kind: toSymbolKind(item.kind),
                     name: item.name
                 };
             });
@@ -1050,7 +1093,7 @@ class LspServer {
      */
     foldingRanges(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const file = (0, protocol_translation_1.uriToPath)(params.textDocument.uri);
+            const file = uriToPath(params.textDocument.uri);
             this.logger.log('foldingRanges', params, file);
             if (!file) {
                 return undefined;
@@ -1059,7 +1102,7 @@ class LspServer {
             if (!document) {
                 throw new Error("The document should be opened for foldingRanges', file: " + file);
             }
-            const { body } = yield this.tspClient.request("getOutliningSpans" /* GetOutliningSpans */, { file });
+            const { body } = yield this.tspClient.request("getOutliningSpans" /* CommandTypes.GetOutliningSpans */, { file });
             if (!body) {
                 return undefined;
             }
@@ -1074,7 +1117,7 @@ class LspServer {
         });
     }
     asFoldingRange(span, document) {
-        const range = (0, protocol_translation_1.asRange)(span.textSpan);
+        const range = asRange(span.textSpan);
         const kind = this.asFoldingRangeKind(span);
         // workaround for https://github.com/Microsoft/vscode/issues/49904
         if (span.kind === 'comment') {
@@ -1103,15 +1146,15 @@ class LspServer {
     }
     onTsEvent(event) {
         var _a;
-        if (event.event === "semanticDiag" /* SementicDiag */ ||
-            event.event === "syntaxDiag" /* SyntaxDiag */ ||
-            event.event === "suggestionDiag" /* SuggestionDiag */) {
+        if (event.event === "semanticDiag" /* EventTypes.SementicDiag */ ||
+            event.event === "syntaxDiag" /* EventTypes.SyntaxDiag */ ||
+            event.event === "suggestionDiag" /* EventTypes.SuggestionDiag */) {
             (_a = this.diagnosticQueue) === null || _a === void 0 ? void 0 : _a.updateDiagnostics(event.event, event);
         }
-        else if (event.event === "projectLoadingStart" /* ProjectLoadingStart */) {
+        else if (event.event === "projectLoadingStart" /* EventTypes.ProjectLoadingStart */) {
             this.loadingIndicator.startedLoadingProject(event.body.projectName);
         }
-        else if (event.event === "projectLoadingFinish" /* ProjectLoadingFinish */) {
+        else if (event.event === "projectLoadingFinish" /* EventTypes.ProjectLoadingFinish */) {
             this.loadingIndicator.finishedLoadingProject(event.body.projectName);
         }
         else {
@@ -1123,17 +1166,17 @@ class LspServer {
     calls(params) {
         return __awaiter(this, void 0, void 0, function* () {
             let callsResult = { calls: [] };
-            const file = (0, protocol_translation_1.uriToPath)(params.textDocument.uri);
+            const file = uriToPath(params.textDocument.uri);
             this.logger.log('calls', params, file);
             if (!file) {
                 return callsResult;
             }
             if (params.direction === lspcalls.CallDirection.Outgoing) {
                 const documentProvider = (file) => this.documents.get(file);
-                callsResult = yield (0, calls_1.computeCallees)(this.tspClient, params, documentProvider);
+                callsResult = yield computeCallees(this.tspClient, params, documentProvider);
             }
             else {
-                callsResult = yield (0, calls_1.computeCallers)(this.tspClient, params);
+                callsResult = yield computeCallers(this.tspClient, params);
             }
             return callsResult;
         });
@@ -1141,12 +1184,12 @@ class LspServer {
     inlayHints(params) {
         var _a, _b, _c, _d, _e, _f;
         return __awaiter(this, void 0, void 0, function* () {
-            const file = (0, protocol_translation_1.uriToPath)(params.textDocument.uri);
+            const file = uriToPath(params.textDocument.uri);
             this.logger.log('inlayHints', params, file);
             if (!file) {
                 return { inlayHints: [] };
             }
-            yield this.tspClient.request("configure" /* Configure */, {
+            yield this.tspClient.request("configure" /* CommandTypes.Configure */, {
                 preferences: this.getInlayHintsOptions(file)
             });
             const doc = this.documents.get(file);
@@ -1162,7 +1205,7 @@ class LspServer {
                 character: 0
             });
             try {
-                const result = yield this.tspClient.request("provideInlayHints" /* ProvideInlayHints */, {
+                const result = yield this.tspClient.request("provideInlayHints" /* CommandTypes.ProvideInlayHints */, {
                     file,
                     start: start,
                     length: end - start
@@ -1170,7 +1213,7 @@ class LspServer {
                 return {
                     inlayHints: (_f = (_e = result.body) === null || _e === void 0 ? void 0 : _e.map((item) => ({
                         text: item.text,
-                        position: (0, protocol_translation_1.toPosition)(item.position),
+                        position: toPosition(item.position),
                         whitespaceAfter: item.whitespaceAfter,
                         whitespaceBefore: item.whitespaceBefore,
                         kind: item.kind
@@ -1192,7 +1235,7 @@ class LspServer {
     }
     semanticTokensFull(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const file = (0, protocol_translation_1.uriToPath)(params.textDocument.uri);
+            const file = uriToPath(params.textDocument.uri);
             this.logger.log('semanticTokensFull', params, file);
             if (!file) {
                 return { data: [] };
@@ -1214,7 +1257,7 @@ class LspServer {
     }
     semanticTokensRange(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const file = (0, protocol_translation_1.uriToPath)(params.textDocument.uri);
+            const file = uriToPath(params.textDocument.uri);
             this.logger.log('semanticTokensRange', params, file);
             if (!file) {
                 return { data: [] };
@@ -1232,7 +1275,7 @@ class LspServer {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const result = yield this.tspClient.request("encodedSemanticClassifications-full" /* EncodedSemanticClassificationsFull */, {
+                const result = yield this.tspClient.request("encodedSemanticClassifications-full" /* CommandTypes.EncodedSemanticClassificationsFull */, {
                     file,
                     start: startOffset,
                     length: endOffset - startOffset,
@@ -1247,5 +1290,4 @@ class LspServer {
         });
     }
 }
-exports.LspServer = LspServer;
 //# sourceMappingURL=lsp-server.js.map