monaco-languageclient 1.0.1 → 2.0.0-dev.1

package/lib/monaco-workspace.js

@@ -1,131 +1,7 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.MonacoWorkspace = void 0;
-const services_1 = require("./services");
-const vscode_languageserver_textdocument_1 = require("vscode-languageserver-textdocument");
-const disposable_1 = require("./disposable");
-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);
+export class MonacoWorkspace {
+    constructor(workspaceFolders, rootPath) {
+        this.workspaceFolders = workspaceFolders;
+        this.rootPath = rootPath;
     }
 }
-exports.MonacoWorkspace = MonacoWorkspace;
 //# sourceMappingURL=monaco-workspace.js.map

package/lib/monaco-workspace.js.map

@@ -1 +1 @@
-{"version":3,"file":"monaco-workspace.js","sourceRoot":"","sources":["../src/monaco-workspace.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"monaco-workspace.js","sourceRoot":"","sources":["../src/monaco-workspace.ts"],"names":[],"mappings":"AAOA,MAAM,OAAO,eAAe;IACxB,YACoB,gBAA2C,EAC3C,QAA6B;QAD7B,qBAAgB,GAAhB,gBAAgB,CAA2B;QAC3C,aAAQ,GAAR,QAAQ,CAAqB;IAEjD,CAAC;CACJ"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "monaco-languageclient",
-  "version": "1.0.1",
+  "version": "2.0.0-dev.1",
   "description": "Monaco Language client implementation",
   "author": {
     "name": "TypeFox GmbH ",
@@ -21,17 +21,25 @@
       "types": "./lib/index.d.ts",
       "default": "./lib/index.js"
     },
+    "./monaco-converter": {
+      "types": "./lib/monaco-converter.d.ts",
+      "default": "./lib/monaco-converter.js"
+    },
+    "./cjs/monaco-converter": {
+      "types": "./dist/cjs/monaco-converter.d.ts",
+      "default": "./dist/cjs/monaco-converter.js"
+    },
+    "./cjs": {
+      "types": "./dist/cjs/index.d.ts",
+      "default": "./dist/cjs/index.js"
+    },
+    "./amd/monaco-converter": {
+      "types": "./dist/amd/monaco-converter.d.ts",
+      "default": "./dist/amd/monaco-converter.js"
+    },
     "./amd": {
       "types": "./dist/amd/index.d.ts",
       "default": "./dist/amd/index.js"
-    },
-    "./vscode-compatibility": {
-      "types": "./lib/vscode-compatibility.d.ts",
-      "default": "./lib/vscode-compatibility.js"
-    },
-    "./amd/vscode-compatibility": {
-      "types": "./dist/amd/vscode-compatibility.d.ts",
-      "default": "./dist/amd/vscode-compatibility.js"
     }
   },
   "files": [
@@ -41,22 +49,25 @@
   ],
   "dependencies": {
     "glob-to-regexp": "^0.4.1",
+    "vscode": "npm:@codingame/monaco-vscode-api@^1.68.0",
     "vscode-jsonrpc": "8.0.1",
     "vscode-languageclient": "8.0.1",
-    "vscode-languageserver-textdocument": "1.0.4",
+    "vscode-languageserver-textdocument": "1.0.5",
     "vscode-uri": "3.0.3"
   },
   "devDependencies": {
-    "@types/vscode": "1.67.0",
+    "@types/glob-to-regexp": "^0.4.1",
     "@types/node": "^16.11.7",
-    "@types/glob-to-regexp": "^0.4.1"
+    "@types/vscode": "1.68.0"
   },
   "scripts": {
     "clean": "npx shx rm -fr lib tsconfig.tsbuildinfo",
     "compile": "tsc",
     "watch": "tsc -w",
-    "clean:amd": "npx shx rm -fr dist",
+    "clean:amd": "npx shx rm -fr dist/amd",
+    "clean:cjs": "npx shx rm -fr dist/cjs",
     "build:amd": "npm run clean:amd && tsc --outDir dist/amd --module amd --declarationDir dist/amd --declaration",
-    "build": "npm run clean && npm run compile && npm run build:amd"
+    "build:cjs": "npm run clean:cjs && tsc --outDir dist/cjs --module commonjs --declarationDir dist/cjs --declaration",
+    "build": "npm run clean && npm run compile && npm run build:amd && npm run build:cjs"
   }
 }

package/src/console-window.ts

@@ -2,31 +2,33 @@
  * 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.
  * ------------------------------------------------------------------------------------------ */
-import { MessageActionItem, MessageType, Window, OutputChannel } from './services';
+import { Window, Severity } from 'vscode/services'
+import * as vscode from 'vscode'
 
 export class ConsoleWindow implements Window {
-    protected readonly channels = new Map<string, OutputChannel>();
-    showMessage<T extends MessageActionItem>(type: MessageType, message: string, ...actions: T[]): Thenable<T | undefined> {
-        if (type === MessageType.Error) {
+    protected readonly channels = new Map<string, vscode.OutputChannel>();
+    showMessage<T extends vscode.MessageOptions | string | vscode.MessageItem>(severity: Severity, message: string, ...actions: T[]): Thenable<T | undefined> {
+        if (severity === Severity.Error) {
             console.error(message);
         }
-        if (type === MessageType.Warning) {
+        if (severity === Severity.Warning) {
             console.warn(message);
         }
-        if (type === MessageType.Info) {
+        if (severity === Severity.Info) {
             console.info(message);
         }
-        if (type === MessageType.Log) {
-            console.log(message);
+        if (severity === Severity.Ignore) {
+            console.debug(message);
         }
         return Promise.resolve(undefined);
     }
-    createOutputChannel(name: string): OutputChannel {
+    createOutputChannel(name: string): vscode.OutputChannel {
         const existing = this.channels.get(name);
         if (existing) {
             return existing;
         }
-        const channel: OutputChannel = {
+        const channel: vscode.OutputChannel = {
+            name: 'default',
             append(value: string): void {
                 console.log(name + ': ' + value);
             },
@@ -38,6 +40,15 @@ export class ConsoleWindow implements Window {
             },
             dispose(): void {
                 // no-op
+            },
+            replace: function (value: string): void {
+                // no-op
+            },
+            clear: function (): void {
+                // no-op
+            },
+            hide: function (): void {
+                // no-op
             }
         }
         this.channels.set(name, channel)

package/src/disposable.ts

@@ -2,7 +2,8 @@
  * 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.
  * ------------------------------------------------------------------------------------------ */
-import { Disposable } from './services';
+
+import { Disposable } from "vscode-jsonrpc";
 
 export {
     Disposable

package/src/index.ts

@@ -3,12 +3,13 @@
  * Licensed under the MIT License. See License.txt in the project root for license information.
  * ------------------------------------------------------------------------------------------ */
 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';

package/src/monaco-converter.ts

@@ -20,7 +20,7 @@ import {
     MarkedString, MarkupContent, ColorInformation, ColorPresentation, FoldingRange, FoldingRangeKind,
     DiagnosticRelatedInformation, MarkupKind, SymbolKind, DocumentSymbol, CodeAction, SignatureHelpContext, SignatureHelpTriggerKind,
     SemanticTokens, InsertTextMode, AnnotatedTextEdit, ChangeAnnotation, InlayHint, InlayHintLabelPart
-} from './services';
+} from 'vscode-languageserver-protocol/lib/common/api';
 
 export type RecursivePartial<T> = {
     [P in keyof T]?: RecursivePartial<T[P]>;
@@ -83,6 +83,9 @@ function isRangeReplace(v: Partial<monaco.IRange> | RangeReplace): v is RangeRep
     return (v as RangeReplace).insert !== undefined;
 }
 
+/**
+ * @deprecated use @CodinGame/monaco-vscode-api and vscode-languageclient/lib/common/codeConverter (see browser example)
+ */
 export class MonacoToProtocolConverter {
     public constructor(protected readonly _monaco: typeof monaco) { }
 
@@ -225,7 +228,7 @@ export class MonacoToProtocolConverter {
             case this._monaco.languages.SignatureHelpTriggerKind.TriggerCharacter:
                 return SignatureHelpTriggerKind.TriggerCharacter;
             default:
-                return SignatureHelpTriggerKind.Invoke;
+                return SignatureHelpTriggerKind.Invoked;
         }
     }
 
@@ -553,6 +556,9 @@ export class MonacoToProtocolConverter {
     }
 }
 
+/**
+ * @deprecated use @CodinGame/monaco-vscode-api and vscode-languageclient/lib/common/protocolConverter (see browser example)
+ */
 export class ProtocolToMonacoConverter {
     public constructor(protected readonly _monaco: typeof monaco) { }
 
@@ -1032,7 +1038,7 @@ export class ProtocolToMonacoConverter {
         }
     }
 
-    asCompletionResult(result: CompletionItem[] | CompletionList | null | undefined, defaultRange: monaco.IRange): monaco.languages.CompletionList {
+    asCompletionResult(result: CompletionItem[] | CompletionList | null | undefined, defaultMonacoRange: monaco.IRange): monaco.languages.CompletionList {
         if (!result) {
             return {
                 incomplete: false,
@@ -1040,29 +1046,30 @@ export class ProtocolToMonacoConverter {
             }
         }
         if (Array.isArray(result)) {
-            const suggestions = result.map(item => this.asCompletionItem(item, defaultRange));
+            const suggestions = result.map(item => this.asCompletionItem(item, defaultMonacoRange, defaultRange));
             return {
                 incomplete: false,
                 suggestions
             }
         }
+        const defaultRange = this.getCompletionItemDefaultRange(result);
         return {
             incomplete: result.isIncomplete,
-            suggestions: result.items.map(item => this.asCompletionItem(item, defaultRange))
+            suggestions: result.items.map(item => this.asCompletionItem(item, defaultMonacoRange, defaultRange, result.itemDefaults))
         }
     }
 
-    asCompletionItem(item: CompletionItem, defaultRange: monaco.IRange | RangeReplace): ProtocolCompletionItem {
-        const result = <ProtocolCompletionItem>{ label: item.label };
+    asCompletionItem(item: CompletionItem, defaultMonacoRange: monaco.IRange | RangeReplace, defaultRange?: monaco.IRange | RangeReplace, itemDefaults?: CompletionList['itemDefaults']): ProtocolCompletionItem {
+        const result = <ProtocolCompletionItem>{ label: this.asCompletionItemLabel(item) };
         if (item.detail) { result.detail = item.detail; }
         if (item.documentation) {
             result.documentation = this.asDocumentation(item.documentation);
             result.documentationFormat = Is.string(item.documentation) ? undefined : item.documentation.kind;
         };
         if (item.filterText) { result.filterText = item.filterText; }
-        const insertText = this.asCompletionInsertText(item, defaultRange);
+        const insertText = this.asCompletionInsertText(item, defaultRange, itemDefaults?.insertTextFormat);
         result.insertText = insertText.insertText;
-        result.range = insertText.range;
+        result.range = insertText.range ?? defaultMonacoRange;
         result.fromEdit = insertText.fromEdit;
         if (insertText.isSnippet) {
             result.insertTextRules = this._monaco.languages.CompletionItemInsertTextRule.InsertAsSnippet;
@@ -1080,15 +1087,38 @@ export class ProtocolToMonacoConverter {
         if (item.command) { result.command = this.asCommand(item.command); }
         if (item.deprecated === true || item.deprecated === false) { result.deprecated = item.deprecated; }
         if (item.preselect === true || item.preselect === false) { result.preselect = item.preselect; }
-        if (item.data !== undefined) { result.data = item.data; }
+        const data = item.data ?? itemDefaults?.data;
+        if (data !== undefined) { result.data = data; }
         if (item.deprecated === true || item.deprecated === false) {
             result.deprecated = item.deprecated;
         }
-        if (item.insertTextMode) { result.insertTextMode = item.insertTextMode; }
+        const insertTextMode = item.insertTextMode ?? itemDefaults?.insertTextMode
+        if (insertTextMode) { result.insertTextMode = insertTextMode; }
         if (item.tags) { result.tags = item.tags; }
         return result;
     }
 
+    getCompletionItemDefaultRange(list: CompletionList): monaco.Range | RangeReplace | undefined {
+        const rangeDefaults = list.itemDefaults?.editRange;
+        return ls.Range.is(rangeDefaults)
+            ? this.asRange(rangeDefaults)
+            : rangeDefaults !== undefined
+                ? { insert: this.asRange(rangeDefaults.insert), replace: this.asRange(rangeDefaults.replace) }
+                : undefined;
+    }
+
+    asCompletionItemLabel(item: ls.CompletionItem): monaco.languages.CompletionItemLabel | string {
+        if (ls.CompletionItemLabelDetails.is(item.labelDetails)) {
+            return {
+                label: item.label,
+                detail: item.labelDetails.detail,
+                description: item.labelDetails.description
+            };
+        } else {
+            return item.label;
+        }
+    }
+
     asCompletionItemKind(value: CompletionItemKind): [monaco.languages.CompletionItemKind, CompletionItemKind | undefined] {
         if (CompletionItemKind.Text <= value && value <= CompletionItemKind.TypeParameter) {
             switch (value) {
@@ -1124,29 +1154,30 @@ export class ProtocolToMonacoConverter {
         return [CompletionItemKind.Text, value];
     }
 
-    asCompletionInsertText(item: CompletionItem, defaultRange: monaco.IRange | RangeReplace)
-        : { insertText: string, range: monaco.IRange | RangeReplace, fromEdit: boolean, isSnippet: boolean } {
-        const isSnippet = item.insertTextFormat === InsertTextFormat.Snippet;
-        if (item.textEdit) {
-            if (TextEdit.is(item.textEdit)) {
-                const range = this.asRange(item.textEdit.range);
-                const value = item.textEdit.newText;
-                return { isSnippet, insertText: value, range, fromEdit: true, };
-            } else {
-                const range = {
-                    insert: this.asRange(item.textEdit.insert),
-                    replace: this.asRange(item.textEdit.replace)
-                };
-                const value = item.textEdit.newText;
-                return { isSnippet, insertText: value, range, fromEdit: true, };
-            }
-        }
-        if (item.insertText) {
+    asCompletionInsertText(item: CompletionItem, defaultRange?: monaco.IRange | RangeReplace, defaultInsertTextFormat?: InsertTextFormat): { insertText: string, range?: monaco.IRange | RangeReplace, fromEdit: boolean, isSnippet: boolean } {
+        const insertTextFormat = item.insertTextFormat ?? defaultInsertTextFormat;
+
+        const isSnippet = insertTextFormat === InsertTextFormat.Snippet;
+        if (item.textEdit !== undefined || defaultRange !== undefined) {
+            const [range, newText] = item.textEdit !== undefined
+                ? this.getCompletionRangeAndText(item.textEdit)
+                : [defaultRange, item.textEditText ?? item.label];
+
+            return { insertText: newText, range: range, fromEdit: true, isSnippet };
+        } else if (item.insertText) {
             return { isSnippet, insertText: item.insertText, fromEdit: false, range: defaultRange };
         }
         return { insertText: item.label, range: defaultRange, fromEdit: false, isSnippet: false };
     }
 
+    getCompletionRangeAndText(value: ls.TextEdit | ls.InsertReplaceEdit): [monaco.Range | RangeReplace, string] {
+        if (ls.InsertReplaceEdit.is(value)) {
+            return [{ insert: this.asRange(value.insert), replace: this.asRange(value.replace) }, value.newText];
+        } else {
+            return [this.asRange(value.range), value.newText];
+        }
+    }
+
     asDocumentLinks(documentLinks: DocumentLink[]): monaco.languages.ILinksList {
         const links = documentLinks.map(link => this.asDocumentLink(link));
         return { links };

package/src/monaco-language-client.ts

@@ -3,16 +3,43 @@
  * Licensed under the MIT License. See License.txt in the project root for license information.
  * ------------------------------------------------------------------------------------------ */
 import {
-    BaseLanguageClient, MessageTransports, LanguageClientOptions
-} from "vscode-languageclient";
-import * as p2c from 'vscode-languageclient/lib/common/protocolConverter';
-import * as c2p from 'vscode-languageclient/lib/common/codeConverter';
-import { IConnectionProvider } from './connection';
+    BaseLanguageClient, MessageTransports, LanguageClientOptions, CloseAction, ErrorAction
+} from "vscode-languageclient/lib/common/client";
 
 export * from 'vscode-languageclient/lib/common/client';
 import type * as vscode from 'vscode'
-import { MonacoC2PConverter, MonacoP2CConverter } from "./converters";
+import { ConfigurationFeature, SyncConfigurationFeature } from "vscode-languageclient/lib/common/configuration";
+import { DidChangeTextDocumentFeature, DidCloseTextDocumentFeature, DidOpenTextDocumentFeature, DidSaveTextDocumentFeature, WillSaveFeature, WillSaveWaitUntilFeature } from "vscode-languageclient/lib/common/textSynchronization";
+import { CompletionItemFeature } from "vscode-languageclient/lib/common/completion";
+import { HoverFeature } from "vscode-languageclient/lib/common/hover";
+import { SignatureHelpFeature } from "vscode-languageclient/lib/common/signatureHelp";
+import { DefinitionFeature } from "vscode-languageclient/lib/common/definition";
+import { ReferencesFeature } from "vscode-languageclient/lib/common/reference";
+import { DocumentHighlightFeature } from "vscode-languageclient/lib/common/documentHighlight";
+import { DocumentSymbolFeature } from "vscode-languageclient/lib/common/documentSymbol";
+import { CodeActionFeature } from "vscode-languageclient/lib/common/codeAction";
+import { CodeLensFeature } from "vscode-languageclient/lib/common/codeLens";
+import { DocumentFormattingFeature, DocumentOnTypeFormattingFeature, DocumentRangeFormattingFeature } from "vscode-languageclient/lib/common/formatting";
+import { RenameFeature } from "vscode-languageclient/lib/common/rename";
+import { DocumentLinkFeature } from "vscode-languageclient/lib/common/documentLink";
+import { ExecuteCommandFeature } from "vscode-languageclient/lib/common/executeCommand";
+import { TypeDefinitionFeature } from "vscode-languageclient/lib/common/typeDefinition";
+import { ImplementationFeature } from "vscode-languageclient/lib/common/implementation";
+import { ColorProviderFeature } from "vscode-languageclient/lib/common/colorProvider";
+import { WorkspaceFoldersFeature } from "vscode-languageclient/lib/common/workspaceFolder";
+import { FoldingRangeFeature } from "vscode-languageclient/lib/common/foldingRange";
+import { DeclarationFeature } from "vscode-languageclient/lib/common/declaration";
+import { SelectionRangeFeature } from "vscode-languageclient/lib/common/selectionRange";
+import { SemanticTokensFeature } from "vscode-languageclient/lib/common/semanticTokens";
+import { LinkedEditingFeature } from "vscode-languageclient/lib/common/linkedEditingRange";
+import { InlayHintsFeature } from "vscode-languageclient/lib/common/inlayHint";
+import { DiagnosticFeature } from "vscode-languageclient/lib/common/diagnostic";
+import { ProgressFeature } from "vscode-languageclient/lib/common/progress";
+import { RegistrationParams, UnregistrationParams } from "vscode-languageclient";
 
+export interface IConnectionProvider {
+    get(encoding: string): Promise<MessageTransports>;
+}
 export class MonacoLanguageClient extends BaseLanguageClient {
 
     static bypassConversion = (result: any, token?: vscode.CancellationToken) => token != null ? Promise.resolve(result || undefined) : (result || undefined);
@@ -23,13 +50,22 @@ export class MonacoLanguageClient extends BaseLanguageClient {
         super(id || name.toLowerCase(), name, clientOptions);
         this.connectionProvider = connectionProvider;
 
-        // bypass LSP <=> VS Code conversion
-        const self: {
-            _p2c: p2c.Converter,
-            _c2p: c2p.Converter
-        } = this as any;
-        self._p2c = new MonacoP2CConverter(self._p2c);
-        self._c2p = new MonacoC2PConverter(self._c2p);
+        // 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: (params: RegistrationParams) => Promise<void> = this['handleRegistrationRequest'].bind(this)
+        this['handleRegistrationRequest'] = (params: RegistrationParams) => {
+            originalHandleRegistrationRequest({
+                ...params,
+                registrations: params.registrations.filter(registration => this.getFeature(<any>registration.method) != null)
+            })
+        }
+        const originalHandleUnregistrationRequest: (params: UnregistrationParams) => Promise<void> = this['handleUnregistrationRequest'].bind(this)
+        this['handleUnregistrationRequest'] = (params: UnregistrationParams) => {
+            originalHandleUnregistrationRequest({
+                ...params,
+                unregisterations: params.unregisterations.filter(unregistration => this.getFeature(<any>unregistration.method) != null)
+            })
+        }
     }
 
     protected createMessageTransports(encoding: string): Promise<MessageTransports> {
@@ -39,6 +75,57 @@ export class MonacoLanguageClient extends BaseLanguageClient {
     protected getLocale(): string {
         return navigator.language || 'en-US'
     }
+
+    protected override registerBuiltinFeatures() {
+        this.registerFeature(new DidOpenTextDocumentFeature(this, this['_syncedDocuments']));
+        this.registerFeature(new DidChangeTextDocumentFeature(this));
+        this.registerFeature(new DidCloseTextDocumentFeature(this, this['_syncedDocuments']));
+        this.registerFeature(new CompletionItemFeature(this));
+        this.registerFeature(new HoverFeature(this));
+        this.registerFeature(new SignatureHelpFeature(this));
+        this.registerFeature(new DefinitionFeature(this));
+        this.registerFeature(new ReferencesFeature(this));
+        this.registerFeature(new DocumentHighlightFeature(this));
+        this.registerFeature(new DocumentSymbolFeature(this));
+        this.registerFeature(new CodeActionFeature(this));
+        this.registerFeature(new CodeLensFeature(this));
+        this.registerFeature(new DocumentFormattingFeature(this));
+        this.registerFeature(new DocumentRangeFormattingFeature(this));
+        this.registerFeature(new DocumentOnTypeFormattingFeature(this));
+        this.registerFeature(new RenameFeature(this));
+        this.registerFeature(new DocumentLinkFeature(this));
+        this.registerFeature(new ExecuteCommandFeature(this));
+        this.registerFeature(new TypeDefinitionFeature(this));
+        this.registerFeature(new ImplementationFeature(this));
+        this.registerFeature(new 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 WorkspaceFoldersFeature(this));
+        }
+        this.registerFeature(new FoldingRangeFeature(this));
+        this.registerFeature(new DeclarationFeature(this));
+        this.registerFeature(new SelectionRangeFeature(this));
+        this.registerFeature(new SemanticTokensFeature(this));
+        this.registerFeature(new LinkedEditingFeature(this));
+        this.registerFeature(new InlayHintsFeature(this));
+        this.registerFeature(new DiagnosticFeature(this));
+    }
+
+    public registerTextDocumentSaveFeatures() {
+        this.registerFeature(new WillSaveFeature(this));
+        this.registerFeature(new WillSaveWaitUntilFeature(this));
+        this.registerFeature(new DidSaveTextDocumentFeature(this));
+    }
+
+    public registerConfigurationFeatures() {
+        this.registerFeature(new ConfigurationFeature(this));
+        this.registerFeature(new SyncConfigurationFeature(this));
+    }
+
+    public registerProgressFeatures() {
+        this.registerFeature(new ProgressFeature(this));
+    }
 }
 export namespace MonacoLanguageClient {
     export interface Options {
@@ -48,3 +135,5 @@ export namespace MonacoLanguageClient {
         connectionProvider: IConnectionProvider;
     }
 }
+
+export { CloseAction, ErrorAction }