Implemented review comments

kaisalmen · kaisalmen · commit 2a0fc76d2405 · 2024-09-25T12:30:29.000+02:00
diff --git a/packages/client/src/index.ts b/packages/client/src/index.ts
@@ -3,7 +3,5 @@
  * Licensed under the MIT License. See LICENSE in the package root for license information.
  * ------------------------------------------------------------------------------------------ */
 
-export type * from './client.js';
 export * from './client.js';
-export type * from './commonTypes.js';
 export * from './commonTypes.js';
diff --git a/packages/client/src/tools/index.ts b/packages/client/src/tools/index.ts
@@ -3,5 +3,4 @@
  * Licensed under the MIT License. See LICENSE in the package root for license information.
  * ------------------------------------------------------------------------------------------ */
 
-export type * from './logging.js';
 export * from './logging.js';
diff --git a/packages/client/src/tools/logging.ts b/packages/client/src/tools/logging.ts
@@ -24,43 +24,3 @@ export class ConsoleLogger extends VSCodeConsoleLogger {
     }
 
 }
-
-export function checkLogLevel(logLevel?: string | number | unknown) {
-    switch (logLevel) {
-        case 'none':
-        case 'Off':
-        case 'off':
-        case '0':
-        case 0:
-            return LogLevel.Off;
-        case 'Trace':
-        case 'trace':
-        case '1':
-        case 1:
-            return LogLevel.Trace;
-        case 'Debug':
-        case 'debug':
-        case '2':
-        case 2:
-            return LogLevel.Debug;
-        case 'Info':
-        case 'info':
-        case '3':
-        case 3:
-            return LogLevel.Info;
-        case 'Warning':
-        case 'warning':
-        case 'Warn':
-        case 'warn':
-        case '4':
-        case 4:
-            return LogLevel.Warning;
-        case 'Error':
-        case 'error':
-        case '5':
-        case 5:
-            return LogLevel.Error;
-        default:
-            return LogLevel.Off;
-    }
-}
diff --git a/packages/client/src/vscode/index.ts b/packages/client/src/vscode/index.ts
@@ -4,6 +4,4 @@
  * ------------------------------------------------------------------------------------------ */
 
 export * from './fakeWorker.js';
-
-export type * from './services.js';
 export * from './services.js';
diff --git a/packages/client/test/tools/index.test.ts b/packages/client/test/tools/index.test.ts
@@ -4,7 +4,7 @@
  * ------------------------------------------------------------------------------------------ */
 
 import { describe, expect, test } from 'vitest';
-import { checkLogLevel, ConsoleLogger } from 'monaco-languageclient/tools';
+import { ConsoleLogger } from 'monaco-languageclient/tools';
 import { LogLevel } from 'vscode/services';
 
 describe('Logger', () => {
@@ -34,7 +34,7 @@ describe('Logger', () => {
     });
 
     test('Config: checkLogLevel debug', () => {
-        const logger = new ConsoleLogger(checkLogLevel(2));
+        const logger = new ConsoleLogger(LogLevel.Debug);
 
         expect(logger.getLevel()).toBe(LogLevel.Debug);
     });
diff --git a/packages/examples/src/browser/main.ts b/packages/examples/src/browser/main.ts
@@ -10,7 +10,7 @@ import '@codingame/monaco-vscode-json-default-extension';
 import { getLanguageService, TextDocument } from 'vscode-json-languageservice';
 import { createConverter as createCodeConverter } from 'vscode-languageclient/lib/common/codeConverter.js';
 import { createConverter as createProtocolConverter } from 'vscode-languageclient/lib/common/protocolConverter.js';
-import { checkLogLevel } from 'monaco-languageclient/tools';
+import { LogLevel } from 'vscode/services';
 import { MonacoEditorLanguageClientWrapper, WrapperConfig } from 'monaco-editor-wrapper';
 import { configureMonacoWorkers } from '../common/client/utils.js';
 
@@ -29,7 +29,7 @@ export const runBrowserEditor = async () => {
 
     const wrapper = new MonacoEditorLanguageClientWrapper();
     const jsonClientUserConfig: WrapperConfig = {
-        logLevel: checkLogLevel(2),
+        logLevel: LogLevel.Debug,
         serviceConfig: {
             userServices: {
                 ...getKeybindingsServiceOverride(),
diff --git a/packages/examples/src/eclipse.jdt.ls/client/main.ts b/packages/examples/src/eclipse.jdt.ls/client/main.ts
@@ -9,7 +9,7 @@ import { RegisteredFileSystemProvider, RegisteredMemoryFile, registerFileSystemO
 // this is required syntax highlighting
 import '@codingame/monaco-vscode-java-default-extension';
 import { MonacoEditorLanguageClientWrapper, WrapperConfig } from 'monaco-editor-wrapper';
-import { checkLogLevel } from 'monaco-languageclient/tools';
+import { LogLevel } from 'vscode/services';
 import { eclipseJdtLsConfig } from '../config.js';
 import helloJavaCode from '../../../resources/eclipse.jdt.ls/workspace/hello.java?raw';
 import { configureMonacoWorkers } from '../../common/client/utils.js';
@@ -21,7 +21,7 @@ export const runEclipseJdtLsClient = () => {
     registerFileSystemOverlay(1, fileSystemProvider);
 
     const userConfig: WrapperConfig = {
-        logLevel: checkLogLevel(2),
+        logLevel: LogLevel.Debug,
         serviceConfig: {
             userServices: {
                 ...getKeybindingsServiceOverride(),
diff --git a/packages/examples/src/groovy/client/main.ts b/packages/examples/src/groovy/client/main.ts
@@ -6,7 +6,7 @@
 import getKeybindingsServiceOverride from '@codingame/monaco-vscode-keybindings-service-override';
 // this is required syntax highlighting
 import '@codingame/monaco-vscode-groovy-default-extension';
-import { checkLogLevel } from 'monaco-languageclient/tools';
+import { LogLevel } from 'vscode/services';
 import { MonacoEditorLanguageClientWrapper, WrapperConfig } from 'monaco-editor-wrapper';
 import { groovyConfig } from '../config.js';
 import { configureMonacoWorkers } from '../../common/client/utils.js';
@@ -17,7 +17,7 @@ File file = new File("E:/Example.txt");
 `;
 
 const userConfig: WrapperConfig = {
-    logLevel: checkLogLevel(2),
+    logLevel: LogLevel.Debug,
     serviceConfig: {
         userServices: {
             ...getKeybindingsServiceOverride(),
diff --git a/packages/examples/src/json/client/wrapperWs.ts b/packages/examples/src/json/client/wrapperWs.ts
@@ -6,7 +6,7 @@
 import getKeybindingsServiceOverride from '@codingame/monaco-vscode-keybindings-service-override';
 // this is required syntax highlighting
 import '@codingame/monaco-vscode-json-default-extension';
-import { checkLogLevel } from 'monaco-languageclient/tools';
+import { LogLevel } from 'vscode/services';
 import { MonacoEditorLanguageClientWrapper, WrapperConfig } from 'monaco-editor-wrapper';
 import { configureMonacoWorkers } from '../../common/client/utils.js';
 
@@ -16,7 +16,7 @@ const text = `{
 }`;
 
 export const jsonClientUserConfig: WrapperConfig = {
-    logLevel: checkLogLevel(2),
+    logLevel: LogLevel.Debug,
     serviceConfig: {
         userServices: {
             ...getKeybindingsServiceOverride(),
diff --git a/packages/examples/src/langium/langium-dsl/config/classicConfig.ts b/packages/examples/src/langium/langium-dsl/config/classicConfig.ts
@@ -7,9 +7,9 @@ import getConfigurationServiceOverride from '@codingame/monaco-vscode-configurat
 import getEditorServiceOverride from '@codingame/monaco-vscode-editor-service-override';
 import getKeybindingsServiceOverride from '@codingame/monaco-vscode-keybindings-service-override';
 import { useOpenEditorStub } from 'monaco-editor-wrapper/vscode/services';
-import { checkLogLevel, Logger } from 'monaco-languageclient/tools';
+import { LogLevel } from 'vscode/services';
+import { Logger } from 'monaco-languageclient/tools';
 import { WrapperConfig } from 'monaco-editor-wrapper';
-// import { configureMonacoWorkers } from '../../../common/client/utils.js';
 import { LangiumMonarchContent } from './langium.monarch.js';
 import { loadLangiumWorker } from '../wrapperLangium.js';
 import code from '../content/example.langium?raw';
@@ -18,7 +18,7 @@ import { useWorkerFactory } from 'monaco-editor-wrapper/workerFactory';
 export const setupLangiumClientClassic = async (): Promise<WrapperConfig> => {
     const langiumWorker = loadLangiumWorker();
     return {
-        logLevel: checkLogLevel(2),
+        logLevel: LogLevel.Debug,
         serviceConfig: {
             userServices: {
                 ...getConfigurationServiceOverride(),
diff --git a/packages/examples/src/langium/langium-dsl/config/extendedConfig.ts b/packages/examples/src/langium/langium-dsl/config/extendedConfig.ts
@@ -8,7 +8,7 @@ import getKeybindingsServiceOverride from '@codingame/monaco-vscode-keybindings-
 import '../../../../resources/vsix/github-vscode-theme.vsix';
 import { useOpenEditorStub } from 'monaco-editor-wrapper/vscode/services';
 import { BrowserMessageReader, BrowserMessageWriter } from 'vscode-languageclient/browser.js';
-import { checkLogLevel } from 'monaco-languageclient/tools';
+import { LogLevel } from 'vscode/services';
 import { WrapperConfig } from 'monaco-editor-wrapper';
 import { loadLangiumWorker } from '../wrapperLangium.js';
 import { configureMonacoWorkers } from '../../../common/client/utils.js';
@@ -28,7 +28,7 @@ export const setupLangiumClientExtended = async (): Promise<WrapperConfig> => {
     const writer = new BrowserMessageWriter(langiumWorker);
 
     return {
-        logLevel: checkLogLevel(2),
+        logLevel: LogLevel.Debug,
         serviceConfig: {
             userServices: {
                 ...getEditorServiceOverride(useOpenEditorStub),
diff --git a/packages/examples/src/langium/statemachine/config/wrapperStatemachineConfig.ts b/packages/examples/src/langium/statemachine/config/wrapperStatemachineConfig.ts
@@ -7,7 +7,7 @@ import getKeybindingsServiceOverride from '@codingame/monaco-vscode-keybindings-
 import getLifecycleServiceOverride from '@codingame/monaco-vscode-lifecycle-service-override';
 import getLocalizationServiceOverride from '@codingame/monaco-vscode-localization-service-override';
 import { createDefaultLocaleConfiguration } from 'monaco-languageclient/vscode/services';
-import { checkLogLevel } from 'monaco-languageclient/tools';
+import { LogLevel } from 'vscode/services';
 import { LanguageClientConfig, WrapperConfig } from 'monaco-editor-wrapper';
 // cannot be imported with assert as json contains comments
 import statemachineLanguageConfig from './language-configuration.json?raw';
@@ -50,7 +50,7 @@ export const createLangiumGlobalConfig = async (params: {
     } : undefined;
 
     return {
-        logLevel: checkLogLevel(2),
+        logLevel: LogLevel.Debug,
         serviceConfig: {
             userServices: {
                 ...getKeybindingsServiceOverride(),
diff --git a/packages/examples/src/multi/twoLanguageClients.ts b/packages/examples/src/multi/twoLanguageClients.ts
@@ -8,7 +8,7 @@ import getKeybindingsServiceOverride from '@codingame/monaco-vscode-keybindings-
 // this is required syntax highlighting
 import '@codingame/monaco-vscode-json-default-extension';
 import '@codingame/monaco-vscode-python-default-extension';
-import { checkLogLevel } from 'monaco-languageclient/tools';
+import { LogLevel } from 'vscode/services';
 import { CodePlusFileExt, MonacoEditorLanguageClientWrapper, WrapperConfig } from 'monaco-editor-wrapper';
 import { MonacoLanguageClient } from 'monaco-languageclient';
 import { configureMonacoWorkers, disableButton } from '../common/client/utils.js';
@@ -32,7 +32,7 @@ print("Hello Moon!")
 
     const wrapperConfig: WrapperConfig = {
         id: '42',
-        logLevel: checkLogLevel(2),
+        logLevel: LogLevel.Debug,
         serviceConfig: {
             userServices: {
                 ...getKeybindingsServiceOverride()
diff --git a/packages/examples/src/python/client/config.ts b/packages/examples/src/python/client/config.ts
@@ -7,7 +7,7 @@ import * as vscode from 'vscode';
 import getEditorServiceOverride from '@codingame/monaco-vscode-editor-service-override';
 import getKeybindingsServiceOverride from '@codingame/monaco-vscode-keybindings-service-override';
 import '@codingame/monaco-vscode-python-default-extension';
-import { checkLogLevel } from 'monaco-languageclient/tools';
+import { LogLevel } from 'vscode/services';
 import { createUrl, WrapperConfig } from 'monaco-editor-wrapper';
 import { useOpenEditorStub } from 'monaco-editor-wrapper/vscode/services';
 import { MonacoLanguageClient } from 'monaco-languageclient';
@@ -63,7 +63,7 @@ export const createUserConfig = (workspaceRoot: string, code: string, codeUri: s
                 }
             }
         },
-        logLevel: checkLogLevel(2),
+        logLevel: LogLevel.Debug,
         serviceConfig: {
             userServices: {
                 ...getEditorServiceOverride(useOpenEditorStub),
diff --git a/packages/examples/src/ts/wrapperTs.ts b/packages/examples/src/ts/wrapperTs.ts
@@ -8,7 +8,7 @@ import getKeybindingsServiceOverride from '@codingame/monaco-vscode-keybindings-
 import '@codingame/monaco-vscode-theme-defaults-default-extension';
 import '@codingame/monaco-vscode-typescript-basics-default-extension';
 import '@codingame/monaco-vscode-typescript-language-features-default-extension';
-import { checkLogLevel } from 'monaco-languageclient/tools';
+import { LogLevel } from 'vscode/services';
 import { CodePlusUri, MonacoEditorLanguageClientWrapper, WrapperConfig } from 'monaco-editor-wrapper';
 import { configureMonacoWorkers } from '../common/client/utils.js';
 
@@ -24,7 +24,7 @@ export const runTsWrapper = async () => {
 };`;
 
     const wrapperConfig: WrapperConfig = {
-        logLevel: checkLogLevel(2),
+        logLevel: LogLevel.Debug,
         serviceConfig: {
             userServices: {
                 ...getKeybindingsServiceOverride()
diff --git a/packages/wrapper-react/test/index.test.tsx b/packages/wrapper-react/test/index.test.tsx
@@ -6,7 +6,7 @@
 import { describe, expect, test } from 'vitest';
 import { render, RenderResult } from '@testing-library/react';
 import React from 'react';
-import { checkLogLevel } from 'monaco-languageclient/tools';
+import { LogLevel } from 'vscode/services';
 import { MonacoEditorLanguageClientWrapper, WrapperConfig } from 'monaco-editor-wrapper';
 import { MonacoEditorReactComp, TextChanges } from '@typefox/monaco-editor-react';
 import { updateExtendedAppPrototyp } from './helper.js';
@@ -15,7 +15,7 @@ describe('Test MonacoEditorReactComp', () => {
     test('rerender', async () => {
         updateExtendedAppPrototyp();
         const wrapperConfig: WrapperConfig = {
-            logLevel: checkLogLevel(2),
+            logLevel: LogLevel.Debug,
             editorAppConfig: {
                 $type: 'extended',
             }
@@ -42,7 +42,7 @@ describe('Test MonacoEditorReactComp', () => {
     test('update onTextChanged', async () => {
         updateExtendedAppPrototyp();
         const wrapperConfig: WrapperConfig = {
-            logLevel: checkLogLevel(2),
+            logLevel: LogLevel.Debug,
             editorAppConfig: {
                 $type: 'extended',
                 codeResources: {
@@ -80,7 +80,7 @@ describe('Test MonacoEditorReactComp', () => {
     test('update codeResources', async () => {
         updateExtendedAppPrototyp();
         const wrapperConfig: WrapperConfig = {
-            logLevel: checkLogLevel(2),
+            logLevel: LogLevel.Debug,
             editorAppConfig: {
                 $type: 'extended',
                 codeResources: {
diff --git a/packages/wrapper/src/editorAppClassic.ts b/packages/wrapper/src/editorAppClassic.ts
@@ -4,7 +4,6 @@
  * ------------------------------------------------------------------------------------------ */
 
 import * as monaco from 'monaco-editor';
-import { updateUserConfiguration } from '@codingame/monaco-vscode-configuration-service-override';
 import { Logger } from 'monaco-languageclient/tools';
 import { EditorAppBase, EditorAppConfigBase } from './editorAppBase.js';
 import { ModelUpdateType, isEqual, isModelUpdateRequired } from './utils.js';
@@ -46,12 +45,7 @@ export class EditorAppClassic extends EditorAppBase {
     }
 
     override async loadUserConfiguration() {
-        if (this.config.editorOptions?.['semanticHighlighting.enabled'] !== undefined) {
-            // use updateConfiguration here as otherwise semantic highlighting will not work
-            await updateUserConfiguration(JSON.stringify({
-                'editor.semanticHighlighting.enabled': this.config.editorOptions['semanticHighlighting.enabled']
-            }));
-        }
+        // nothing needed here currently
     }
 
     async init() {
diff --git a/packages/wrapper/src/index.ts b/packages/wrapper/src/index.ts
@@ -3,20 +3,9 @@
  * Licensed under the MIT License. See LICENSE in the package root for license information.
  * ------------------------------------------------------------------------------------------ */
 
-export type * from './editorAppBase.js';
 export * from './editorAppBase.js';
-
-export type * from './editorAppClassic.js';
 export * from './editorAppClassic.js';
-
-export type * from './editorAppExtended.js';
 export * from './editorAppExtended.js';
-
-export type * from './languageClientWrapper.js';
 export * from './languageClientWrapper.js';
-
-export type * from './wrapper.js';
 export * from './wrapper.js';
-
 export * from './utils.js';
-export type * from './utils.js';
diff --git a/packages/wrapper/src/vscode/services.ts b/packages/wrapper/src/vscode/services.ts
diff --git a/packages/wrapper/src/wrapper.ts b/packages/wrapper/src/wrapper.ts
diff --git a/packages/wrapper/test/vscode/services.test.ts b/packages/wrapper/test/vscode/services.test.ts
