Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@
"workbench.editor.revealIfOpen": true,
"terminal.integrated.scrollback": 10000,
"editor.minimap.enabled": false,
"editor.foldingImportsByDefault": true
Comment thread
kaisalmen marked this conversation as resolved.
"editor.foldingImportsByDefault": false
}
19 changes: 17 additions & 2 deletions packages/examples/src/common/client/extendedClient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,9 @@ import { LogLevel } from '@codingame/monaco-vscode-api';
import { EditorApp, type EditorAppConfig } from 'monaco-languageclient/editorApp';
import { LanguageClientWrapper, type LanguageClientConfig } from 'monaco-languageclient/lcwrapper';
import { MonacoVscodeApiWrapper, type MonacoVscodeApiConfig } from 'monaco-languageclient/vscodeApiWrapper';
import { configureDefaultWorkerFactory } from 'monaco-languageclient/workerFactory';
import { configureDefaultWorkerFactory, useWorkerFactory, type WorkerLoader } from 'monaco-languageclient/workerFactory';
import { createUrl, type ConnectionConfigOptions, type WebSocketConfigOptionsDirect } from 'monaco-languageclient/common';
import type { ILogger } from '@codingame/monaco-vscode-log-service-override';

export const runExtendedClient = async (lsConfig: ExampleLsConfig, helloCode: string) => {
const helloUri = vscode.Uri.file(`${lsConfig.basePath}/workspace/hello.${lsConfig.languageId}`);
Expand All @@ -25,6 +26,19 @@ export const runExtendedClient = async (lsConfig: ExampleLsConfig, helloCode: st
registerFileSystemOverlay(1, fileSystemProvider);

const htmlContainer = document.getElementById('monaco-editor-root')!;

let monacoWorkerFactory;
if (lsConfig.workerLoaders !== undefined) {
monacoWorkerFactory = (logger?: ILogger) => {
useWorkerFactory({
workerLoaders: lsConfig.workerLoaders?.(),
logger
});
};
} else {
monacoWorkerFactory = configureDefaultWorkerFactory;
}

const vscodeApiConfig: MonacoVscodeApiConfig = {
$type: 'extended',
viewsConfig: {
Expand All @@ -44,7 +58,7 @@ export const runExtendedClient = async (lsConfig: ExampleLsConfig, helloCode: st
'editor.experimental.asyncTokenization': true
})
},
monacoWorkerFactory: configureDefaultWorkerFactory
monacoWorkerFactory
};

const startOptions = {
Expand Down Expand Up @@ -141,4 +155,5 @@ export type ExampleLsConfig = {
basePath: string;
languageId: string;
useExternalWebSocket: boolean;
workerLoaders?: () => Partial<Record<string, WorkerLoader>>;
};
1 change: 1 addition & 0 deletions packages/examples/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@
* ------------------------------------------------------------------------------------------ */

export * from './common/client/utils.js';
export * from './common/client/extendedClient.js';
2 changes: 2 additions & 0 deletions packages/examples/src/json/client/extended.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,5 @@ export const runJsonWrapper = async () => {
}`;
await runExtendedClient(jsontLsConfig, helloJsonCode);
};

export { jsontLsConfig } from './config.js';
Loading