Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support all arguments for monaco-vscode-api initialize #756

Merged
merged 8 commits into from
Oct 7, 2024
Merged

Support all arguments for monaco-vscode-api initialize #756

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e5be488
Suppport all arguments for monaco-vscode-api initialize, allow to con…
kaisalmen Oct 4, 2024
2a07e2f
Update versions to next.2
kaisalmen Oct 4, 2024
242d8e6
Fix :node prefix
kaisalmen Oct 4, 2024
ff65e20
Implemented review comments
kaisalmen Oct 4, 2024
d888490
Move userConfiguration from editor app config to vscodeApi config
kaisalmen Oct 4, 2024
bc7b1dc
Update node version managed by volta
kaisalmen Oct 4, 2024
fd90281
update semanticHighlighting test
kaisalmen Oct 4, 2024
7b61d52
Use basic worker factory in all test where an editorAppConfig is used
kaisalmen Oct 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions packages/wrapper/test/helper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
* ------------------------------------------------------------------------------------------ */

import { WrapperConfig } from 'monaco-editor-wrapper';
import { useWorkerFactory } from 'monaco-editor-wrapper/workerFactory';

export const createMonacoEditorDiv = () => {
const div = document.createElement('div');
Expand Down Expand Up @@ -44,3 +45,14 @@ export const createWrapperConfigClassicApp = (): WrapperConfig => {
}
};
};

export const configureMonacoWorkers = () => {
useWorkerFactory({
workerOverrides: {
ignoreMapping: true,
workerLoaders: {
TextEditorWorker: () => new Worker(new URL('monaco-editor/esm/vs/editor/editor.worker.js', import.meta.url), { type: 'module' }),
}
}
});
};
17 changes: 12 additions & 5 deletions packages/wrapper/test/wrapper.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import * as vscode from 'vscode';
import { createModelReference } from 'vscode/monaco';
import { describe, expect, test } from 'vitest';
import { isReInitRequired, EditorAppClassic, EditorAppConfigExtended, MonacoEditorLanguageClientWrapper, EditorAppConfigClassic } from 'monaco-editor-wrapper';
import { createMonacoEditorDiv, createWrapperConfigClassicApp, createWrapperConfigExtendedApp } from './helper.js';
import { configureMonacoWorkers, createMonacoEditorDiv, createWrapperConfigClassicApp, createWrapperConfigExtendedApp } from './helper.js';
import { IConfigurationService, StandaloneServices } from 'vscode/services';

describe('Test MonacoEditorLanguageClientWrapper', () => {
Expand Down Expand Up @@ -230,17 +230,24 @@ describe('Test MonacoEditorLanguageClientWrapper', () => {
await wrapper.start();
});

test('config userConfiguration', async () => {
test('editorConfig semanticHighlighting.enabled workaround', async () => {
const wrapper = new MonacoEditorLanguageClientWrapper();
const wrapperConfig = createWrapperConfigClassicApp();
wrapperConfig.editorAppConfig.monacoWorkerFactory = configureMonacoWorkers;
(wrapperConfig.editorAppConfig as EditorAppConfigClassic).editorOptions = {
'semanticHighlighting.enabled': true,
};
const updatedWrapperConfig = await wrapper.init(wrapperConfig);
expect(updatedWrapperConfig.vscodeApiConfig?.workspaceConfig?.configurationDefaults?.['editor.semanticHighlighting.enabled']).toEqual(true);

// why is this configuredByTheme?
const semHigh = StandaloneServices.get(IConfigurationService).getValue('editor.semanticHighlighting.enabled');
expect(semHigh).toEqual('configuredByTheme');
// await wrapper.start();

const semHigh = await new Promise<unknown>(resolve => {
setTimeout(() => {
resolve(StandaloneServices.get(IConfigurationService).getValue('editor.semanticHighlighting.enabled'));
}, 1000);
kaisalmen marked this conversation as resolved.
Show resolved Hide resolved
});
// const semHigh = StandaloneServices.get(IConfigurationService).getValue('editor.semanticHighlighting.enabled');
expect(semHigh).toEqual(true);
});
});