monaco-languageclient-examples 2025.1.9 → 2025.2.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +10 -0
- package/dist/common/client/utils.d.ts +2 -0
- package/dist/common/client/utils.d.ts.map +1 -1
- package/dist/common/client/utils.js +14 -10
- package/dist/common/client/utils.js.map +1 -1
- package/dist/langium/langium-dsl/config/classicConfig.d.ts.map +1 -1
- package/dist/langium/langium-dsl/config/classicConfig.js +5 -4
- package/dist/langium/langium-dsl/config/classicConfig.js.map +1 -1
- package/package.json +34 -37
- package/src/common/client/utils.ts +21 -28
- package/src/langium/langium-dsl/config/classicConfig.ts +5 -4
package/CHANGELOG.md
CHANGED
|
@@ -2,6 +2,16 @@
|
|
|
2
2
|
|
|
3
3
|
All notable changes to this npm module are documented in this file.
|
|
4
4
|
|
|
5
|
+
## [2025.2.1] - 2025-02-03
|
|
6
|
+
|
|
7
|
+
- Updated all `@codingame/monaco-vscode` packages to `13.1.2`.
|
|
8
|
+
- Updated to `monaco-languageclient@9.2.2`, `monaco-editor-wrapper@6.2.2` and `@typefox/monaco-editor-react@6.2.2`.
|
|
9
|
+
|
|
10
|
+
## [2025.1.10] - 2025-01-31
|
|
11
|
+
|
|
12
|
+
- Removed unneeded workers, but kept the names in the default definition without a Worker definition
|
|
13
|
+
- Updated to `monaco-languageclient@9.2.1`, `monaco-editor-wrapper@6.2.1` and `@typefox/monaco-editor-react@6.2.1`.
|
|
14
|
+
|
|
5
15
|
## [2025.1.9] - 2025-01-31
|
|
6
16
|
|
|
7
17
|
- Update to monaco-vscode-api v13 [#836](https://github.com/TypeFox/monaco-languageclient/pull/829)
|
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
import { Uri } from 'vscode';
|
|
2
2
|
import { Logger } from 'monaco-languageclient/tools';
|
|
3
|
+
import { WorkerLoader } from 'monaco-languageclient/workerFactory';
|
|
3
4
|
import { RegisteredMemoryFile } from '@codingame/monaco-vscode-files-service-override';
|
|
4
5
|
export declare const disableElement: (id: string, disabled: boolean) => void;
|
|
6
|
+
export declare const defineDefaultWorkerLoaders: () => Record<string, WorkerLoader>;
|
|
5
7
|
export declare const configureMonacoWorkers: (logger?: Logger) => void;
|
|
6
8
|
export declare const createDefaultWorkspaceFile: (workspaceFile: Uri, workspacePath: string) => RegisteredMemoryFile;
|
|
7
9
|
//# sourceMappingURL=utils.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/common/client/utils.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;AAC7B,OAAO,EAAE,MAAM,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/common/client/utils.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;AAC7B,OAAO,EAAE,MAAM,EAAE,MAAM,6BAA6B,CAAC;AACrD,OAAO,EAAoB,YAAY,EAAE,MAAM,qCAAqC,CAAC;AACrF,OAAO,EAAE,oBAAoB,EAAE,MAAM,iDAAiD,CAAC;AAGvF,eAAO,MAAM,cAAc,OAAQ,MAAM,YAAY,OAAO,SAK3D,CAAC;AAEF,eAAO,MAAM,0BAA0B,EAAE,MAAM,MAAM,CAAC,MAAM,EAAE,YAAY,CAiBzE,CAAC;AAEF,eAAO,MAAM,sBAAsB,YAAa,MAAM,SAKrD,CAAC;AAEF,eAAO,MAAM,0BAA0B,kBAAmB,GAAG,iBAAiB,MAAM,yBAenF,CAAC"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
* Copyright (c) 2024 TypeFox and others.
|
|
3
3
|
* Licensed under the MIT License. See LICENSE in the package root for license information.
|
|
4
4
|
* ------------------------------------------------------------------------------------------ */
|
|
5
|
-
import { useWorkerFactory } from 'monaco-
|
|
5
|
+
import { useWorkerFactory } from 'monaco-languageclient/workerFactory';
|
|
6
6
|
import { RegisteredMemoryFile } from '@codingame/monaco-vscode-files-service-override';
|
|
7
7
|
export const disableElement = (id, disabled) => {
|
|
8
8
|
const button = document.getElementById(id);
|
|
@@ -10,17 +10,21 @@ export const disableElement = (id, disabled) => {
|
|
|
10
10
|
button.disabled = disabled;
|
|
11
11
|
}
|
|
12
12
|
};
|
|
13
|
+
export const defineDefaultWorkerLoaders = () => {
|
|
14
|
+
return {
|
|
15
|
+
// if you import monaco api as 'monaco-editor': monaco-editor/esm/vs/editor/editor.worker.js
|
|
16
|
+
TextEditorWorker: () => new Worker(new URL('@codingame/monaco-vscode-editor-api/esm/vs/editor/editor.worker.js', import.meta.url), { type: 'module' }),
|
|
17
|
+
TextMateWorker: () => new Worker(new URL('@codingame/monaco-vscode-textmate-service-override/worker', import.meta.url), { type: 'module' }),
|
|
18
|
+
// these are other possible workers not configured by default
|
|
19
|
+
OutputLinkDetectionWorker: undefined,
|
|
20
|
+
LanguageDetectionWorker: undefined,
|
|
21
|
+
NotebookEditorWorker: undefined,
|
|
22
|
+
LocalFileSearchWorker: undefined
|
|
23
|
+
};
|
|
24
|
+
};
|
|
13
25
|
export const configureMonacoWorkers = (logger) => {
|
|
14
26
|
useWorkerFactory({
|
|
15
|
-
workerLoaders:
|
|
16
|
-
// if you import monaco api as 'monaco-editor': monaco-editor/esm/vs/editor/editor.worker.js
|
|
17
|
-
TextEditorWorker: () => new Worker(new URL('@codingame/monaco-vscode-editor-api/esm/vs/editor/editor.worker.js', import.meta.url), { type: 'module' }),
|
|
18
|
-
TextMateWorker: () => new Worker(new URL('@codingame/monaco-vscode-textmate-service-override/worker', import.meta.url), { type: 'module' }),
|
|
19
|
-
OutputLinkDetectionWorker: () => new Worker(new URL('@codingame/monaco-vscode-output-service-override/worker', import.meta.url), { type: 'module' }),
|
|
20
|
-
LanguageDetectionWorker: () => new Worker(new URL('@codingame/monaco-vscode-language-detection-worker-service-override/worker', import.meta.url), { type: 'module' }),
|
|
21
|
-
NotebookEditorWorker: () => new Worker(new URL('@codingame/monaco-vscode-notebook-service-override/worker', import.meta.url), { type: 'module' }),
|
|
22
|
-
LocalFileSearchWorker: () => new Worker(new URL('@codingame/monaco-vscode-search-service-override/worker', import.meta.url), { type: 'module' })
|
|
23
|
-
},
|
|
27
|
+
workerLoaders: defineDefaultWorkerLoaders(),
|
|
24
28
|
logger
|
|
25
29
|
});
|
|
26
30
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/common/client/utils.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAIhG,OAAO,EAAE,gBAAgB,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/common/client/utils.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAIhG,OAAO,EAAE,gBAAgB,EAAgB,MAAM,qCAAqC,CAAC;AACrF,OAAO,EAAE,oBAAoB,EAAE,MAAM,iDAAiD,CAAC;AAGvF,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,EAAU,EAAE,QAAiB,EAAE,EAAE;IAC5D,MAAM,MAAM,GAAG,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAgD,CAAC;IAC1F,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;QAClB,MAAM,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC/B,CAAC;AACL,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,0BAA0B,GAAuC,GAAG,EAAE;IAC/E,OAAO;QACH,4FAA4F;QAC5F,gBAAgB,EAAE,GAAG,EAAE,CAAC,IAAI,MAAM,CAC9B,IAAI,GAAG,CAAC,oEAAoE,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAC9F,EAAE,IAAI,EAAE,QAAQ,EAAE,CACrB;QACD,cAAc,EAAE,GAAG,EAAE,CAAC,IAAI,MAAM,CAC5B,IAAI,GAAG,CAAC,2DAA2D,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EACrF,EAAE,IAAI,EAAE,QAAQ,EAAE,CACrB;QACD,6DAA6D;QAC7D,yBAAyB,EAAE,SAAS;QACpC,uBAAuB,EAAE,SAAS;QAClC,oBAAoB,EAAE,SAAS;QAC/B,qBAAqB,EAAE,SAAS;KACnC,CAAC;AACN,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,MAAe,EAAE,EAAE;IACtD,gBAAgB,CAAC;QACb,aAAa,EAAE,0BAA0B,EAAE;QAC3C,MAAM;KACT,CAAC,CAAC;AACP,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,0BAA0B,GAAG,CAAC,aAAkB,EAAE,aAAqB,EAAE,EAAE;IACpF,OAAO,IAAI,oBAAoB,CAC3B,aAAa,EACb,IAAI,CAAC,SAAS,CACQ;QACd,OAAO,EAAE;YACL;gBACI,IAAI,EAAE,aAAa;aACtB;SACJ;KACJ,EACD,IAAI,EACJ,CAAC,CACJ,CACJ,CAAC;AACN,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"classicConfig.d.ts","sourceRoot":"","sources":["../../../../src/langium/langium-dsl/config/classicConfig.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"classicConfig.d.ts","sourceRoot":"","sources":["../../../../src/langium/langium-dsl/config/classicConfig.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAKtD,eAAO,MAAM,yBAAyB,kBAAyB,MAAM,KAAG,OAAO,CAAC,aAAa,CAmD5F,CAAC"}
|
|
@@ -5,10 +5,13 @@
|
|
|
5
5
|
import getConfigurationServiceOverride from '@codingame/monaco-vscode-configuration-service-override';
|
|
6
6
|
import getKeybindingsServiceOverride from '@codingame/monaco-vscode-keybindings-service-override';
|
|
7
7
|
import { LogLevel } from '@codingame/monaco-vscode-api';
|
|
8
|
+
import { useWorkerFactory } from 'monaco-languageclient/workerFactory';
|
|
8
9
|
import { LangiumMonarchContent } from './langium.monarch.js';
|
|
9
|
-
import { useWorkerFactory } from 'monaco-editor-wrapper/workerFactory';
|
|
10
10
|
import code from '../../../../resources/langium/langium-dsl/example.langium?raw';
|
|
11
|
+
import { defineDefaultWorkerLoaders } from '../../../common/client/utils.js';
|
|
11
12
|
export const setupLangiumClientClassic = async (langiumWorker) => {
|
|
13
|
+
const workerLoaders = defineDefaultWorkerLoaders();
|
|
14
|
+
workerLoaders.TextMateWorker = undefined;
|
|
12
15
|
return {
|
|
13
16
|
$type: 'classic',
|
|
14
17
|
htmlContainer: document.getElementById('monaco-editor-root'),
|
|
@@ -38,9 +41,7 @@ export const setupLangiumClientClassic = async (langiumWorker) => {
|
|
|
38
41
|
},
|
|
39
42
|
monacoWorkerFactory: (logger) => {
|
|
40
43
|
useWorkerFactory({
|
|
41
|
-
workerLoaders
|
|
42
|
-
TextEditorWorker: () => new Worker(new URL('@codingame/monaco-vscode-editor-api/esm/vs/editor/editor.worker.js', import.meta.url), { type: 'module' })
|
|
43
|
-
},
|
|
44
|
+
workerLoaders,
|
|
44
45
|
logger
|
|
45
46
|
});
|
|
46
47
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"classicConfig.js","sourceRoot":"","sources":["../../../../src/langium/langium-dsl/config/classicConfig.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,OAAO,+BAA+B,MAAM,yDAAyD,CAAC;AACtG,OAAO,6BAA6B,MAAM,uDAAuD,CAAC;AAClG,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"classicConfig.js","sourceRoot":"","sources":["../../../../src/langium/langium-dsl/config/classicConfig.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,OAAO,+BAA+B,MAAM,yDAAyD,CAAC;AACtG,OAAO,6BAA6B,MAAM,uDAAuD,CAAC;AAClG,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAExD,OAAO,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AAEvE,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,IAAI,MAAM,+DAA+D,CAAC;AACjF,OAAO,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAE7E,MAAM,CAAC,MAAM,yBAAyB,GAAG,KAAK,EAAE,aAAqB,EAA0B,EAAE;IAC7F,MAAM,aAAa,GAAG,0BAA0B,EAAE,CAAC;IACnD,aAAa,CAAC,cAAc,GAAG,SAAS,CAAC;IACzC,OAAO;QACH,KAAK,EAAE,SAAS;QAChB,aAAa,EAAE,QAAQ,CAAC,cAAc,CAAC,oBAAoB,CAAE;QAC7D,QAAQ,EAAE,QAAQ,CAAC,KAAK;QACxB,eAAe,EAAE;YACb,gBAAgB,EAAE;gBACd,GAAG,+BAA+B,EAAE;gBACpC,GAAG,6BAA6B,EAAE;aACrC;SACJ;QACD,eAAe,EAAE;YACb,aAAa,EAAE;gBACX,QAAQ,EAAE;oBACN,IAAI,EAAE,IAAI;oBACV,OAAO,EAAE,SAAS;oBAClB,iBAAiB,EAAE,SAAS;iBAC/B;aACJ;YACD,aAAa,EAAE;gBACX,8BAA8B,EAAE,IAAI;gBACpC,oBAAoB,EAAE,KAAK;gBAC3B,KAAK,EAAE,SAAS;aACnB;YACD,WAAW,EAAE;gBACT,eAAe,EAAE,qBAAqB;gBACtC,uBAAuB,EAAE,EAAE,EAAE,EAAE,SAAS,EAAE;aAC7C;YACD,mBAAmB,EAAE,CAAC,MAAe,EAAE,EAAE;gBACrC,gBAAgB,CAAC;oBACb,aAAa;oBACb,MAAM;iBACT,CAAC,CAAC;YACP,CAAC;SACJ;QACD,qBAAqB,EAAE;YACnB,OAAO,EAAE;gBACL,aAAa,EAAE;oBACX,gBAAgB,EAAE,CAAC,SAAS,CAAC;iBAChC;gBACD,UAAU,EAAE;oBACR,OAAO,EAAE;wBACL,KAAK,EAAE,cAAc;wBACrB,MAAM,EAAE,aAAa;qBACxB;iBACJ;aACJ;SACJ;KACJ,CAAC;AACN,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "monaco-languageclient-examples",
|
|
3
|
-
"version": "2025.1
|
|
3
|
+
"version": "2025.2.1",
|
|
4
4
|
"description": "Monaco Language client examples",
|
|
5
5
|
"author": {
|
|
6
6
|
"name": "TypeFox GmbH",
|
|
@@ -71,49 +71,46 @@
|
|
|
71
71
|
"LICENSE"
|
|
72
72
|
],
|
|
73
73
|
"dependencies": {
|
|
74
|
-
"@codingame/monaco-vscode-configuration-service-override": "13.1.
|
|
75
|
-
"@codingame/monaco-vscode-cpp-default-extension": "13.1.
|
|
76
|
-
"@codingame/monaco-vscode-editor-api": "13.1.
|
|
77
|
-
"@codingame/monaco-vscode-environment-service-override": "13.1.
|
|
78
|
-
"@codingame/monaco-vscode-explorer-service-override": "13.1.
|
|
79
|
-
"@codingame/monaco-vscode-files-service-override": "13.1.
|
|
80
|
-
"@codingame/monaco-vscode-groovy-default-extension": "13.1.
|
|
81
|
-
"@codingame/monaco-vscode-java-default-extension": "13.1.
|
|
82
|
-
"@codingame/monaco-vscode-javascript-default-extension": "13.1.
|
|
83
|
-
"@codingame/monaco-vscode-json-default-extension": "13.1.
|
|
84
|
-
"@codingame/monaco-vscode-keybindings-service-override": "13.1.
|
|
85
|
-
"@codingame/monaco-vscode-
|
|
86
|
-
"@codingame/monaco-vscode-
|
|
87
|
-
"@codingame/monaco-vscode-
|
|
88
|
-
"@codingame/monaco-vscode-
|
|
89
|
-
"@codingame/monaco-vscode-
|
|
90
|
-
"@codingame/monaco-vscode-
|
|
91
|
-
"@codingame/monaco-vscode-
|
|
92
|
-
"@codingame/monaco-vscode-
|
|
93
|
-
"@codingame/monaco-vscode-
|
|
94
|
-
"@codingame/monaco-vscode-
|
|
95
|
-
"@codingame/monaco-vscode-
|
|
96
|
-
"@codingame/monaco-vscode-
|
|
97
|
-
"@codingame/monaco-vscode-
|
|
98
|
-
"@codingame/monaco-vscode-
|
|
99
|
-
"@codingame/monaco-vscode-
|
|
100
|
-
"@codingame/monaco-vscode-
|
|
101
|
-
"@codingame/monaco-vscode-
|
|
102
|
-
"@
|
|
103
|
-
"@codingame/monaco-vscode-typescript-language-features-default-extension": "13.1.1",
|
|
104
|
-
"@codingame/monaco-vscode-views-service-override": "13.1.1",
|
|
105
|
-
"@typefox/monaco-editor-react": "~6.2.0",
|
|
74
|
+
"@codingame/monaco-vscode-configuration-service-override": "13.1.2",
|
|
75
|
+
"@codingame/monaco-vscode-cpp-default-extension": "13.1.2",
|
|
76
|
+
"@codingame/monaco-vscode-editor-api": "13.1.2",
|
|
77
|
+
"@codingame/monaco-vscode-environment-service-override": "13.1.2",
|
|
78
|
+
"@codingame/monaco-vscode-explorer-service-override": "13.1.2",
|
|
79
|
+
"@codingame/monaco-vscode-files-service-override": "13.1.2",
|
|
80
|
+
"@codingame/monaco-vscode-groovy-default-extension": "13.1.2",
|
|
81
|
+
"@codingame/monaco-vscode-java-default-extension": "13.1.2",
|
|
82
|
+
"@codingame/monaco-vscode-javascript-default-extension": "13.1.2",
|
|
83
|
+
"@codingame/monaco-vscode-json-default-extension": "13.1.2",
|
|
84
|
+
"@codingame/monaco-vscode-keybindings-service-override": "13.1.2",
|
|
85
|
+
"@codingame/monaco-vscode-lifecycle-service-override": "13.1.2",
|
|
86
|
+
"@codingame/monaco-vscode-localization-service-override": "13.1.2",
|
|
87
|
+
"@codingame/monaco-vscode-python-default-extension": "13.1.2",
|
|
88
|
+
"@codingame/monaco-vscode-remote-agent-service-override": "13.1.2",
|
|
89
|
+
"@codingame/monaco-vscode-search-result-default-extension": "13.1.2",
|
|
90
|
+
"@codingame/monaco-vscode-search-service-override": "13.1.2",
|
|
91
|
+
"@codingame/monaco-vscode-secret-storage-service-override": "13.1.2",
|
|
92
|
+
"@codingame/monaco-vscode-standalone-json-language-features": "13.1.2",
|
|
93
|
+
"@codingame/monaco-vscode-standalone-languages": "13.1.2",
|
|
94
|
+
"@codingame/monaco-vscode-standalone-typescript-language-features": "13.1.2",
|
|
95
|
+
"@codingame/monaco-vscode-storage-service-override": "13.1.2",
|
|
96
|
+
"@codingame/monaco-vscode-textmate-service-override": "13.1.2",
|
|
97
|
+
"@codingame/monaco-vscode-theme-defaults-default-extension": "13.1.2",
|
|
98
|
+
"@codingame/monaco-vscode-theme-service-override": "13.1.2",
|
|
99
|
+
"@codingame/monaco-vscode-typescript-basics-default-extension": "13.1.2",
|
|
100
|
+
"@codingame/monaco-vscode-typescript-language-features-default-extension": "13.1.2",
|
|
101
|
+
"@codingame/monaco-vscode-views-service-override": "13.1.2",
|
|
102
|
+
"@typefox/monaco-editor-react": "~6.2.2",
|
|
106
103
|
"cors": "^2.8.5",
|
|
107
104
|
"express": "~4.21.2",
|
|
108
105
|
"jszip": "~3.10.1",
|
|
109
106
|
"langium": "~3.3.1",
|
|
110
|
-
"monaco-editor-wrapper": "~6.2.
|
|
111
|
-
"monaco-languageclient": "~9.2.
|
|
112
|
-
"pyright": "~1.1.
|
|
107
|
+
"monaco-editor-wrapper": "~6.2.2",
|
|
108
|
+
"monaco-languageclient": "~9.2.2",
|
|
109
|
+
"pyright": "~1.1.393",
|
|
113
110
|
"react": "~19.0.0",
|
|
114
111
|
"react-dom": "~19.0.0",
|
|
115
112
|
"request-light": "~0.8.0",
|
|
116
|
-
"vscode": "npm:@codingame/monaco-vscode-extension-api@13.1.
|
|
113
|
+
"vscode": "npm:@codingame/monaco-vscode-extension-api@13.1.2",
|
|
117
114
|
"vscode-json-languageservice": "~5.4.2",
|
|
118
115
|
"vscode-languageclient": "~9.0.1",
|
|
119
116
|
"vscode-languageserver": "~9.0.1",
|
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
|
|
6
6
|
import { Uri } from 'vscode';
|
|
7
7
|
import { Logger } from 'monaco-languageclient/tools';
|
|
8
|
-
import { useWorkerFactory } from 'monaco-
|
|
8
|
+
import { useWorkerFactory, WorkerLoader } from 'monaco-languageclient/workerFactory';
|
|
9
9
|
import { RegisteredMemoryFile } from '@codingame/monaco-vscode-files-service-override';
|
|
10
10
|
import { IStoredWorkspace } from '@codingame/monaco-vscode-configuration-service-override';
|
|
11
11
|
|
|
@@ -16,35 +16,28 @@ export const disableElement = (id: string, disabled: boolean) => {
|
|
|
16
16
|
}
|
|
17
17
|
};
|
|
18
18
|
|
|
19
|
+
export const defineDefaultWorkerLoaders: () => Record<string, WorkerLoader> = () => {
|
|
20
|
+
return {
|
|
21
|
+
// if you import monaco api as 'monaco-editor': monaco-editor/esm/vs/editor/editor.worker.js
|
|
22
|
+
TextEditorWorker: () => new Worker(
|
|
23
|
+
new URL('@codingame/monaco-vscode-editor-api/esm/vs/editor/editor.worker.js', import.meta.url),
|
|
24
|
+
{ type: 'module' }
|
|
25
|
+
),
|
|
26
|
+
TextMateWorker: () => new Worker(
|
|
27
|
+
new URL('@codingame/monaco-vscode-textmate-service-override/worker', import.meta.url),
|
|
28
|
+
{ type: 'module' }
|
|
29
|
+
),
|
|
30
|
+
// these are other possible workers not configured by default
|
|
31
|
+
OutputLinkDetectionWorker: undefined,
|
|
32
|
+
LanguageDetectionWorker: undefined,
|
|
33
|
+
NotebookEditorWorker: undefined,
|
|
34
|
+
LocalFileSearchWorker: undefined
|
|
35
|
+
};
|
|
36
|
+
};
|
|
37
|
+
|
|
19
38
|
export const configureMonacoWorkers = (logger?: Logger) => {
|
|
20
39
|
useWorkerFactory({
|
|
21
|
-
workerLoaders:
|
|
22
|
-
// if you import monaco api as 'monaco-editor': monaco-editor/esm/vs/editor/editor.worker.js
|
|
23
|
-
TextEditorWorker: () => new Worker(
|
|
24
|
-
new URL('@codingame/monaco-vscode-editor-api/esm/vs/editor/editor.worker.js', import.meta.url),
|
|
25
|
-
{ type: 'module' }
|
|
26
|
-
),
|
|
27
|
-
TextMateWorker: () => new Worker(
|
|
28
|
-
new URL('@codingame/monaco-vscode-textmate-service-override/worker', import.meta.url),
|
|
29
|
-
{ type: 'module' }
|
|
30
|
-
),
|
|
31
|
-
OutputLinkDetectionWorker: () => new Worker(
|
|
32
|
-
new URL('@codingame/monaco-vscode-output-service-override/worker', import.meta.url),
|
|
33
|
-
{ type: 'module' }
|
|
34
|
-
),
|
|
35
|
-
LanguageDetectionWorker: () => new Worker(
|
|
36
|
-
new URL('@codingame/monaco-vscode-language-detection-worker-service-override/worker', import.meta.url),
|
|
37
|
-
{ type: 'module' }
|
|
38
|
-
),
|
|
39
|
-
NotebookEditorWorker: () => new Worker(
|
|
40
|
-
new URL('@codingame/monaco-vscode-notebook-service-override/worker', import.meta.url),
|
|
41
|
-
{ type: 'module' }
|
|
42
|
-
),
|
|
43
|
-
LocalFileSearchWorker: () => new Worker(
|
|
44
|
-
new URL('@codingame/monaco-vscode-search-service-override/worker', import.meta.url),
|
|
45
|
-
{ type: 'module' }
|
|
46
|
-
)
|
|
47
|
-
},
|
|
40
|
+
workerLoaders: defineDefaultWorkerLoaders(),
|
|
48
41
|
logger
|
|
49
42
|
});
|
|
50
43
|
};
|
|
@@ -7,12 +7,15 @@ import getConfigurationServiceOverride from '@codingame/monaco-vscode-configurat
|
|
|
7
7
|
import getKeybindingsServiceOverride from '@codingame/monaco-vscode-keybindings-service-override';
|
|
8
8
|
import { LogLevel } from '@codingame/monaco-vscode-api';
|
|
9
9
|
import { Logger } from 'monaco-languageclient/tools';
|
|
10
|
+
import { useWorkerFactory } from 'monaco-languageclient/workerFactory';
|
|
10
11
|
import { WrapperConfig } from 'monaco-editor-wrapper';
|
|
11
12
|
import { LangiumMonarchContent } from './langium.monarch.js';
|
|
12
|
-
import { useWorkerFactory } from 'monaco-editor-wrapper/workerFactory';
|
|
13
13
|
import code from '../../../../resources/langium/langium-dsl/example.langium?raw';
|
|
14
|
+
import { defineDefaultWorkerLoaders } from '../../../common/client/utils.js';
|
|
14
15
|
|
|
15
16
|
export const setupLangiumClientClassic = async (langiumWorker: Worker): Promise<WrapperConfig> => {
|
|
17
|
+
const workerLoaders = defineDefaultWorkerLoaders();
|
|
18
|
+
workerLoaders.TextMateWorker = undefined;
|
|
16
19
|
return {
|
|
17
20
|
$type: 'classic',
|
|
18
21
|
htmlContainer: document.getElementById('monaco-editor-root')!,
|
|
@@ -42,9 +45,7 @@ export const setupLangiumClientClassic = async (langiumWorker: Worker): Promise<
|
|
|
42
45
|
},
|
|
43
46
|
monacoWorkerFactory: (logger?: Logger) => {
|
|
44
47
|
useWorkerFactory({
|
|
45
|
-
workerLoaders
|
|
46
|
-
TextEditorWorker: () => new Worker(new URL('@codingame/monaco-vscode-editor-api/esm/vs/editor/editor.worker.js', import.meta.url), { type: 'module' })
|
|
47
|
-
},
|
|
48
|
+
workerLoaders,
|
|
48
49
|
logger
|
|
49
50
|
});
|
|
50
51
|
}
|