monaco-languageclient 10.5.0-next.1 → 10.6.0

package/src/wrapper/lcmanager.ts

@@ -4,13 +4,13 @@
  * ------------------------------------------------------------------------------------------ */
 
 import { LogLevel } from '@codingame/monaco-vscode-api';
-import { ConsoleLogger, type Logger } from 'monaco-languageclient/common';
+import { ConsoleLogger, type ILogger } from '@codingame/monaco-vscode-log-service-override';
 import type { LanguageClientConfig, LanguageClientConfigs } from './lcconfig.js';
 import { LanguageClientWrapper } from './lcwrapper.js';
 
 export class LanguageClientManager {
 
-    private logger: Logger = new ConsoleLogger();
+    private logger: ILogger = new ConsoleLogger();
     private languageClientConfigs?: LanguageClientConfigs;
     private languageClientWrappers: Map<string, LanguageClientWrapper> = new Map();
 

package/src/wrapper/lcwrapper.ts

@@ -3,13 +3,14 @@
  * Licensed under the MIT License. See LICENSE in the package root for license information.
  * ------------------------------------------------------------------------------------------ */
 
-import { BrowserMessageReader, BrowserMessageWriter } from 'vscode-languageserver-protocol/browser.js';
+import { LogLevel } from '@codingame/monaco-vscode-api';
+import { ConsoleLogger, type ILogger } from '@codingame/monaco-vscode-log-service-override';
+import { MonacoLanguageClient, MonacoLanguageClientWithProposedFeatures } from 'monaco-languageclient';
+import { createUrl, type WorkerConfigOptionsDirect, type WorkerConfigOptionsParams } from 'monaco-languageclient/common';
 import { CloseAction, ErrorAction, MessageTransports, State } from 'vscode-languageclient/browser.js';
-import { ConsoleLogger, createUrl, type Logger, type WorkerConfigOptionsDirect, type WorkerConfigOptionsParams } from 'monaco-languageclient/common';
+import { BrowserMessageReader, BrowserMessageWriter } from 'vscode-languageserver-protocol/browser.js';
 import { toSocket, WebSocketMessageReader, WebSocketMessageWriter } from 'vscode-ws-jsonrpc';
-import { MonacoLanguageClient } from 'monaco-languageclient';
 import type { LanguageClientConfig, LanguageClientRestartOptions } from './lcconfig.js';
-import { LogLevel } from '@codingame/monaco-vscode-api';
 
 export interface LanguageClientError {
     message: string;
@@ -18,12 +19,12 @@ export interface LanguageClientError {
 
 export class LanguageClientWrapper {
 
-    private languageClient?: MonacoLanguageClient;
+    private languageClient?: MonacoLanguageClient | MonacoLanguageClientWithProposedFeatures;
     private languageClientConfig: LanguageClientConfig;
     private worker?: Worker;
     private port?: MessagePort;
     private languageId: string;
-    private logger: Logger | undefined;
+    private logger: ILogger | undefined;
 
     constructor(config: LanguageClientConfig) {
         this.languageClientConfig = config;
@@ -176,7 +177,6 @@ export class LanguageClientWrapper {
             },
             messageTransports
         };
-        this.languageClient = new MonacoLanguageClient(mlcConfig);
 
         const conOptions = this.languageClientConfig.connection.options;
         this.initRestartConfiguration(messageTransports, this.languageClientConfig.restartOptions);
@@ -196,6 +196,11 @@ export class LanguageClientWrapper {
         });
 
         try {
+            this.languageClient = this.languageClientConfig.useClientWithProposedFeatures === true ? new MonacoLanguageClientWithProposedFeatures(mlcConfig) : new MonacoLanguageClient(mlcConfig);
+            if (this.languageClientConfig.registerFeatures !== undefined) {
+                this.languageClient.registerFeatures(this.languageClientConfig.registerFeatures);
+            }
+
             await this.languageClient.start();
 
             if (isWebSocket && conOptions.startOptions !== undefined) {

package/lib/common/logging.d.ts

@@ -1,10 +0,0 @@
-import { ConsoleLogger as VSCodeConsoleLogger, type ILogger } from '@codingame/monaco-vscode-log-service-override';
-import { LogLevel } from '@codingame/monaco-vscode-api';
-export interface Logger extends ILogger {
-    createErrorAndLog(message: string, ...params: unknown[]): Error;
-}
-export declare class ConsoleLogger extends VSCodeConsoleLogger {
-    constructor(logLevel?: LogLevel, useColors?: boolean);
-    createErrorAndLog(message: string, ...params: unknown[]): Error;
-}
-//# sourceMappingURL=logging.d.ts.map

package/lib/common/logging.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"logging.d.ts","sourceRoot":"","sources":["../../src/common/logging.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,aAAa,IAAI,mBAAmB,EAAE,KAAK,OAAO,EAAE,MAAM,+CAA+C,CAAC;AACnH,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAExD,MAAM,WAAW,MAAO,SAAQ,OAAO;IACnC,iBAAiB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;CACnE;AAED,qBAAa,aAAc,SAAQ,mBAAmB;IAElD,YAAY,QAAQ,CAAC,EAAE,QAAQ,EAAE,SAAS,CAAC,EAAE,OAAO,EAEnD;IAED,iBAAiB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,OAAO,EAAE,SAKtD;CAEJ"}

package/lib/common/logging.js

@@ -1,18 +0,0 @@
-/* --------------------------------------------------------------------------------------------
- * Copyright (c) 2024 TypeFox and others.
- * Licensed under the MIT License. See LICENSE in the package root for license information.
- * ------------------------------------------------------------------------------------------ */
-import { ConsoleLogger as VSCodeConsoleLogger } from '@codingame/monaco-vscode-log-service-override';
-import { LogLevel } from '@codingame/monaco-vscode-api';
-export class ConsoleLogger extends VSCodeConsoleLogger {
-    constructor(logLevel, useColors) {
-        super(logLevel ?? LogLevel.Off, useColors);
-    }
-    createErrorAndLog(message, ...params) {
-        if (this.getLevel() >= LogLevel.Error) {
-            this.error(message, ...params);
-        }
-        return new Error(message);
-    }
-}
-//# sourceMappingURL=logging.js.map

package/lib/common/logging.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"logging.js","sourceRoot":"","sources":["../../src/common/logging.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,OAAO,EAAE,aAAa,IAAI,mBAAmB,EAAgB,MAAM,+CAA+C,CAAC;AACnH,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAMxD,MAAM,OAAO,aAAc,SAAQ,mBAAmB;IAElD,YAAY,QAAmB,EAAE,SAAmB,EAAE;QAClD,KAAK,CAAC,QAAQ,IAAI,QAAQ,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IAAA,CAC9C;IAED,iBAAiB,CAAC,OAAe,EAAE,GAAG,MAAiB,EAAE;QACrD,IAAI,IAAI,CAAC,QAAQ,EAAE,IAAI,QAAQ,CAAC,KAAK,EAAE,CAAC;YACpC,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,GAAG,MAAM,CAAC,CAAC;QACnC,CAAC;QACD,OAAO,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;IAAA,CAC7B;CAEJ"}

package/src/common/logging.ts

@@ -1,26 +0,0 @@
-/* --------------------------------------------------------------------------------------------
- * Copyright (c) 2024 TypeFox and others.
- * Licensed under the MIT License. See LICENSE in the package root for license information.
- * ------------------------------------------------------------------------------------------ */
-
-import { ConsoleLogger as VSCodeConsoleLogger, type ILogger } from '@codingame/monaco-vscode-log-service-override';
-import { LogLevel } from '@codingame/monaco-vscode-api';
-
-export interface Logger extends ILogger {
-    createErrorAndLog(message: string, ...params: unknown[]): Error;
-}
-
-export class ConsoleLogger extends VSCodeConsoleLogger {
-
-    constructor(logLevel?: LogLevel, useColors?: boolean) {
-        super(logLevel ?? LogLevel.Off, useColors);
-    }
-
-    createErrorAndLog(message: string, ...params: unknown[]) {
-        if (this.getLevel() >= LogLevel.Error) {
-            this.error(message, ...params);
-        }
-        return new Error(message);
-    }
-
-}