feat: align code to new version, remove updateExtendedAppPrototyp, be…

…cause of vitest v2
TypeFox · Jul 11, 2024 · aac6ed5 · aac6ed5
1 parent e563807
commit aac6ed5
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 47 deletions.
diff --git a/packages/examples/src/langium/langium-dsl/config/classicConfig.ts b/packages/examples/src/langium/langium-dsl/config/classicConfig.ts
@@ -3,7 +3,6 @@
  * Licensed under the MIT License. See LICENSE in the package root for license information.
  * ------------------------------------------------------------------------------------------ */
 
-import { Uri } from 'vscode';
 import getConfigurationServiceOverride from '@codingame/monaco-vscode-configuration-service-override';
 import getEditorServiceOverride from '@codingame/monaco-vscode-editor-service-override';
 import getKeybindingsServiceOverride from '@codingame/monaco-vscode-keybindings-service-override';
@@ -27,18 +26,7 @@ export const setupLangiumClientClassic = async (): Promise<UserConfig> => {
                     ...getEditorServiceOverride(useOpenEditorStub),
                     ...getKeybindingsServiceOverride()
                 },
-                debugLogging: true,
-                workspaceConfig: {
-                    workspaceProvider: {
-                        trusted: true,
-                        workspace: {
-                            workspaceUri: Uri.file('/workspace')
-                        },
-                        async open() {
-                            return false;
-                        }
-                    }
-                }
+                debugLogging: true
             },
             editorAppConfig: {
                 $type: 'classic',

diff --git a/packages/wrapper/src/vscode/services.ts b/packages/wrapper/src/vscode/services.ts
@@ -48,7 +48,8 @@ export const configureServices = async (config: VscodeServicesConfig): Promise<I
                     workspaceUri: vscode.Uri.file('/workspace')
                 },
                 async open() {
-                    return false;
+                    window.open(window.location.href);
+                    return true;
                 }
             }
         };

diff --git a/packages/wrapper/test/helper.ts b/packages/wrapper/test/helper.ts
@@ -3,7 +3,7 @@
  * Licensed under the MIT License. See LICENSE in the package root for license information.
  * ------------------------------------------------------------------------------------------ */
 
-import { UserConfig, EditorAppType, EditorAppExtended, MonacoEditorLanguageClientWrapper, EditorAppClassic } from 'monaco-editor-wrapper';
+import { UserConfig, EditorAppType } from 'monaco-editor-wrapper';
 
 export const createMonacoEditorDiv = () => {
     const div = document.createElement('div');
@@ -36,31 +36,6 @@ export const createEditorAppConfig = (type: EditorAppType) => {
     };
 };
 
-export const updateExtendedAppPrototyp = async () => {
-    EditorAppExtended.prototype.specifyServices = async () => {
-        console.log('Using overriden EditorAppExtended.prototype.specifyServices');
-        return Promise.resolve({});
-    };
-    EditorAppClassic.prototype.specifyServices = async () => {
-        console.log('Using overriden EditorAppClassic.prototype.specifyServices');
-        return Promise.resolve({});
-    };
-};
-
-/**
- * WA: Create an instance for testing that does not specify any additional services.
- *
- * Prevents:
- * Error: Unable to load extension-file://vscode.theme-defaults/themes/light_modern.json:
- * Unable to read file 'extension-file://vscode.theme-defaults/themes/light_modern.json' (TypeError: Failed to fetch)
- */
-export const createAndInitWrapper = async (userConfig: UserConfig) => {
-    updateExtendedAppPrototyp();
-    const wrapper = new MonacoEditorLanguageClientWrapper();
-    await wrapper.init(userConfig);
-    return wrapper;
-};
-
 /**
  * Helper to generate a quick worker from a function blob
  */

diff --git a/packages/wrapper/test/languageClientWrapper.test.ts b/packages/wrapper/test/languageClientWrapper.test.ts
@@ -4,13 +4,14 @@
  * ------------------------------------------------------------------------------------------ */
 
 import { describe, expect, test } from 'vitest';
-import { LanguageClientConfig, LanguageClientWrapper } from 'monaco-editor-wrapper';
-import { createBaseConfig, createWorkerFromFunction, createAndInitWrapper } from './helper.js';
+import { LanguageClientConfig, LanguageClientWrapper, MonacoEditorLanguageClientWrapper } from 'monaco-editor-wrapper';
+import { createBaseConfig, createWorkerFromFunction } from './helper.js';
 
 describe('Test LanguageClientWrapper', () => {
 
     test('Not defined after construction without configuration', async () => {
-        const wrapper = await createAndInitWrapper(createBaseConfig('extended'));
+        const wrapper = new MonacoEditorLanguageClientWrapper();
+        await wrapper.init(createBaseConfig('extended'));
 
         const languageClientWrapper = wrapper.getLanguageClientWrapper();
         expect(languageClientWrapper).toBeUndefined();
@@ -53,7 +54,8 @@ describe('Test LanguageClientWrapper', () => {
                 worker
             }
         };
-        const wrapper = await createAndInitWrapper(config);
+        const wrapper = new MonacoEditorLanguageClientWrapper();
+        await wrapper.init(config);
 
         const languageClientWrapper = wrapper.getLanguageClientWrapper();
         expect(languageClientWrapper).toBeDefined();
@@ -76,7 +78,8 @@ describe('Test LanguageClientWrapper', () => {
                 url: 'ws://localhost:12345/Tester'
             }
         };
-        const wrapper = await createAndInitWrapper(config);
+        const wrapper = new MonacoEditorLanguageClientWrapper();
+        await wrapper.init(config);
 
         const languageClientWrapper = wrapper.getLanguageClientWrapper();
         expect(languageClientWrapper).toBeDefined();
@@ -94,7 +97,8 @@ describe('Test LanguageClientWrapper', () => {
                 url: 'ws://localhost:12345/Tester'
             }
         };
-        const wrapper = await createAndInitWrapper(config);
+        const wrapper = new MonacoEditorLanguageClientWrapper();
+        await wrapper.init(config);
 
         const languageClientWrapper = wrapper.getLanguageClientWrapper();
         expect(languageClientWrapper).toBeDefined();
@@ -128,7 +132,8 @@ describe('Test LanguageClientWrapper', () => {
                 type: 'classic'
             }
         };
-        const wrapper = await createAndInitWrapper(config);
+        const wrapper = new MonacoEditorLanguageClientWrapper();
+        await wrapper.init(config);
 
         const languageClientWrapper = wrapper.getLanguageClientWrapper();
         expect(languageClientWrapper).toBeDefined();