monaco-languageclient 1.0.0 → 2.0.0-dev.0

package/dist/amd/console-window.d.ts

@@ -1,7 +1,8 @@
-import { MessageActionItem, MessageType, Window, OutputChannel } from './services';
+import { Window, Severity } from 'vscode/services';
+import * as vscode from 'vscode';
 export declare class ConsoleWindow implements Window {
-    protected readonly channels: Map<string, OutputChannel>;
-    showMessage<T extends MessageActionItem>(type: MessageType, message: string, ...actions: T[]): Thenable<T | undefined>;
-    createOutputChannel(name: string): OutputChannel;
+    protected readonly channels: Map<string, vscode.OutputChannel>;
+    showMessage<T extends vscode.MessageOptions | string | vscode.MessageItem>(severity: Severity, message: string, ...actions: T[]): Thenable<T | undefined>;
+    createOutputChannel(name: string): vscode.OutputChannel;
 }
 //# sourceMappingURL=console-window.d.ts.map

package/dist/amd/console-window.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"console-window.d.ts","sourceRoot":"","sources":["../../src/console-window.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAEnF,qBAAa,aAAc,YAAW,MAAM;IACxC,SAAS,CAAC,QAAQ,CAAC,QAAQ,6BAAoC;IAC/D,WAAW,CAAC,CAAC,SAAS,iBAAiB,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,EAAE,CAAC,EAAE,GAAG,QAAQ,CAAC,CAAC,GAAG,SAAS,CAAC;IAetH,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,aAAa;CAsBnD"}
+{"version":3,"file":"console-window.d.ts","sourceRoot":"","sources":["../../src/console-window.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAA;AAClD,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAA;AAEhC,qBAAa,aAAc,YAAW,MAAM;IACxC,SAAS,CAAC,QAAQ,CAAC,QAAQ,oCAA2C;IACtE,WAAW,CAAC,CAAC,SAAS,MAAM,CAAC,cAAc,GAAG,MAAM,GAAG,MAAM,CAAC,WAAW,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,EAAE,CAAC,EAAE,GAAG,QAAQ,CAAC,CAAC,GAAG,SAAS,CAAC;IAezJ,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC,aAAa;CAgC1D"}

package/dist/amd/console-window.js

@@ -1,4 +1,4 @@
-define(["require", "exports", "./services"], function (require, exports, services_1) {
+define(["require", "exports", "vscode/services"], function (require, exports, services_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.ConsoleWindow = void 0;
@@ -6,18 +6,18 @@ define(["require", "exports", "./services"], function (require, exports, service
         constructor() {
             this.channels = new Map();
         }
-        showMessage(type, message, ...actions) {
-            if (type === services_1.MessageType.Error) {
+        showMessage(severity, message, ...actions) {
+            if (severity === services_1.Severity.Error) {
                 console.error(message);
             }
-            if (type === services_1.MessageType.Warning) {
+            if (severity === services_1.Severity.Warning) {
                 console.warn(message);
             }
-            if (type === services_1.MessageType.Info) {
+            if (severity === services_1.Severity.Info) {
                 console.info(message);
             }
-            if (type === services_1.MessageType.Log) {
-                console.log(message);
+            if (severity === services_1.Severity.Ignore) {
+                console.debug(message);
             }
             return Promise.resolve(undefined);
         }
@@ -27,6 +27,7 @@ define(["require", "exports", "./services"], function (require, exports, service
                 return existing;
             }
             const channel = {
+                name: 'default',
                 append(value) {
                     console.log(name + ': ' + value);
                 },
@@ -38,6 +39,15 @@ define(["require", "exports", "./services"], function (require, exports, service
                 },
                 dispose() {
                     // no-op
+                },
+                replace: function (value) {
+                    // no-op
+                },
+                clear: function () {
+                    // no-op
+                },
+                hide: function () {
+                    // no-op
                 }
             };
             this.channels.set(name, channel);

package/dist/amd/console-window.js.map

@@ -1 +1 @@
-{"version":3,"file":"console-window.js","sourceRoot":"","sources":["../../src/console-window.ts"],"names":[],"mappings":";;;;IAMA,MAAa,aAAa;QAA1B;YACuB,aAAQ,GAAG,IAAI,GAAG,EAAyB,CAAC;QAsCnE,CAAC;QArCG,WAAW,CAA8B,IAAiB,EAAE,OAAe,EAAE,GAAG,OAAY;YACxF,IAAI,IAAI,KAAK,sBAAW,CAAC,KAAK,EAAE;gBAC5B,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;aAC1B;YACD,IAAI,IAAI,KAAK,sBAAW,CAAC,OAAO,EAAE;gBAC9B,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;aACzB;YACD,IAAI,IAAI,KAAK,sBAAW,CAAC,IAAI,EAAE;gBAC3B,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;aACzB;YACD,IAAI,IAAI,KAAK,sBAAW,CAAC,GAAG,EAAE;gBAC1B,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;aACxB;YACD,OAAO,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QACtC,CAAC;QACD,mBAAmB,CAAC,IAAY;YAC5B,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YACzC,IAAI,QAAQ,EAAE;gBACV,OAAO,QAAQ,CAAC;aACnB;YACD,MAAM,OAAO,GAAkB;gBAC3B,MAAM,CAAC,KAAa;oBAChB,OAAO,CAAC,GAAG,CAAC,IAAI,GAAG,IAAI,GAAG,KAAK,CAAC,CAAC;gBACrC,CAAC;gBACD,UAAU,CAAC,IAAY;oBACnB,OAAO,CAAC,GAAG,CAAC,IAAI,GAAG,IAAI,GAAG,IAAI,CAAC,CAAC;gBACpC,CAAC;gBACD,IAAI;oBACA,QAAQ;gBACZ,CAAC;gBACD,OAAO;oBACH,QAAQ;gBACZ,CAAC;aACJ,CAAA;YACD,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;YAChC,OAAO,OAAO,CAAC;QACnB,CAAC;KACJ;IAvCD,sCAuCC"}
+{"version":3,"file":"console-window.js","sourceRoot":"","sources":["../../src/console-window.ts"],"names":[],"mappings":";;;;IAOA,MAAa,aAAa;QAA1B;YACuB,aAAQ,GAAG,IAAI,GAAG,EAAgC,CAAC;QAgD1E,CAAC;QA/CG,WAAW,CAAgE,QAAkB,EAAE,OAAe,EAAE,GAAG,OAAY;YAC3H,IAAI,QAAQ,KAAK,mBAAQ,CAAC,KAAK,EAAE;gBAC7B,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;aAC1B;YACD,IAAI,QAAQ,KAAK,mBAAQ,CAAC,OAAO,EAAE;gBAC/B,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;aACzB;YACD,IAAI,QAAQ,KAAK,mBAAQ,CAAC,IAAI,EAAE;gBAC5B,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;aACzB;YACD,IAAI,QAAQ,KAAK,mBAAQ,CAAC,MAAM,EAAE;gBAC9B,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;aAC1B;YACD,OAAO,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QACtC,CAAC;QACD,mBAAmB,CAAC,IAAY;YAC5B,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YACzC,IAAI,QAAQ,EAAE;gBACV,OAAO,QAAQ,CAAC;aACnB;YACD,MAAM,OAAO,GAAyB;gBAClC,IAAI,EAAE,SAAS;gBACf,MAAM,CAAC,KAAa;oBAChB,OAAO,CAAC,GAAG,CAAC,IAAI,GAAG,IAAI,GAAG,KAAK,CAAC,CAAC;gBACrC,CAAC;gBACD,UAAU,CAAC,IAAY;oBACnB,OAAO,CAAC,GAAG,CAAC,IAAI,GAAG,IAAI,GAAG,IAAI,CAAC,CAAC;gBACpC,CAAC;gBACD,IAAI;oBACA,QAAQ;gBACZ,CAAC;gBACD,OAAO;oBACH,QAAQ;gBACZ,CAAC;gBACD,OAAO,EAAE,UAAU,KAAa;oBAC5B,QAAQ;gBACZ,CAAC;gBACD,KAAK,EAAE;oBACH,QAAQ;gBACZ,CAAC;gBACD,IAAI,EAAE;oBACF,QAAQ;gBACZ,CAAC;aACJ,CAAA;YACD,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;YAChC,OAAO,OAAO,CAAC;QACnB,CAAC;KACJ;IAjDD,sCAiDC"}

package/dist/amd/disposable.d.ts

@@ -1,4 +1,4 @@
-import { Disposable } from './services';
+import { Disposable } from "vscode-jsonrpc";
 export { Disposable };
 export declare class DisposableCollection implements Disposable {
     protected readonly disposables: Disposable[];

package/dist/amd/disposable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"disposable.d.ts","sourceRoot":"","sources":["../../src/disposable.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAExC,OAAO,EACH,UAAU,EACb,CAAA;AAED,qBAAa,oBAAqB,YAAW,UAAU;IACnD,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,UAAU,EAAE,CAAM;IAElD,OAAO,IAAI,IAAI;IAMf,IAAI,CAAC,UAAU,EAAE,UAAU,GAAG,UAAU;CAY3C"}
+{"version":3,"file":"disposable.d.ts","sourceRoot":"","sources":["../../src/disposable.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C,OAAO,EACH,UAAU,EACb,CAAA;AAED,qBAAa,oBAAqB,YAAW,UAAU;IACnD,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,UAAU,EAAE,CAAM;IAElD,OAAO,IAAI,IAAI;IAMf,IAAI,CAAC,UAAU,EAAE,UAAU,GAAG,UAAU;CAY3C"}

package/dist/amd/disposable.js

@@ -1,8 +1,12 @@
-define(["require", "exports", "./services"], function (require, exports, services_1) {
+/* --------------------------------------------------------------------------------------------
+ * Copyright (c) 2018-2022 TypeFox GmbH (http://www.typefox.io). All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for license information.
+ * ------------------------------------------------------------------------------------------ */
+define(["require", "exports", "vscode-jsonrpc"], function (require, exports, vscode_jsonrpc_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.DisposableCollection = exports.Disposable = void 0;
-    Object.defineProperty(exports, "Disposable", { enumerable: true, get: function () { return services_1.Disposable; } });
+    Object.defineProperty(exports, "Disposable", { enumerable: true, get: function () { return vscode_jsonrpc_1.Disposable; } });
     class DisposableCollection {
         constructor() {
             this.disposables = [];

package/dist/amd/disposable.js.map

@@ -1 +1 @@
-{"version":3,"file":"disposable.js","sourceRoot":"","sources":["../../src/disposable.ts"],"names":[],"mappings":";;;;IAOI,2FAHK,qBAAU,OAGL;IAGd,MAAa,oBAAoB;QAAjC;YACuB,gBAAW,GAAiB,EAAE,CAAC;QAoBtD,CAAC;QAlBG,OAAO;YACH,OAAO,IAAI,CAAC,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE;gBAClC,IAAI,CAAC,WAAW,CAAC,GAAG,EAAG,CAAC,OAAO,EAAE,CAAC;aACrC;QACL,CAAC;QAED,IAAI,CAAC,UAAsB;YACvB,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;YACrC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAC7B,OAAO;gBACH,OAAO;oBACH,MAAM,KAAK,GAAG,WAAW,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;oBAC9C,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE;wBACd,WAAW,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;qBAChC;gBACL,CAAC;aACJ,CAAA;QACL,CAAC;KACJ;IArBD,oDAqBC"}
+{"version":3,"file":"disposable.js","sourceRoot":"","sources":["../../src/disposable.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;;;;;IAK5F,2FAHK,2BAAU,OAGL;IAGd,MAAa,oBAAoB;QAAjC;YACuB,gBAAW,GAAiB,EAAE,CAAC;QAoBtD,CAAC;QAlBG,OAAO;YACH,OAAO,IAAI,CAAC,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE;gBAClC,IAAI,CAAC,WAAW,CAAC,GAAG,EAAG,CAAC,OAAO,EAAE,CAAC;aACrC;QACL,CAAC;QAED,IAAI,CAAC,UAAsB;YACvB,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;YACrC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAC7B,OAAO;gBACH,OAAO;oBACH,MAAM,KAAK,GAAG,WAAW,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;oBAC9C,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE;wBACd,WAAW,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;qBAChC;gBACL,CAAC;aACJ,CAAA;QACL,CAAC;KACJ;IArBD,oDAqBC"}

package/dist/amd/index.d.ts

@@ -1,11 +1,8 @@
 export * from './disposable';
-export * from './services';
-export * from './connection';
 export * from './monaco-language-client';
-export * from './monaco-commands';
 export * from './console-window';
-export * from './monaco-languages';
 export * from './monaco-workspace';
 export * from './monaco-services';
-export * from './monaco-converter';
+export { Disposable, CancellationToken, Event, Emitter } from 'vscode-jsonrpc/lib/common/api';
+export * from 'vscode-languageserver-protocol/lib/common/api';
 //# sourceMappingURL=index.d.ts.map

package/dist/amd/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAIA,cAAc,cAAc,CAAC;AAC7B,cAAc,YAAY,CAAC;AAC3B,cAAc,cAAc,CAAC;AAC7B,cAAc,0BAA0B,CAAC;AACzC,cAAc,mBAAmB,CAAC;AAClC,cAAc,kBAAkB,CAAC;AACjC,cAAc,oBAAoB,CAAC;AACnC,cAAc,oBAAoB,CAAC;AACnC,cAAc,mBAAmB,CAAC;AAClC,cAAc,oBAAoB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAIA,cAAc,cAAc,CAAC;AAC7B,cAAc,0BAA0B,CAAC;AACzC,cAAc,kBAAkB,CAAC;AACjC,cAAc,oBAAoB,CAAC;AACnC,cAAc,mBAAmB,CAAC;AAElC,OAAO,EACH,UAAU,EAAE,iBAAiB,EAAE,KAAK,EAAE,OAAO,EAChD,MAAM,+BAA+B,CAAC;AACvC,cAAc,+CAA+C,CAAC"}

package/dist/amd/index.js

@@ -1,19 +1,20 @@
-define(["require", "exports", "tslib", "./disposable", "./services", "./connection", "./monaco-language-client", "./monaco-commands", "./console-window", "./monaco-languages", "./monaco-workspace", "./monaco-services", "./monaco-converter"], function (require, exports, tslib_1, disposable_1, services_1, connection_1, monaco_language_client_1, monaco_commands_1, console_window_1, monaco_languages_1, monaco_workspace_1, monaco_services_1, monaco_converter_1) {
+define(["require", "exports", "tslib", "./disposable", "./monaco-language-client", "./console-window", "./monaco-workspace", "./monaco-services", "vscode-jsonrpc/lib/common/api", "vscode-languageserver-protocol/lib/common/api"], function (require, exports, tslib_1, disposable_1, monaco_language_client_1, console_window_1, monaco_workspace_1, monaco_services_1, api_1, api_2) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
+    exports.Emitter = exports.Event = exports.CancellationToken = exports.Disposable = void 0;
     /* --------------------------------------------------------------------------------------------
      * Copyright (c) 2018-2022 TypeFox GmbH (http://www.typefox.io). All rights reserved.
      * Licensed under the MIT License. See License.txt in the project root for license information.
      * ------------------------------------------------------------------------------------------ */
     tslib_1.__exportStar(disposable_1, exports);
-    tslib_1.__exportStar(services_1, exports);
-    tslib_1.__exportStar(connection_1, exports);
     tslib_1.__exportStar(monaco_language_client_1, exports);
-    tslib_1.__exportStar(monaco_commands_1, exports);
     tslib_1.__exportStar(console_window_1, exports);
-    tslib_1.__exportStar(monaco_languages_1, exports);
     tslib_1.__exportStar(monaco_workspace_1, exports);
     tslib_1.__exportStar(monaco_services_1, exports);
-    tslib_1.__exportStar(monaco_converter_1, exports);
+    Object.defineProperty(exports, "Disposable", { enumerable: true, get: function () { return api_1.Disposable; } });
+    Object.defineProperty(exports, "CancellationToken", { enumerable: true, get: function () { return api_1.CancellationToken; } });
+    Object.defineProperty(exports, "Event", { enumerable: true, get: function () { return api_1.Event; } });
+    Object.defineProperty(exports, "Emitter", { enumerable: true, get: function () { return api_1.Emitter; } });
+    tslib_1.__exportStar(api_2, exports);
 });
 //# sourceMappingURL=index.js.map

package/dist/amd/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;IAAA;;;oGAGgG;IAChG,4CAA6B;IAC7B,0CAA2B;IAC3B,4CAA6B;IAC7B,wDAAyC;IACzC,iDAAkC;IAClC,gDAAiC;IACjC,kDAAmC;IACnC,kDAAmC;IACnC,iDAAkC;IAClC,kDAAmC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;IAAA;;;oGAGgG;IAChG,4CAA6B;IAC7B,wDAAyC;IACzC,gDAAiC;IACjC,kDAAmC;IACnC,iDAAkC;IAG9B,iGAAA,UAAU,OAAA;IAAE,wGAAA,iBAAiB,OAAA;IAAE,4FAAA,KAAK,OAAA;IAAE,8FAAA,OAAO,OAAA;IAEjD,qCAA8D"}

package/dist/amd/monaco-language-client.d.ts

@@ -1,13 +1,19 @@
-import { BaseLanguageClient, MessageTransports, LanguageClientOptions } from "vscode-languageclient";
-import { IConnectionProvider } from './connection';
+import { BaseLanguageClient, MessageTransports, LanguageClientOptions } from "vscode-languageclient/lib/common/client";
 export * from 'vscode-languageclient/lib/common/client';
 import type * as vscode from 'vscode';
+export interface IConnectionProvider {
+    get(encoding: string): Promise<MessageTransports>;
+}
 export declare class MonacoLanguageClient extends BaseLanguageClient {
-    static bypassConversion: (result: any, token?: vscode.CancellationToken | undefined) => any;
+    static bypassConversion: (result: any, token?: vscode.CancellationToken) => any;
     protected readonly connectionProvider: IConnectionProvider;
     constructor({ id, name, clientOptions, connectionProvider }: MonacoLanguageClient.Options);
     protected createMessageTransports(encoding: string): Promise<MessageTransports>;
     protected getLocale(): string;
+    protected registerBuiltinFeatures(): void;
+    registerTextDocumentSaveFeatures(): void;
+    registerConfigurationFeatures(): void;
+    registerProgressFeatures(): void;
 }
 export declare namespace MonacoLanguageClient {
     interface Options {

package/dist/amd/monaco-language-client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"monaco-language-client.d.ts","sourceRoot":"","sources":["../../src/monaco-language-client.ts"],"names":[],"mappings":"AAIA,OAAO,EACH,kBAAkB,EAAE,iBAAiB,EAAE,qBAAqB,EAC/D,MAAM,uBAAuB,CAAC;AAG/B,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAGnD,cAAc,yCAAyC,CAAC;AACxD,OAAO,KAAK,KAAK,MAAM,MAAM,QAAQ,CAAA;AAErC,qBAAa,oBAAqB,SAAQ,kBAAkB;IAExD,MAAM,CAAC,gBAAgB,WAAY,GAAG,uDAAoH;IAE1J,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,mBAAmB,CAAC;gBAE/C,EAAE,EAAE,EAAE,IAAI,EAAE,aAAa,EAAE,kBAAkB,EAAE,EAAE,oBAAoB,CAAC,OAAO;IA+CzF,SAAS,CAAC,uBAAuB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAI/E,SAAS,CAAC,SAAS,IAAI,MAAM;CAGhC;AACD,yBAAiB,oBAAoB,CAAC;IAClC,UAAiB,OAAO;QACpB,IAAI,EAAE,MAAM,CAAC;QACb,EAAE,CAAC,EAAE,MAAM,CAAC;QACZ,aAAa,EAAE,qBAAqB,CAAC;QACrC,kBAAkB,EAAE,mBAAmB,CAAC;KAC3C;CACJ"}
+{"version":3,"file":"monaco-language-client.d.ts","sourceRoot":"","sources":["../../src/monaco-language-client.ts"],"names":[],"mappings":"AAIA,OAAO,EACH,kBAAkB,EAAE,iBAAiB,EAAE,qBAAqB,EAC/D,MAAM,yCAAyC,CAAC;AAEjD,cAAc,yCAAyC,CAAC;AACxD,OAAO,KAAK,KAAK,MAAM,MAAM,QAAQ,CAAA;AA8BrC,MAAM,WAAW,mBAAmB;IAChC,GAAG,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;CACrD;AACD,qBAAa,oBAAqB,SAAQ,kBAAkB;IAExD,MAAM,CAAC,gBAAgB,WAAY,GAAG,UAAU,OAAO,iBAAiB,SAAkF;IAE1J,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,mBAAmB,CAAC;gBAE/C,EAAE,EAAE,EAAE,IAAI,EAAE,aAAa,EAAE,kBAAkB,EAAE,EAAE,oBAAoB,CAAC,OAAO;IAsBzF,SAAS,CAAC,uBAAuB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAI/E,SAAS,CAAC,SAAS,IAAI,MAAM;cAIV,uBAAuB;IAoCnC,gCAAgC;IAMhC,6BAA6B;IAK7B,wBAAwB;CAGlC;AACD,yBAAiB,oBAAoB,CAAC;IAClC,UAAiB,OAAO;QACpB,IAAI,EAAE,MAAM,CAAC;QACb,EAAE,CAAC,EAAE,MAAM,CAAC;QACZ,aAAa,EAAE,qBAAqB,CAAC;QACrC,kBAAkB,EAAE,mBAAmB,CAAC;KAC3C;CACJ"}

package/dist/amd/monaco-language-client.js

@@ -1,50 +1,22 @@
-define(["require", "exports", "tslib", "vscode-languageclient", "vscode-languageclient/lib/common/client"], function (require, exports, tslib_1, vscode_languageclient_1, client_1) {
+define(["require", "exports", "tslib", "vscode-languageclient/lib/common/client", "vscode-languageclient/lib/common/client", "vscode-languageclient/lib/common/configuration", "vscode-languageclient/lib/common/textSynchronization", "vscode-languageclient/lib/common/completion", "vscode-languageclient/lib/common/hover", "vscode-languageclient/lib/common/signatureHelp", "vscode-languageclient/lib/common/definition", "vscode-languageclient/lib/common/reference", "vscode-languageclient/lib/common/documentHighlight", "vscode-languageclient/lib/common/documentSymbol", "vscode-languageclient/lib/common/codeAction", "vscode-languageclient/lib/common/codeLens", "vscode-languageclient/lib/common/formatting", "vscode-languageclient/lib/common/rename", "vscode-languageclient/lib/common/documentLink", "vscode-languageclient/lib/common/executeCommand", "vscode-languageclient/lib/common/typeDefinition", "vscode-languageclient/lib/common/implementation", "vscode-languageclient/lib/common/colorProvider", "vscode-languageclient/lib/common/workspaceFolder", "vscode-languageclient/lib/common/foldingRange", "vscode-languageclient/lib/common/declaration", "vscode-languageclient/lib/common/selectionRange", "vscode-languageclient/lib/common/semanticTokens", "vscode-languageclient/lib/common/linkedEditingRange", "vscode-languageclient/lib/common/inlayHint", "vscode-languageclient/lib/common/diagnostic", "vscode-languageclient/lib/common/progress"], function (require, exports, tslib_1, client_1, client_2, configuration_1, textSynchronization_1, completion_1, hover_1, signatureHelp_1, definition_1, reference_1, documentHighlight_1, documentSymbol_1, codeAction_1, codeLens_1, formatting_1, rename_1, documentLink_1, executeCommand_1, typeDefinition_1, implementation_1, colorProvider_1, workspaceFolder_1, foldingRange_1, declaration_1, selectionRange_1, semanticTokens_1, linkedEditingRange_1, inlayHint_1, diagnostic_1, progress_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.MonacoLanguageClient = void 0;
-    tslib_1.__exportStar(client_1, exports);
-    class MonacoLanguageClient extends vscode_languageclient_1.BaseLanguageClient {
+    tslib_1.__exportStar(client_2, exports);
+    class MonacoLanguageClient extends client_1.BaseLanguageClient {
         constructor({ id, name, clientOptions, connectionProvider }) {
             super(id || name.toLowerCase(), name, clientOptions);
             this.connectionProvider = connectionProvider;
-            // bypass LSP <=> VS Code conversion
-            const self = this;
-            self._p2c = new Proxy(self._p2c, {
-                get: (target, prop) => {
-                    if (prop === 'asUri') {
-                        return target[prop];
-                    }
-                    return MonacoLanguageClient.bypassConversion;
-                }
-            });
-            self._c2p = new Proxy(self._c2p, {
-                get: (target, prop) => {
-                    if (prop === 'asUri') {
-                        return target[prop];
-                    }
-                    if (prop === 'asCompletionParams') {
-                        return (textDocument, position, context) => {
-                            return {
-                                textDocument: target.asTextDocumentIdentifier(textDocument),
-                                position,
-                                context
-                            };
-                        };
-                    }
-                    if (prop === 'asWillSaveTextDocumentParams') {
-                        return (event) => {
-                            return {
-                                textDocument: target.asTextDocumentIdentifier(event.document),
-                                reason: event.reason
-                            };
-                        };
-                    }
-                    if (prop.endsWith('Params')) {
-                        return target[prop];
-                    }
-                    return MonacoLanguageClient.bypassConversion;
-                }
-            });
+            // Hack because vscode-language client rejects the whole registration block if one capability registration has no associated client feature registered
+            // Some language servers still send the registration even though the client says it doesn't support it
+            const originalHandleRegistrationRequest = this['handleRegistrationRequest'].bind(this);
+            this['handleRegistrationRequest'] = (params) => {
+                originalHandleRegistrationRequest(Object.assign(Object.assign({}, params), { registrations: params.registrations.filter(registration => this.getFeature(registration.method) != null) }));
+            };
+            const originalHandleUnregistrationRequest = this['handleUnregistrationRequest'].bind(this);
+            this['handleUnregistrationRequest'] = (params) => {
+                originalHandleUnregistrationRequest(Object.assign(Object.assign({}, params), { unregisterations: params.unregisterations.filter(unregistration => this.getFeature(unregistration.method) != null) }));
+            };
         }
         createMessageTransports(encoding) {
             return this.connectionProvider.get(encoding);
@@ -52,6 +24,53 @@ define(["require", "exports", "tslib", "vscode-languageclient", "vscode-language
         getLocale() {
             return navigator.language || 'en-US';
         }
+        registerBuiltinFeatures() {
+            this.registerFeature(new textSynchronization_1.DidOpenTextDocumentFeature(this, this['_syncedDocuments']));
+            this.registerFeature(new textSynchronization_1.DidChangeTextDocumentFeature(this));
+            this.registerFeature(new textSynchronization_1.DidCloseTextDocumentFeature(this, this['_syncedDocuments']));
+            this.registerFeature(new completion_1.CompletionItemFeature(this));
+            this.registerFeature(new hover_1.HoverFeature(this));
+            this.registerFeature(new signatureHelp_1.SignatureHelpFeature(this));
+            this.registerFeature(new definition_1.DefinitionFeature(this));
+            this.registerFeature(new reference_1.ReferencesFeature(this));
+            this.registerFeature(new documentHighlight_1.DocumentHighlightFeature(this));
+            this.registerFeature(new documentSymbol_1.DocumentSymbolFeature(this));
+            this.registerFeature(new codeAction_1.CodeActionFeature(this));
+            this.registerFeature(new codeLens_1.CodeLensFeature(this));
+            this.registerFeature(new formatting_1.DocumentFormattingFeature(this));
+            this.registerFeature(new formatting_1.DocumentRangeFormattingFeature(this));
+            this.registerFeature(new formatting_1.DocumentOnTypeFormattingFeature(this));
+            this.registerFeature(new rename_1.RenameFeature(this));
+            this.registerFeature(new documentLink_1.DocumentLinkFeature(this));
+            this.registerFeature(new executeCommand_1.ExecuteCommandFeature(this));
+            this.registerFeature(new typeDefinition_1.TypeDefinitionFeature(this));
+            this.registerFeature(new implementation_1.ImplementationFeature(this));
+            this.registerFeature(new colorProvider_1.ColorProviderFeature(this));
+            // We only register the workspace folder feature if the client is not locked
+            // to a specific workspace folder.
+            if (this.clientOptions.workspaceFolder === undefined) {
+                this.registerFeature(new workspaceFolder_1.WorkspaceFoldersFeature(this));
+            }
+            this.registerFeature(new foldingRange_1.FoldingRangeFeature(this));
+            this.registerFeature(new declaration_1.DeclarationFeature(this));
+            this.registerFeature(new selectionRange_1.SelectionRangeFeature(this));
+            this.registerFeature(new semanticTokens_1.SemanticTokensFeature(this));
+            this.registerFeature(new linkedEditingRange_1.LinkedEditingFeature(this));
+            this.registerFeature(new inlayHint_1.InlayHintsFeature(this));
+            this.registerFeature(new diagnostic_1.DiagnosticFeature(this));
+        }
+        registerTextDocumentSaveFeatures() {
+            this.registerFeature(new textSynchronization_1.WillSaveFeature(this));
+            this.registerFeature(new textSynchronization_1.WillSaveWaitUntilFeature(this));
+            this.registerFeature(new textSynchronization_1.DidSaveTextDocumentFeature(this));
+        }
+        registerConfigurationFeatures() {
+            this.registerFeature(new configuration_1.ConfigurationFeature(this));
+            this.registerFeature(new configuration_1.SyncConfigurationFeature(this));
+        }
+        registerProgressFeatures() {
+            this.registerFeature(new progress_1.ProgressFeature(this));
+        }
     }
     exports.MonacoLanguageClient = MonacoLanguageClient;
     MonacoLanguageClient.bypassConversion = (result, token) => token != null ? Promise.resolve(result || undefined) : (result || undefined);

package/dist/amd/monaco-language-client.js.map

@@ -1 +1 @@
-{"version":3,"file":"monaco-language-client.js","sourceRoot":"","sources":["../../src/monaco-language-client.ts"],"names":[],"mappings":";;;;IAYA,wCAAwD;IAGxD,MAAa,oBAAqB,SAAQ,0CAAkB;QAMxD,YAAY,EAAE,EAAE,EAAE,IAAI,EAAE,aAAa,EAAE,kBAAkB,EAAgC;YACrF,KAAK,CAAC,EAAE,IAAI,IAAI,CAAC,WAAW,EAAE,EAAE,IAAI,EAAE,aAAa,CAAC,CAAC;YACrD,IAAI,CAAC,kBAAkB,GAAG,kBAAkB,CAAC;YAE7C,oCAAoC;YACpC,MAAM,IAAI,GAGN,IAAW,CAAC;YAChB,IAAI,CAAC,IAAI,GAAG,IAAI,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE;gBAC7B,GAAG,EAAE,CAAC,MAAW,EAAE,IAAY,EAAE,EAAE;oBAC/B,IAAI,IAAI,KAAK,OAAO,EAAE;wBAClB,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC;qBACvB;oBACD,OAAO,oBAAoB,CAAC,gBAAgB,CAAC;gBACjD,CAAC;aACJ,CAAC,CAAC;YACH,IAAI,CAAC,IAAI,GAAG,IAAI,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE;gBAC7B,GAAG,EAAE,CAAC,MAAqB,EAAE,IAAY,EAAE,EAAE;oBACzC,IAAI,IAAI,KAAK,OAAO,EAAE;wBAClB,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC;qBACvB;oBACD,IAAI,IAAI,KAAK,oBAAoB,EAAE;wBAC/B,OAAO,CAAC,YAAiB,EAAE,QAAa,EAAE,OAAY,EAAoB,EAAE;4BACxE,OAAO;gCACH,YAAY,EAAE,MAAM,CAAC,wBAAwB,CAAC,YAAY,CAAC;gCAC3D,QAAQ;gCACR,OAAO;6BACV,CAAA;wBACL,CAAC,CAAA;qBACJ;oBACD,IAAI,IAAI,KAAK,8BAA8B,EAAE;wBACzC,OAAO,CAAC,KAAU,EAA8B,EAAE;4BAC9C,OAAO;gCACH,YAAY,EAAE,MAAM,CAAC,wBAAwB,CAAC,KAAK,CAAC,QAAQ,CAAC;gCAC7D,MAAM,EAAE,KAAK,CAAC,MAAM;6BACvB,CAAA;wBACL,CAAC,CAAA;qBACJ;oBACD,IAAI,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;wBACzB,OAAQ,MAAc,CAAC,IAAI,CAAC,CAAC;qBAChC;oBACD,OAAO,oBAAoB,CAAC,gBAAgB,CAAC;gBACjD,CAAC;aACJ,CAAC,CAAC;QACP,CAAC;QAES,uBAAuB,CAAC,QAAgB;YAC9C,OAAO,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACjD,CAAC;QAES,SAAS;YACf,OAAO,SAAS,CAAC,QAAQ,IAAI,OAAO,CAAA;QACxC,CAAC;;IA3DL,oDA4DC;IA1DU,qCAAgB,GAAG,CAAC,MAAW,EAAE,KAAgC,EAAE,EAAE,CAAC,KAAK,IAAI,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,IAAI,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,IAAI,SAAS,CAAC,CAAC"}
+{"version":3,"file":"monaco-language-client.js","sourceRoot":"","sources":["../../src/monaco-language-client.ts"],"names":[],"mappings":"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"}

package/dist/amd/monaco-services.d.ts

@@ -1,23 +1,19 @@
-import type * as monaco from 'monaco-editor/esm/vs/editor/editor.api';
-import { MonacoCommands } from './monaco-commands';
-import { MonacoLanguages } from "./monaco-languages";
 import { MonacoWorkspace } from "./monaco-workspace";
 import { ConsoleWindow } from "./console-window";
-import { Services } from "./services";
-import { Disposable } from './disposable';
+import { Services } from "vscode/services";
+import * as vscode from 'vscode';
 export interface MonacoServices extends Services {
-    commands: MonacoCommands;
-    languages: MonacoLanguages;
     workspace: MonacoWorkspace;
     window: ConsoleWindow;
 }
 export declare namespace MonacoServices {
     interface Options {
-        rootUri?: string;
+        workspaceFolders?: vscode.WorkspaceFolder[];
+        rootPath?: string;
     }
     type Provider = () => MonacoServices;
-    function create(_monaco: typeof monaco, options?: Options): MonacoServices;
-    function install(_monaco: typeof monaco, options?: Options): Disposable;
+    function create(options?: Options): MonacoServices;
+    function install(options?: Options): vscode.Disposable;
     function get(): MonacoServices;
 }
 //# sourceMappingURL=monaco-services.d.ts.map

package/dist/amd/monaco-services.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"monaco-services.d.ts","sourceRoot":"","sources":["../../src/monaco-services.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,KAAK,MAAM,MAAM,wCAAwC,CAAC;AAEtE,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,UAAU,EAAwB,MAAM,cAAc,CAAC;AAEhE,MAAM,WAAW,cAAe,SAAQ,QAAQ;IAC5C,QAAQ,EAAE,cAAc,CAAA;IACxB,SAAS,EAAE,eAAe,CAAA;IAC1B,SAAS,EAAE,eAAe,CAAA;IAC1B,MAAM,EAAE,aAAa,CAAA;CACxB;AACD,yBAAiB,cAAc,CAAC;IAC5B,UAAiB,OAAO;QACpB,OAAO,CAAC,EAAE,MAAM,CAAA;KACnB;IACD,KAAY,QAAQ,GAAG,MAAM,cAAc,CAAC;IAC5C,SAAgB,MAAM,CAAC,OAAO,EAAE,OAAO,MAAM,EAAE,OAAO,GAAE,OAAY,GAAG,cAAc,CASpF;IACD,SAAgB,OAAO,CAAC,OAAO,EAAE,OAAO,MAAM,EAAE,OAAO,GAAE,OAAY,GAAG,UAAU,CAQjF;IACD,SAAgB,GAAG,IAAI,cAAc,CAEpC;CACJ"}
+{"version":3,"file":"monaco-services.d.ts","sourceRoot":"","sources":["../../src/monaco-services.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAA;AAEhC,MAAM,WAAW,cAAe,SAAQ,QAAQ;IAC5C,SAAS,EAAE,eAAe,CAAA;IAC1B,MAAM,EAAE,aAAa,CAAA;CACxB;AACD,yBAAiB,cAAc,CAAC;IAC5B,UAAiB,OAAO;QACpB,gBAAgB,CAAC,EAAE,MAAM,CAAC,eAAe,EAAE,CAAA;QAC3C,QAAQ,CAAC,EAAE,MAAM,CAAA;KACpB;IACD,KAAY,QAAQ,GAAG,MAAM,cAAc,CAAC;IAC5C,SAAgB,MAAM,CAAC,OAAO,GAAE,OAAY,GAAG,cAAc,CAK5D;IACD,SAAgB,OAAO,CAAC,OAAO,GAAE,OAAY,GAAG,MAAM,CAAC,UAAU,CAGhE;IACD,SAAgB,GAAG,IAAI,cAAc,CAEpC;CACJ"}

package/dist/amd/monaco-services.js

@@ -1,26 +1,19 @@
-define(["require", "exports", "./monaco-converter", "./monaco-commands", "./monaco-languages", "./monaco-workspace", "./console-window", "./services", "./disposable"], function (require, exports, monaco_converter_1, monaco_commands_1, monaco_languages_1, monaco_workspace_1, console_window_1, services_1, disposable_1) {
+define(["require", "exports", "./monaco-workspace", "./console-window", "vscode/services"], function (require, exports, monaco_workspace_1, console_window_1, services_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.MonacoServices = void 0;
     var MonacoServices;
     (function (MonacoServices) {
-        function create(_monaco, options = {}) {
-            const m2p = new monaco_converter_1.MonacoToProtocolConverter(_monaco);
-            const p2m = new monaco_converter_1.ProtocolToMonacoConverter(_monaco);
+        function create(options = {}) {
             return {
-                commands: new monaco_commands_1.MonacoCommands(_monaco),
-                languages: new monaco_languages_1.MonacoLanguages(_monaco, p2m, m2p),
-                workspace: new monaco_workspace_1.MonacoWorkspace(_monaco, p2m, m2p, options.rootUri),
+                workspace: new monaco_workspace_1.MonacoWorkspace(options.workspaceFolders, options.rootPath),
                 window: new console_window_1.ConsoleWindow()
             };
         }
         MonacoServices.create = create;
-        function install(_monaco, options = {}) {
-            const disposableCollection = new disposable_1.DisposableCollection();
-            const services = create(_monaco, options);
-            disposableCollection.push(services.workspace);
-            disposableCollection.push(services_1.Services.install(services));
-            return disposableCollection;
+        function install(options = {}) {
+            const services = create(options);
+            return services_1.Services.install(services);
         }
         MonacoServices.install = install;
         function get() {

package/dist/amd/monaco-services.js.map

@@ -1 +1 @@
-{"version":3,"file":"monaco-services.js","sourceRoot":"","sources":["../../src/monaco-services.ts"],"names":[],"mappings":";;;;IAmBA,IAAiB,cAAc,CA2B9B;IA3BD,WAAiB,cAAc;QAK3B,SAAgB,MAAM,CAAC,OAAsB,EAAE,UAAmB,EAAE;YAChE,MAAM,GAAG,GAAG,IAAI,4CAAyB,CAAC,OAAO,CAAC,CAAC;YACnD,MAAM,GAAG,GAAG,IAAI,4CAAyB,CAAC,OAAO,CAAC,CAAC;YACnD,OAAO;gBACH,QAAQ,EAAE,IAAI,gCAAc,CAAC,OAAO,CAAC;gBACrC,SAAS,EAAE,IAAI,kCAAe,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,CAAC;gBACjD,SAAS,EAAE,IAAI,kCAAe,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,OAAO,CAAC,OAAO,CAAC;gBAClE,MAAM,EAAE,IAAI,8BAAa,EAAE;aAC9B,CAAA;QACL,CAAC;QATe,qBAAM,SASrB,CAAA;QACD,SAAgB,OAAO,CAAC,OAAsB,EAAE,UAAmB,EAAE;YACjE,MAAM,oBAAoB,GAAG,IAAI,iCAAoB,EAAE,CAAA;YAEvD,MAAM,QAAQ,GAAG,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;YAC1C,oBAAoB,CAAC,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAA;YAC7C,oBAAoB,CAAC,IAAI,CAAC,mBAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC;YAEtD,OAAO,oBAAoB,CAAC;QAChC,CAAC;QARe,sBAAO,UAQtB,CAAA;QACD,SAAgB,GAAG;YACf,OAAO,mBAAQ,CAAC,GAAG,EAAoB,CAAC;QAC5C,CAAC;QAFe,kBAAG,MAElB,CAAA;IACL,CAAC,EA3BgB,cAAc,GAAd,sBAAc,KAAd,sBAAc,QA2B9B"}
+{"version":3,"file":"monaco-services.js","sourceRoot":"","sources":["../../src/monaco-services.ts"],"names":[],"mappings":";;;;IAaA,IAAiB,cAAc,CAmB9B;IAnBD,WAAiB,cAAc;QAM3B,SAAgB,MAAM,CAAC,UAAmB,EAAE;YACxC,OAAO;gBACH,SAAS,EAAE,IAAI,kCAAe,CAAC,OAAO,CAAC,gBAAgB,EAAE,OAAO,CAAC,QAAQ,CAAC;gBAC1E,MAAM,EAAE,IAAI,8BAAa,EAAE;aAC9B,CAAA;QACL,CAAC;QALe,qBAAM,SAKrB,CAAA;QACD,SAAgB,OAAO,CAAC,UAAmB,EAAE;YACzC,MAAM,QAAQ,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC;YACjC,OAAO,mBAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QACtC,CAAC;QAHe,sBAAO,UAGtB,CAAA;QACD,SAAgB,GAAG;YACf,OAAO,mBAAQ,CAAC,GAAG,EAAoB,CAAC;QAC5C,CAAC;QAFe,kBAAG,MAElB,CAAA;IACL,CAAC,EAnBgB,cAAc,GAAd,sBAAc,KAAd,sBAAc,QAmB9B"}

package/dist/amd/monaco-workspace.d.ts

@@ -1,30 +1,8 @@
-import type * as monaco from 'monaco-editor/esm/vs/editor/editor.api';
-import { MonacoToProtocolConverter, ProtocolToMonacoConverter } from './monaco-converter';
-import { Workspace, WorkspaceEdit, TextDocumentDidChangeEvent, Event, Emitter, Disposable } from './services';
-import { TextDocument } from 'vscode-languageserver-textdocument';
-import { DisposableCollection } from './disposable';
-export declare class MonacoWorkspace implements Workspace, Disposable {
-    protected readonly _monaco: typeof monaco;
-    protected readonly p2m: ProtocolToMonacoConverter;
-    protected readonly m2p: MonacoToProtocolConverter;
-    protected _rootUri: string | null;
-    protected readonly disposableCollection: DisposableCollection;
-    protected readonly documents: Map<string, TextDocument>;
-    protected readonly documentDisposables: Map<string, Disposable>;
-    protected readonly onDidOpenTextDocumentEmitter: Emitter<TextDocument>;
-    protected readonly onDidCloseTextDocumentEmitter: Emitter<TextDocument>;
-    protected readonly onDidChangeTextDocumentEmitter: Emitter<TextDocumentDidChangeEvent>;
-    constructor(_monaco: typeof monaco, p2m: ProtocolToMonacoConverter, m2p: MonacoToProtocolConverter, _rootUri?: string | null);
-    dispose(): void;
-    get rootUri(): string | null;
-    protected removeModel(model: monaco.editor.IModel): void;
-    protected addModel(model: monaco.editor.IModel): void;
-    protected onDidChangeContent(uri: string, model: monaco.editor.IModel, event: monaco.editor.IModelContentChangedEvent): void;
-    protected setModel(uri: string, model: monaco.editor.IModel): TextDocument;
-    get textDocuments(): TextDocument[];
-    get onDidOpenTextDocument(): Event<TextDocument>;
-    get onDidCloseTextDocument(): Event<TextDocument>;
-    get onDidChangeTextDocument(): Event<TextDocumentDidChangeEvent>;
-    applyEdit(workspaceEdit: WorkspaceEdit): Promise<boolean>;
+import * as vscode from 'vscode';
+import { Workspace } from 'vscode/services';
+export declare class MonacoWorkspace implements Workspace {
+    readonly workspaceFolders?: vscode.WorkspaceFolder[] | undefined;
+    readonly rootPath?: string | undefined;
+    constructor(workspaceFolders?: vscode.WorkspaceFolder[] | undefined, rootPath?: string | undefined);
 }
 //# sourceMappingURL=monaco-workspace.d.ts.map

package/dist/amd/monaco-workspace.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"monaco-workspace.d.ts","sourceRoot":"","sources":["../../src/monaco-workspace.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,KAAK,MAAM,MAAM,wCAAwC,CAAC;AACtE,OAAO,EAAE,yBAAyB,EAAE,yBAAyB,EAAE,MAAM,oBAAoB,CAAC;AAC1F,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,0BAA0B,EAAE,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAC9G,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAA;AACjE,OAAO,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AAEpD,qBAAa,eAAgB,YAAW,SAAS,EAAE,UAAU;IAUrD,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,OAAO,MAAM;IACzC,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,yBAAyB;IACjD,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,yBAAyB;IACjD,SAAS,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAXrC,SAAS,CAAC,QAAQ,CAAC,oBAAoB,uBAA6B;IACpE,SAAS,CAAC,QAAQ,CAAC,SAAS,4BAAmC;IAC/D,SAAS,CAAC,QAAQ,CAAC,mBAAmB,0BAAiC;IACvE,SAAS,CAAC,QAAQ,CAAC,4BAA4B,wBAA+B;IAC9E,SAAS,CAAC,QAAQ,CAAC,6BAA6B,wBAA+B;IAC/E,SAAS,CAAC,QAAQ,CAAC,8BAA8B,sCAA6C;gBAGvE,OAAO,EAAE,OAAO,MAAM,EACtB,GAAG,EAAE,yBAAyB,EAC9B,GAAG,EAAE,yBAAyB,EACvC,QAAQ,GAAE,MAAM,GAAG,IAAW;IAa5C,OAAO,IAAI,IAAI;IAQf,IAAI,OAAO,kBAEV;IAED,SAAS,CAAC,WAAW,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,IAAI;IAcxD,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,IAAI;IASrD,SAAS,CAAC,kBAAkB,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,yBAAyB;IAiBrH,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,YAAY;IAM1E,IAAI,aAAa,IAAI,YAAY,EAAE,CAElC;IAED,IAAI,qBAAqB,IAAI,KAAK,CAAC,YAAY,CAAC,CAE/C;IAED,IAAI,sBAAsB,IAAI,KAAK,CAAC,YAAY,CAAC,CAEhD;IAED,IAAI,uBAAuB,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAE/D;IAEM,SAAS,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC;CAmDnE"}
+{"version":3,"file":"monaco-workspace.d.ts","sourceRoot":"","sources":["../../src/monaco-workspace.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AACjC,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAE3C,qBAAa,eAAgB,YAAW,SAAS;aAEzB,gBAAgB,CAAC;aACjB,QAAQ,CAAC;gBADT,gBAAgB,CAAC,sCAA0B,EAC3C,QAAQ,CAAC,oBAAoB;CAGpD"}

package/dist/amd/monaco-workspace.js

@@ -1,128 +1,11 @@
-define(["require", "exports", "./services", "vscode-languageserver-textdocument", "./disposable"], function (require, exports, services_1, vscode_languageserver_textdocument_1, disposable_1) {
+define(["require", "exports"], function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.MonacoWorkspace = void 0;
     class MonacoWorkspace {
-        constructor(_monaco, p2m, m2p, _rootUri = null) {
-            this._monaco = _monaco;
-            this.p2m = p2m;
-            this.m2p = m2p;
-            this._rootUri = _rootUri;
-            this.disposableCollection = new disposable_1.DisposableCollection();
-            this.documents = new Map();
-            this.documentDisposables = new Map();
-            this.onDidOpenTextDocumentEmitter = new services_1.Emitter();
-            this.onDidCloseTextDocumentEmitter = new services_1.Emitter();
-            this.onDidChangeTextDocumentEmitter = new services_1.Emitter();
-            for (const model of this._monaco.editor.getModels()) {
-                this.addModel(model);
-            }
-            this.disposableCollection.push(this._monaco.editor.onDidCreateModel(model => this.addModel(model)));
-            this.disposableCollection.push(this._monaco.editor.onWillDisposeModel(model => this.removeModel(model)));
-            this.disposableCollection.push(this._monaco.editor.onDidChangeModelLanguage((event) => {
-                this.removeModel(event.model);
-                this.addModel(event.model);
-            }));
-        }
-        dispose() {
-            this.disposableCollection.dispose();
-            for (const model of this._monaco.editor.getModels()) {
-                this.removeModel(model);
-            }
-        }
-        get rootUri() {
-            return this._rootUri;
-        }
-        removeModel(model) {
-            const uri = model.uri.toString();
-            const document = this.documents.get(uri);
-            if (document) {
-                this.documents.delete(uri);
-                this.onDidCloseTextDocumentEmitter.fire(document);
-            }
-            const disposable = this.documentDisposables.get(uri);
-            if (disposable) {
-                disposable.dispose();
-                this.documentDisposables.delete(uri);
-            }
-        }
-        addModel(model) {
-            const uri = model.uri.toString();
-            const document = this.setModel(uri, model);
-            this.onDidOpenTextDocumentEmitter.fire(document);
-            this.documentDisposables.set(uri, model.onDidChangeContent(event => this.onDidChangeContent(uri, model, event)));
-        }
-        onDidChangeContent(uri, model, event) {
-            const textDocument = this.setModel(uri, model);
-            const contentChanges = [];
-            for (const change of event.changes) {
-                const range = this.m2p.asRange(change.range);
-                const rangeLength = change.rangeLength;
-                const text = change.text;
-                contentChanges.push({ range, rangeLength, text });
-            }
-            this.onDidChangeTextDocumentEmitter.fire({
-                textDocument,
-                contentChanges,
-                isRedoing: event.isRedoing,
-                isUndoing: event.isUndoing
-            });
-        }
-        setModel(uri, model) {
-            const document = vscode_languageserver_textdocument_1.TextDocument.create(uri, model.getLanguageId(), model.getVersionId(), model.getValue());
-            this.documents.set(uri, document);
-            return document;
-        }
-        get textDocuments() {
-            return Array.from(this.documents.values());
-        }
-        get onDidOpenTextDocument() {
-            return this.onDidOpenTextDocumentEmitter.event;
-        }
-        get onDidCloseTextDocument() {
-            return this.onDidCloseTextDocumentEmitter.event;
-        }
-        get onDidChangeTextDocument() {
-            return this.onDidChangeTextDocumentEmitter.event;
-        }
-        applyEdit(workspaceEdit) {
-            const edit = this.p2m.asWorkspaceEdit(workspaceEdit);
-            // Collect all referenced models
-            const models = edit.edits ? edit.edits.reduce((acc, currentEdit) => {
-                const textEdit = currentEdit;
-                acc[textEdit.resource.toString()] = this._monaco.editor.getModel(textEdit.resource);
-                return acc;
-            }, {}) : {};
-            // If any of the models do not exist, refuse to apply the edit.
-            if (!Object.keys(models).map(uri => models[uri]).every(model => !!model)) {
-                return Promise.resolve(false);
-            }
-            // Group edits by resource so we can batch them when applying
-            const editsByResource = edit.edits ? edit.edits.reduce((acc, currentEdit) => {
-                const textEdit = currentEdit;
-                const uri = textEdit.resource.toString();
-                if (!(uri in acc)) {
-                    acc[uri] = [];
-                }
-                acc[uri].push({
-                    range: this._monaco.Range.lift(textEdit.edit.range),
-                    text: textEdit.edit.text,
-                });
-                return acc;
-            }, {}) : {};
-            // Apply edits for each resource
-            Object.keys(editsByResource).forEach(uri => {
-                models[uri].pushEditOperations([], // Do not try and preserve editor selections.
-                editsByResource[uri].map(resourceEdit => {
-                    return {
-                        identifier: { major: 1, minor: 0 },
-                        range: resourceEdit.range,
-                        text: resourceEdit.text,
-                        forceMoveMarkers: true,
-                    };
-                }), () => []);
-            });
-            return Promise.resolve(true);
+        constructor(workspaceFolders, rootPath) {
+            this.workspaceFolders = workspaceFolders;
+            this.rootPath = rootPath;
         }
     }
     exports.MonacoWorkspace = MonacoWorkspace;