typescript-language-server 0.11.1 → 1.1.0

package/lib/hover.d.ts

@@ -1,4 +1,5 @@
-import * as lsp from 'vscode-languageserver/node';
-import tsp from 'typescript/lib/protocol';
-export declare function asSignatureHelp(info: tsp.SignatureHelpItems): lsp.SignatureHelp;
+import * as lsp from 'vscode-languageserver';
+import type tsp from 'typescript/lib/protocol.d.js';
+export declare function asSignatureHelp(info: tsp.SignatureHelpItems, context?: lsp.SignatureHelpContext): lsp.SignatureHelp;
+export declare function toTsTriggerReason(context: lsp.SignatureHelpContext): tsp.SignatureHelpTriggerReason;
 //# sourceMappingURL=hover.d.ts.map

package/lib/hover.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hover.d.ts","sourceRoot":"","sources":["../src/hover.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,GAAG,MAAM,4BAA4B,CAAC;AAClD,OAAO,GAAG,MAAM,yBAAyB,CAAC;AAG1C,wBAAgB,eAAe,CAAC,IAAI,EAAE,GAAG,CAAC,kBAAkB,GAAG,GAAG,CAAC,aAAa,CAM/E"}
+{"version":3,"file":"hover.d.ts","sourceRoot":"","sources":["../src/hover.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,GAAG,MAAM,uBAAuB,CAAC;AAC7C,OAAO,KAAK,GAAG,MAAM,8BAA8B,CAAC;AAGpD,wBAAgB,eAAe,CAAC,IAAI,EAAE,GAAG,CAAC,kBAAkB,EAAE,OAAO,CAAC,EAAE,GAAG,CAAC,oBAAoB,GAAG,GAAG,CAAC,aAAa,CAOnH;AA+CD,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,GAAG,CAAC,oBAAoB,GAAG,GAAG,CAAC,0BAA0B,CAkBnG"}

package/lib/hover.js

@@ -1,24 +1,39 @@
-"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
  */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.asSignatureHelp = void 0;
-const protocol_translation_1 = require("./protocol-translation");
-function asSignatureHelp(info) {
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+import * as lsp from 'vscode-languageserver';
+import { asDocumentation, asPlainText } from './protocol-translation.js';
+export function asSignatureHelp(info, context) {
+    const signatures = info.items.map(asSignatureInformation);
     return {
-        activeSignature: info.selectedItemIndex,
+        activeSignature: getActiveSignature(info, signatures, context),
         activeParameter: getActiveParameter(info),
-        signatures: info.items.map(asSignatureInformation)
+        signatures,
     };
 }
-exports.asSignatureHelp = asSignatureHelp;
+function getActiveSignature(info, signatures, context) {
+    // Try matching the previous active signature's label to keep it selected
+    if (context?.activeSignatureHelp?.activeSignature !== undefined) {
+        const previouslyActiveSignature = context.activeSignatureHelp.signatures[context.activeSignatureHelp.activeSignature];
+        if (previouslyActiveSignature && context.isRetrigger) {
+            const existingIndex = signatures.findIndex(other => other.label === previouslyActiveSignature.label);
+            if (existingIndex !== -1) {
+                return existingIndex;
+            }
+        }
+    }
+    return info.selectedItemIndex;
+}
 function getActiveParameter(info) {
     const activeSignature = info.items[info.selectedItemIndex];
-    if (activeSignature && activeSignature.isVariadic) {
+    if (activeSignature?.isVariadic) {
         return Math.min(info.argumentIndex, activeSignature.parameters.length - 1);
     }
     return info.argumentIndex;
@@ -26,21 +41,42 @@ function getActiveParameter(info) {
 function asSignatureInformation(item) {
     const parameters = item.parameters.map(asParameterInformation);
     const signature = {
-        label: (0, protocol_translation_1.asPlainText)(item.prefixDisplayParts),
-        documentation: (0, protocol_translation_1.asDocumentation)({
+        label: asPlainText(item.prefixDisplayParts),
+        documentation: asDocumentation({
             documentation: item.documentation,
-            tags: item.tags.filter(x => x.name !== 'param')
+            tags: item.tags.filter(x => x.name !== 'param'),
         }),
-        parameters
+        parameters,
     };
-    signature.label += parameters.map(parameter => parameter.label).join((0, protocol_translation_1.asPlainText)(item.separatorDisplayParts));
-    signature.label += (0, protocol_translation_1.asPlainText)(item.suffixDisplayParts);
+    signature.label += parameters.map(parameter => parameter.label).join(asPlainText(item.separatorDisplayParts));
+    signature.label += asPlainText(item.suffixDisplayParts);
     return signature;
 }
 function asParameterInformation(parameter) {
     return {
-        label: (0, protocol_translation_1.asPlainText)(parameter.displayParts),
-        documentation: (0, protocol_translation_1.asDocumentation)(parameter)
+        label: asPlainText(parameter.displayParts),
+        documentation: asDocumentation(parameter),
     };
 }
+export function toTsTriggerReason(context) {
+    switch (context.triggerKind) {
+        case lsp.SignatureHelpTriggerKind.TriggerCharacter:
+            if (context.triggerCharacter) {
+                if (context.isRetrigger) {
+                    return { kind: 'retrigger', triggerCharacter: context.triggerCharacter };
+                }
+                else {
+                    return { kind: 'characterTyped', triggerCharacter: context.triggerCharacter };
+                }
+            }
+            else {
+                return { kind: 'invoked' };
+            }
+        case lsp.SignatureHelpTriggerKind.ContentChange:
+            return context.isRetrigger ? { kind: 'retrigger' } : { kind: 'invoked' };
+        case lsp.SignatureHelpTriggerKind.Invoked:
+        default:
+            return { kind: 'invoked' };
+    }
+}
 //# sourceMappingURL=hover.js.map

package/lib/hover.js.map

@@ -1 +1 @@
-{"version":3,"file":"hover.js","sourceRoot":"","sources":["../src/hover.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAIH,iEAAsE;AAEtE,SAAgB,eAAe,CAAC,IAA4B;IACxD,OAAO;QACH,eAAe,EAAE,IAAI,CAAC,iBAAiB;QACvC,eAAe,EAAE,kBAAkB,CAAC,IAAI,CAAC;QACzC,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,sBAAsB,CAAC;KACrD,CAAC;AACN,CAAC;AAND,0CAMC;AAED,SAAS,kBAAkB,CAAC,IAA4B;IACpD,MAAM,eAAe,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;IAC3D,IAAI,eAAe,IAAI,eAAe,CAAC,UAAU,EAAE;QAC/C,OAAO,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,aAAa,EAAE,eAAe,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;KAC9E;IACD,OAAO,IAAI,CAAC,aAAa,CAAC;AAC9B,CAAC;AAED,SAAS,sBAAsB,CAAC,IAA2B;IACvD,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC;IAC/D,MAAM,SAAS,GAA6B;QACxC,KAAK,EAAE,IAAA,kCAAW,EAAC,IAAI,CAAC,kBAAkB,CAAC;QAC3C,aAAa,EAAE,IAAA,sCAAe,EAAC;YAC3B,aAAa,EAAE,IAAI,CAAC,aAAa;YACjC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,OAAO,CAAC;SAClD,CAAC;QACF,UAAU;KACb,CAAC;IACF,SAAS,CAAC,KAAK,IAAI,UAAU,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,IAAA,kCAAW,EAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC,CAAC;IAC9G,SAAS,CAAC,KAAK,IAAI,IAAA,kCAAW,EAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;IACxD,OAAO,SAAS,CAAC;AACrB,CAAC;AAED,SAAS,sBAAsB,CAAC,SAAqC;IACjE,OAAO;QACH,KAAK,EAAE,IAAA,kCAAW,EAAC,SAAS,CAAC,YAAY,CAAC;QAC1C,aAAa,EAAE,IAAA,sCAAe,EAAC,SAAS,CAAC;KAC5C,CAAC;AACN,CAAC"}
+{"version":3,"file":"hover.js","sourceRoot":"","sources":["../src/hover.ts"],"names":[],"mappings":"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"}

package/lib/logger.d.ts

@@ -1,5 +1,5 @@
-import { LspClient } from './lsp-client';
-import * as lsp from 'vscode-languageserver/node';
+import { LspClient } from './lsp-client.js';
+import * as lsp from 'vscode-languageserver';
 /**
  * the logger type
  */
@@ -19,9 +19,17 @@ export declare class LspClientLogger implements Logger {
     info(...arg: any[]): void;
     log(...arg: any[]): void;
 }
+export declare enum ConsoleLogLevel {
+    error = "error",
+    warn = "warn",
+    info = "warn",
+    verbose = "verbose"
+}
 export declare class ConsoleLogger implements Logger {
-    private isLogEnabled?;
-    constructor(isLogEnabled?: boolean | undefined);
+    private level;
+    constructor(level?: lsp.MessageType);
+    static toMessageTypeLevel(type?: string): lsp.MessageType;
+    private print;
     private toStrings;
     error(...arg: any[]): void;
     warn(...arg: any[]): void;

package/lib/logger.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,KAAK,GAAG,MAAM,4BAA4B,CAAC;AAElD;;GAEG;AACH,MAAM,WAAW,MAAM;IACnB,KAAK,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;IAC3B,IAAI,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;IAC1B,IAAI,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;IAC1B,GAAG,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;CAC5B;AAED,qBAAa,eAAgB,YAAW,MAAM;IAC9B,SAAS,CAAC,MAAM,EAAE,SAAS;IAAE,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,WAAW;gBAAnD,MAAM,EAAE,SAAS,EAAY,KAAK,EAAE,GAAG,CAAC,WAAW;IAEzE,SAAS,CAAC,WAAW,CAAC,QAAQ,EAAE,GAAG,CAAC,WAAW,EAAE,cAAc,EAAE,GAAG,EAAE,GAAG,IAAI;IAiB7E,KAAK,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI;IAI1B,IAAI,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI;IAIzB,IAAI,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI;IAIzB,GAAG,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI;CAG3B;AAED,qBAAa,aAAc,YAAW,MAAM;IAC5B,OAAO,CAAC,YAAY,CAAC;gBAAb,YAAY,CAAC,qBAAS;IAE1C,OAAO,CAAC,SAAS;IAIjB,KAAK,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI;IAG1B,IAAI,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI;IAGzB,IAAI,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI;IAIzB,GAAG,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI;CAM3B;AAED,qBAAa,eAAgB,YAAW,MAAM;IAC9B,OAAO,CAAC,MAAM;IAAU,OAAO,CAAC,MAAM;gBAA9B,MAAM,EAAE,MAAM,EAAU,MAAM,EAAE,MAAM;IAE1D,KAAK,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI;IAI1B,IAAI,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI;IAIzB,IAAI,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI;IAIzB,GAAG,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI;CAG3B"}
+{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,KAAK,GAAG,MAAM,uBAAuB,CAAC;AAE7C;;GAEG;AACH,MAAM,WAAW,MAAM;IACnB,KAAK,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;IAC3B,IAAI,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;IAC1B,IAAI,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;IAC1B,GAAG,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;CAC5B;AAED,qBAAa,eAAgB,YAAW,MAAM;IAC9B,SAAS,CAAC,MAAM,EAAE,SAAS;IAAE,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,WAAW;gBAAnD,MAAM,EAAE,SAAS,EAAY,KAAK,EAAE,GAAG,CAAC,WAAW;IAEzE,SAAS,CAAC,WAAW,CAAC,QAAQ,EAAE,GAAG,CAAC,WAAW,EAAE,cAAc,EAAE,GAAG,EAAE,GAAG,IAAI;IAiB7E,KAAK,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI;IAI1B,IAAI,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI;IAIzB,IAAI,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI;IAIzB,GAAG,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI;CAG3B;AAED,oBAAY,eAAe;IACvB,KAAK,UAAU;IACf,IAAI,SAAS;IACb,IAAI,SAAS;IACb,OAAO,YAAY;CACtB;AAED,qBAAa,aAAc,YAAW,MAAM;IAC5B,OAAO,CAAC,KAAK;gBAAL,KAAK,GAAE,GAAG,CAAC,WAAkC;IAEjE,MAAM,CAAC,kBAAkB,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,GAAG,CAAC,WAAW;IAczD,OAAO,CAAC,KAAK;IAOb,OAAO,CAAC,SAAS;IAIjB,KAAK,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI;IAG1B,IAAI,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI;IAGzB,IAAI,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI;IAGzB,GAAG,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI;CAG3B;AAED,qBAAa,eAAgB,YAAW,MAAM;IAC9B,OAAO,CAAC,MAAM;IAAU,OAAO,CAAC,MAAM;gBAA9B,MAAM,EAAE,MAAM,EAAU,MAAM,EAAE,MAAM;IAE1D,KAAK,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI;IAI1B,IAAI,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI;IAIzB,IAAI,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI;IAIzB,GAAG,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI;CAG3B"}

package/lib/logger.js

@@ -1,37 +1,11 @@
-"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;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.PrefixingLogger = exports.ConsoleLogger = exports.LspClientLogger = void 0;
-const lsp = __importStar(require("vscode-languageserver/node"));
-class LspClientLogger {
+import * as lsp from 'vscode-languageserver';
+export class LspClientLogger {
     constructor(client, level) {
         this.client = client;
         this.level = level;
@@ -48,7 +22,7 @@ class LspClientLogger {
             }).join(' ');
             this.client.logMessage({
                 type: severity,
-                message: message
+                message: message,
             });
         }
     }
@@ -65,33 +39,53 @@ class LspClientLogger {
         this.sendMessage(lsp.MessageType.Log, arg);
     }
 }
-exports.LspClientLogger = LspClientLogger;
-class ConsoleLogger {
-    constructor(isLogEnabled) {
-        this.isLogEnabled = isLogEnabled;
+export var ConsoleLogLevel;
+(function (ConsoleLogLevel) {
+    ConsoleLogLevel["error"] = "error";
+    ConsoleLogLevel["warn"] = "warn";
+    ConsoleLogLevel["info"] = "warn";
+    ConsoleLogLevel["verbose"] = "verbose";
+})(ConsoleLogLevel = ConsoleLogLevel || (ConsoleLogLevel = {}));
+export class ConsoleLogger {
+    constructor(level = lsp.MessageType.Info) {
+        this.level = level;
+    }
+    static toMessageTypeLevel(type) {
+        switch (type) {
+            case 'error':
+                return lsp.MessageType.Error;
+            case 'warn':
+                return lsp.MessageType.Warning;
+            case 'log':
+                return lsp.MessageType.Log;
+            case 'info':
+            default:
+                return lsp.MessageType.Info;
+        }
+    }
+    print(type, level, ...arg) {
+        if (this.level >= level) {
+            // eslint-disable-next-line no-console
+            console[type](...this.toStrings(arg));
+        }
     }
     toStrings(...arg) {
         return arg.map(a => JSON.stringify(a, null, 2));
     }
     error(...arg) {
-        console.error(...this.toStrings(arg));
+        this.print('error', lsp.MessageType.Error, arg);
     }
     warn(...arg) {
-        console.warn(...this.toStrings(arg));
+        this.print('error', lsp.MessageType.Warning, arg);
     }
     info(...arg) {
-        // eslint-disable-next-line no-console
-        console.info(...this.toStrings(arg));
+        this.print('error', lsp.MessageType.Info, arg);
     }
     log(...arg) {
-        if (this.isLogEnabled) {
-            // eslint-disable-next-line no-console
-            console.log(...this.toStrings(arg));
-        }
+        this.print('error', lsp.MessageType.Log, arg);
     }
 }
-exports.ConsoleLogger = ConsoleLogger;
-class PrefixingLogger {
+export class PrefixingLogger {
     constructor(logger, prefix) {
         this.logger = logger;
         this.prefix = prefix;
@@ -109,5 +103,4 @@ class PrefixingLogger {
         this.logger.log(this.prefix, ...arg);
     }
 }
-exports.PrefixingLogger = PrefixingLogger;
 //# sourceMappingURL=logger.js.map

package/lib/logger.js.map

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

package/lib/lsp-client.d.ts

@@ -1,30 +1,26 @@
-import * as lsp from 'vscode-languageserver/node';
-export interface ProgressReporter {
-    begin(message?: string): void;
-    report(message: string): void;
-    end(): void;
+import * as lsp from 'vscode-languageserver';
+export interface WithProgressOptions {
+    message: string;
+    reporter: lsp.WorkDoneProgressReporter;
 }
 export interface LspClient {
-    setClientCapabilites(capabilites: lsp.ClientCapabilities): void;
-    createProgressReporter(): ProgressReporter;
+    createProgressReporter(token?: lsp.CancellationToken, workDoneProgress?: lsp.WorkDoneProgressReporter): Promise<lsp.WorkDoneProgressReporter>;
+    withProgress<R>(options: WithProgressOptions, task: (progress: lsp.WorkDoneProgressReporter) => Promise<R>): Promise<R>;
     publishDiagnostics(args: lsp.PublishDiagnosticsParams): void;
-    showMessage(args: lsp.ShowMessageParams): void;
+    showErrorMessage(message: string): void;
     logMessage(args: lsp.LogMessageParams): void;
-    applyWorkspaceEdit(args: lsp.ApplyWorkspaceEditParams): Promise<lsp.ApplyWorkspaceEditResponse>;
-    telemetry(args: any): void;
+    applyWorkspaceEdit(args: lsp.ApplyWorkspaceEditParams): Promise<lsp.ApplyWorkspaceEditResult>;
     rename(args: lsp.TextDocumentPositionParams): Promise<any>;
 }
 export declare class LspClientImpl implements LspClient {
     protected connection: lsp.Connection;
-    private clientCapabilities?;
     constructor(connection: lsp.Connection);
-    setClientCapabilites(capabilites: lsp.ClientCapabilities): void;
-    createProgressReporter(): ProgressReporter;
-    publishDiagnostics(args: lsp.PublishDiagnosticsParams): void;
-    showMessage(args: lsp.ShowMessageParams): void;
+    createProgressReporter(_?: lsp.CancellationToken, workDoneProgress?: lsp.WorkDoneProgressReporter): Promise<lsp.WorkDoneProgressReporter>;
+    withProgress<R = unknown>(options: WithProgressOptions, task: (progress: lsp.WorkDoneProgressReporter) => Promise<R>): Promise<R>;
+    publishDiagnostics(params: lsp.PublishDiagnosticsParams): void;
+    showErrorMessage(message: string): void;
     logMessage(args: lsp.LogMessageParams): void;
-    telemetry(args: any): void;
-    applyWorkspaceEdit(args: lsp.ApplyWorkspaceEditParams): Promise<lsp.ApplyWorkspaceEditResponse>;
+    applyWorkspaceEdit(params: lsp.ApplyWorkspaceEditParams): Promise<lsp.ApplyWorkspaceEditResult>;
     rename(args: lsp.TextDocumentPositionParams): Promise<any>;
 }
 //# sourceMappingURL=lsp-client.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"lsp-client.d.ts","sourceRoot":"","sources":["../src/lsp-client.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,GAAG,MAAM,4BAA4B,CAAC;AAGlD,MAAM,WAAW,gBAAgB;IAC7B,KAAK,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,MAAM,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,GAAG,IAAI,IAAI,CAAC;CACf;AAED,MAAM,WAAW,SAAS;IACtB,oBAAoB,CAAC,WAAW,EAAE,GAAG,CAAC,kBAAkB,GAAG,IAAI,CAAC;IAChE,sBAAsB,IAAI,gBAAgB,CAAC;IAC3C,kBAAkB,CAAC,IAAI,EAAE,GAAG,CAAC,wBAAwB,GAAG,IAAI,CAAC;IAC7D,WAAW,CAAC,IAAI,EAAE,GAAG,CAAC,iBAAiB,GAAG,IAAI,CAAC;IAC/C,UAAU,CAAC,IAAI,EAAE,GAAG,CAAC,gBAAgB,GAAG,IAAI,CAAC;IAC7C,kBAAkB,CAAC,IAAI,EAAE,GAAG,CAAC,wBAAwB,GAAG,OAAO,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAC;IAChG,SAAS,CAAC,IAAI,EAAE,GAAG,GAAG,IAAI,CAAC;IAC3B,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,0BAA0B,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;CAC9D;AAED,qBAAa,aAAc,YAAW,SAAS;IAG/B,SAAS,CAAC,UAAU,EAAE,GAAG,CAAC,UAAU;IAFhD,OAAO,CAAC,kBAAkB,CAAC,CAAyB;gBAE9B,UAAU,EAAE,GAAG,CAAC,UAAU;IAEhD,oBAAoB,CAAC,WAAW,EAAE,GAAG,CAAC,kBAAkB,GAAG,IAAI;IAI/D,sBAAsB,IAAI,gBAAgB;IAmC1C,kBAAkB,CAAC,IAAI,EAAE,GAAG,CAAC,wBAAwB,GAAG,IAAI;IAI5D,WAAW,CAAC,IAAI,EAAE,GAAG,CAAC,iBAAiB,GAAG,IAAI;IAI9C,UAAU,CAAC,IAAI,EAAE,GAAG,CAAC,gBAAgB,GAAG,IAAI;IAI5C,SAAS,CAAC,IAAI,EAAE,GAAG,GAAG,IAAI;IAIpB,kBAAkB,CAAC,IAAI,EAAE,GAAG,CAAC,wBAAwB,GAAG,OAAO,CAAC,GAAG,CAAC,0BAA0B,CAAC;IAI/F,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,0BAA0B,GAAG,OAAO,CAAC,GAAG,CAAC;CAGnE"}
+{"version":3,"file":"lsp-client.d.ts","sourceRoot":"","sources":["../src/lsp-client.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,GAAG,MAAM,uBAAuB,CAAC;AAK7C,MAAM,WAAW,mBAAmB;IAChC,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,GAAG,CAAC,wBAAwB,CAAC;CAC1C;AAED,MAAM,WAAW,SAAS;IACtB,sBAAsB,CAAC,KAAK,CAAC,EAAE,GAAG,CAAC,iBAAiB,EAAE,gBAAgB,CAAC,EAAE,GAAG,CAAC,wBAAwB,GAAG,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC;IAC9I,YAAY,CAAC,CAAC,EAAE,OAAO,EAAE,mBAAmB,EAAE,IAAI,EAAE,CAAC,QAAQ,EAAE,GAAG,CAAC,wBAAwB,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;IACxH,kBAAkB,CAAC,IAAI,EAAE,GAAG,CAAC,wBAAwB,GAAG,IAAI,CAAC;IAC7D,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACxC,UAAU,CAAC,IAAI,EAAE,GAAG,CAAC,gBAAgB,GAAG,IAAI,CAAC;IAC7C,kBAAkB,CAAC,IAAI,EAAE,GAAG,CAAC,wBAAwB,GAAG,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC;IAC9F,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,0BAA0B,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;CAC9D;AAKD,qBAAa,aAAc,YAAW,SAAS;IAC/B,SAAS,CAAC,UAAU,EAAE,GAAG,CAAC,UAAU;gBAA1B,UAAU,EAAE,GAAG,CAAC,UAAU;IAE1C,sBAAsB,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,iBAAiB,EAAE,gBAAgB,CAAC,EAAE,GAAG,CAAC,wBAAwB,GAAG,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC;IAUzI,YAAY,CAAC,CAAC,GAAG,OAAO,EAAE,OAAO,EAAE,mBAAmB,EAAE,IAAI,EAAE,CAAC,QAAQ,EAAE,GAAG,CAAC,wBAAwB,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;IASvI,kBAAkB,CAAC,MAAM,EAAE,GAAG,CAAC,wBAAwB,GAAG,IAAI;IAI9D,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAIvC,UAAU,CAAC,IAAI,EAAE,GAAG,CAAC,gBAAgB,GAAG,IAAI;IAItC,kBAAkB,CAAC,MAAM,EAAE,GAAG,CAAC,wBAAwB,GAAG,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC;IAI/F,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,0BAA0B,GAAG,OAAO,CAAC,GAAG,CAAC;CAGnE"}

package/lib/lsp-client.js

@@ -1,110 +1,51 @@
-"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) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.LspClientImpl = void 0;
-const lsp = __importStar(require("vscode-languageserver/node"));
-const ts_protocol_1 = require("./ts-protocol");
-class LspClientImpl {
+import * as lsp from 'vscode-languageserver';
+import { MessageType } from 'vscode-languageserver';
+import { attachWorkDone } from 'vscode-languageserver/lib/common/progress.js';
+import { TypeScriptRenameRequest } from './ts-protocol.js';
+// Hack around the LSP library that makes it otherwise impossible to differentiate between Null and Client-initiated reporter.
+const nullProgressReporter = attachWorkDone(undefined, /* params */ undefined);
+export class LspClientImpl {
     constructor(connection) {
         this.connection = connection;
     }
-    setClientCapabilites(capabilites) {
-        this.clientCapabilities = capabilites;
-    }
-    createProgressReporter() {
-        let workDoneProgress;
-        return {
-            begin: (message = '') => {
-                var _a, _b;
-                if ((_b = (_a = this.clientCapabilities) === null || _a === void 0 ? void 0 : _a.window) === null || _b === void 0 ? void 0 : _b.workDoneProgress) {
-                    workDoneProgress = this.connection.window.createWorkDoneProgress();
-                    workDoneProgress
-                        .then((progress) => {
-                        progress.begin(message);
-                    })
-                        .catch(() => { });
-                }
-            },
-            report: (message) => {
-                if (workDoneProgress) {
-                    workDoneProgress
-                        .then((progress) => {
-                        progress.report(message);
-                    })
-                        .catch(() => { });
-                }
-            },
-            end: () => {
-                if (workDoneProgress) {
-                    workDoneProgress
-                        .then((progress) => {
-                        progress.done();
-                    })
-                        .catch(() => { });
-                    workDoneProgress = undefined;
-                }
-            }
-        };
+    async createProgressReporter(_, workDoneProgress) {
+        let reporter;
+        if (workDoneProgress && workDoneProgress.constructor !== nullProgressReporter.constructor) {
+            reporter = workDoneProgress;
+        }
+        else {
+            reporter = workDoneProgress || await this.connection.window.createWorkDoneProgress();
+        }
+        return reporter;
+    }
+    async withProgress(options, task) {
+        const { message, reporter } = options;
+        reporter.begin(message);
+        return task(reporter).then(result => {
+            reporter.done();
+            return result;
+        });
     }
-    publishDiagnostics(args) {
-        this.connection.sendNotification(lsp.PublishDiagnosticsNotification.type, args);
+    publishDiagnostics(params) {
+        this.connection.sendDiagnostics(params);
     }
-    showMessage(args) {
-        this.connection.sendNotification(lsp.ShowMessageNotification.type, args);
+    showErrorMessage(message) {
+        this.connection.sendNotification(lsp.ShowMessageNotification.type, { type: MessageType.Error, message });
     }
     logMessage(args) {
         this.connection.sendNotification(lsp.LogMessageNotification.type, args);
     }
-    telemetry(args) {
-        this.connection.sendNotification(lsp.TelemetryEventNotification.type, args);
+    async applyWorkspaceEdit(params) {
+        return this.connection.workspace.applyEdit(params);
     }
-    applyWorkspaceEdit(args) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.connection.sendRequest(lsp.ApplyWorkspaceEditRequest.type, args);
-        });
-    }
-    rename(args) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.connection.sendRequest(ts_protocol_1.TypeScriptRenameRequest.type, args);
-        });
+    async rename(args) {
+        return this.connection.sendRequest(TypeScriptRenameRequest.type, args);
     }
 }
-exports.LspClientImpl = LspClientImpl;
 //# sourceMappingURL=lsp-client.js.map

package/lib/lsp-client.js.map

@@ -1 +1 @@
-{"version":3,"file":"lsp-client.js","sourceRoot":"","sources":["../src/lsp-client.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,gEAAkD;AAClD,+CAAwD;AAmBxD,MAAa,aAAa;IAGtB,YAAsB,UAA0B;QAA1B,eAAU,GAAV,UAAU,CAAgB;IAAG,CAAC;IAEpD,oBAAoB,CAAC,WAAmC;QACpD,IAAI,CAAC,kBAAkB,GAAG,WAAW,CAAC;IAC1C,CAAC;IAED,sBAAsB;QAClB,IAAI,gBAAyE,CAAC;QAC9E,OAAO;YACH,KAAK,EAAE,CAAC,OAAO,GAAG,EAAE,EAAE,EAAE;;gBACpB,IAAI,MAAA,MAAA,IAAI,CAAC,kBAAkB,0CAAE,MAAM,0CAAE,gBAAgB,EAAE;oBACnD,gBAAgB,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,sBAAsB,EAAE,CAAC;oBACnE,gBAAgB;yBACX,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE;wBACf,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;oBAC5B,CAAC,CAAC;yBACD,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;iBACxB;YACL,CAAC;YACD,MAAM,EAAE,CAAC,OAAe,EAAE,EAAE;gBACxB,IAAI,gBAAgB,EAAE;oBAClB,gBAAgB;yBACX,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE;wBACf,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;oBAC7B,CAAC,CAAC;yBACD,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;iBACxB;YACL,CAAC;YACD,GAAG,EAAE,GAAG,EAAE;gBACN,IAAI,gBAAgB,EAAE;oBAClB,gBAAgB;yBACX,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE;wBACf,QAAQ,CAAC,IAAI,EAAE,CAAC;oBACpB,CAAC,CAAC;yBACD,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;oBACrB,gBAAgB,GAAG,SAAS,CAAC;iBAChC;YACL,CAAC;SACJ,CAAC;IACN,CAAC;IAED,kBAAkB,CAAC,IAAkC;QACjD,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,GAAG,CAAC,8BAA8B,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IACpF,CAAC;IAED,WAAW,CAAC,IAA2B;QACnC,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,GAAG,CAAC,uBAAuB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAC7E,CAAC;IAED,UAAU,CAAC,IAA0B;QACjC,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,GAAG,CAAC,sBAAsB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAC5E,CAAC;IAED,SAAS,CAAC,IAAS;QACf,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,GAAG,CAAC,0BAA0B,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAChF,CAAC;IAEK,kBAAkB,CAAC,IAAkC;;YACvD,OAAO,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,GAAG,CAAC,yBAAyB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QACjF,CAAC;KAAA;IAEK,MAAM,CAAC,IAAoC;;YAC7C,OAAO,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,qCAAuB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAC3E,CAAC;KAAA;CACJ;AAnED,sCAmEC"}
+{"version":3,"file":"lsp-client.js","sourceRoot":"","sources":["../src/lsp-client.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,GAAG,MAAM,uBAAuB,CAAC;AAC7C,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,8CAA8C,CAAC;AAC9E,OAAO,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAC;AAiB3D,8HAA8H;AAC9H,MAAM,oBAAoB,GAAG,cAAc,CAAC,SAAgB,EAAE,YAAY,CAAC,SAAS,CAAC,CAAC;AAEtF,MAAM,OAAO,aAAa;IACtB,YAAsB,UAA0B;QAA1B,eAAU,GAAV,UAAU,CAAgB;IAAG,CAAC;IAEpD,KAAK,CAAC,sBAAsB,CAAC,CAAyB,EAAE,gBAA+C;QACnG,IAAI,QAAsC,CAAC;QAC3C,IAAI,gBAAgB,IAAI,gBAAgB,CAAC,WAAW,KAAK,oBAAoB,CAAC,WAAW,EAAE;YACvF,QAAQ,GAAG,gBAAgB,CAAC;SAC/B;aAAM;YACH,QAAQ,GAAG,gBAAgB,IAAI,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,sBAAsB,EAAE,CAAC;SACxF;QACD,OAAO,QAAQ,CAAC;IACpB,CAAC;IAED,KAAK,CAAC,YAAY,CAAc,OAA4B,EAAE,IAA4D;QACtH,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;QACtC,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QACxB,OAAO,IAAI,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;YAChC,QAAQ,CAAC,IAAI,EAAE,CAAC;YAChB,OAAO,MAAM,CAAC;QAClB,CAAC,CAAC,CAAC;IACP,CAAC;IAED,kBAAkB,CAAC,MAAoC;QACnD,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;IAC5C,CAAC;IAED,gBAAgB,CAAC,OAAe;QAC5B,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,GAAG,CAAC,uBAAuB,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,WAAW,CAAC,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC;IAC7G,CAAC;IAED,UAAU,CAAC,IAA0B;QACjC,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,GAAG,CAAC,sBAAsB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAC5E,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,MAAoC;QACzD,OAAO,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IACvD,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,IAAoC;QAC7C,OAAO,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,uBAAuB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAC3E,CAAC;CACJ"}

package/lib/lsp-connection.d.ts

@@ -1,4 +1,4 @@
-import * as lsp from 'vscode-languageserver/node';
+import * as lsp from 'vscode-languageserver/node.js';
 export interface IServerOptions {
     tsserverPath: string;
     tsserverLogFile?: string;

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

@@ -1 +1 @@
-{"version":3,"file":"lsp-connection.d.ts","sourceRoot":"","sources":["../src/lsp-connection.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,GAAG,MAAM,4BAA4B,CAAC;AAQlD,MAAM,WAAW,cAAc;IAC3B,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,gBAAgB,EAAE,GAAG,CAAC,WAAW,CAAC;CACrC;AAED,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,cAAc,GAAG,GAAG,CAAC,UAAU,CA+C3E"}
+{"version":3,"file":"lsp-connection.d.ts","sourceRoot":"","sources":["../src/lsp-connection.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,GAAG,MAAM,+BAA+B,CAAC;AAOrD,MAAM,WAAW,cAAc;IAC3B,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,gBAAgB,EAAE,GAAG,CAAC,WAAW,CAAC;CACrC;AAED,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,cAAc,GAAG,GAAG,CAAC,UAAU,CAgD3E"}

package/lib/lsp-connection.js

@@ -1,51 +1,25 @@
-"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;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createLspConnection = void 0;
-const lsp = __importStar(require("vscode-languageserver/node"));
-const lspcalls = __importStar(require("./lsp-protocol.calls.proposed"));
-const lspinlayHints = __importStar(require("./lsp-protocol.inlayHints.proposed"));
-const logger_1 = require("./logger");
-const lsp_server_1 = require("./lsp-server");
-const lsp_client_1 = require("./lsp-client");
-function createLspConnection(options) {
+import * as lsp from 'vscode-languageserver/node.js';
+import * as lspcalls from './lsp-protocol.calls.proposed.js';
+import * as lspinlayHints from './lsp-protocol.inlayHints.proposed.js';
+import { LspClientLogger } from './logger.js';
+import { LspServer } from './lsp-server.js';
+import { LspClientImpl } from './lsp-client.js';
+export function createLspConnection(options) {
     const connection = lsp.createConnection(lsp.ProposedFeatures.all);
-    const lspClient = new lsp_client_1.LspClientImpl(connection);
-    const logger = new logger_1.LspClientLogger(lspClient, options.showMessageLevel);
-    const server = new lsp_server_1.LspServer({
+    const lspClient = new LspClientImpl(connection);
+    const logger = new LspClientLogger(lspClient, options.showMessageLevel);
+    const server = new LspServer({
         logger,
         lspClient,
         tsserverPath: options.tsserverPath,
         tsserverLogFile: options.tsserverLogFile,
-        tsserverLogVerbosity: options.tsserverLogVerbosity
+        tsserverLogVerbosity: options.tsserverLogVerbosity,
     });
     connection.onInitialize(server.initialize.bind(server));
     connection.onDidChangeConfiguration(server.didChangeConfiguration.bind(server));
@@ -70,12 +44,12 @@ function createLspConnection(options) {
     connection.onSignatureHelp(server.signatureHelp.bind(server));
     connection.onWorkspaceSymbol(server.workspaceSymbol.bind(server));
     connection.onFoldingRanges(server.foldingRanges.bind(server));
+    connection.languages.inlayHint.on(server.inlayHints.bind(server));
     // proposed `textDocument/calls` request
     connection.onRequest(lspcalls.CallsRequest.type, server.calls.bind(server));
-    connection.onRequest(lspinlayHints.type, server.inlayHints.bind(server));
+    connection.onRequest(lspinlayHints.type, server.inlayHintsLegacy.bind(server));
     connection.onRequest(lsp.SemanticTokensRequest.type, server.semanticTokensFull.bind(server));
     connection.onRequest(lsp.SemanticTokensRangeRequest.type, server.semanticTokensRange.bind(server));
     return connection;
 }
-exports.createLspConnection = createLspConnection;
 //# sourceMappingURL=lsp-connection.js.map