Skip to content

Commit 82cd0b3

Browse files
kaisalmenkaisalmen
authored
Merge pull request #852 from TypeFox/mva-next
Update to monaco-vscode-api 14.0.2 and incremented versions to x.3.0
2 parents 9b3e699 + 41e5700 commit 82cd0b3

File tree

23 files changed

+2158
-1777
lines changed

23 files changed

+2158
-1777
lines changed

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ Because `@codingame/monaco-vscode-api` relies on it own build of `monaco-editor`
306306

307307
```json
308308
"overrides": {
309-
"monaco-editor": "npm:@codingame/monaco-vscode-editor-api@~13.1.6"
309+
"monaco-editor": "npm:@codingame/monaco-vscode-editor-api@~14.0.2"
310310
}
311311
```
312312

@@ -315,7 +315,7 @@ Because `@codingame/monaco-vscode-api` relies on it own build of `monaco-editor`
315315
If you use pnpm, you have to add `vscode` / `@codingame/monaco-vscode-api` as direct dependency (you find the [compatibility table here](https://github.com/TypeFox/monaco-languageclient/blob/main/docs/versions-and-history.md#monaco-editor--codingamemonaco-vscode-api-compatibility-table), otherwise the installation will fail.
316316

317317
```json
318-
"vscode": "npm:@codingame/monaco-vscode-extension-api@~13.1.6"
318+
"vscode": "npm:@codingame/monaco-vscode-extension-api@~14.0.2"
319319
```
320320

321321
## Licenses

‎docs/versions-and-history.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ The following table describes which version of **monaco-languageclient** and **@
66

77
| monaco-languageclient | monaco-editor-wrapper | monaco-editor-react | monaco-vscode-api / editor-api | vscode | monaco-editor | release date | comment |
88
| :---- | :---- | :--- | :--- | :--- | :--- | :--- | :--- |
9+
| 9.3.0 | 6.3.0 | 6.3.0 | 14.0.2 | 1.97.0 | 0.52.2 | 2025-02-1x | |
910
| 9.2.5 | 6.2.5 | 6.2.5 | 13.1.6 | 1.96.4 | 0.52.2 | 2025-02-08 | |
1011
| 9.2.4 | 6.2.4 | 6.2.4 | 13.1.4 | 1.96.4 | 0.52.2 | 2025-02-06 | |
1112
| 9.2.3 | 6.2.3 | 6.2.3 | 13.1.3 | 1.96.4 | 0.52.2 | 2025-02-04 | |

‎package-lock.json‎

Lines changed: 1953 additions & 1576 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,22 @@
1212
"yarn": "4.6.0"
1313
},
1414
"devDependencies": {
15-
"@codingame/esbuild-import-meta-url-plugin": "~1.0.2",
16-
"@codingame/monaco-vscode-rollup-vsix-plugin": "~13.1.6",
15+
"@codingame/esbuild-import-meta-url-plugin": "~1.0.3",
16+
"@codingame/monaco-vscode-rollup-vsix-plugin": "~14.0.2",
1717
"@eslint/eslintrc": "~3.2.0",
18-
"@eslint/js": "~9.19.0",
19-
"@stylistic/eslint-plugin": "~3.0.1",
18+
"@eslint/js": "~9.20.0",
19+
"@stylistic/eslint-plugin": "~3.1.0",
2020
"@testing-library/react": "~16.2.0",
2121
"@types/node": "~22.13.1",
2222
"@types/react": "~19.0.8",
2323
"@types/react-dom": "~19.0.3",
24-
"@typescript-eslint/eslint-plugin": "~8.23.0",
25-
"@typescript-eslint/parser": "~8.23.0",
24+
"@typescript-eslint/eslint-plugin": "~8.24.0",
25+
"@typescript-eslint/parser": "~8.24.0",
2626
"@vitejs/plugin-react": "~4.3.4",
2727
"@vitest/browser": "~3.0.5",
2828
"editorconfig": "~2.0.1",
29-
"esbuild": "~0.24.2",
30-
"eslint": "~9.19.0",
29+
"esbuild": "~0.25.0",
30+
"eslint": "~9.20.0",
3131
"eslint-plugin-header": "~3.1.1",
3232
"eslint-plugin-import": "~2.31.0",
3333
"eslint-plugin-unused-imports": "~4.1.4",

‎packages/client/CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
All notable changes to this npm module are documented in this file.
44

5+
## [9.3.0] - 2025-02-1x
6+
7+
- Updated all `@codingame/monaco-vscode` packages to `14.0.2`.
8+
59
## [9.2.5] - 2025-02-08
610

711
- Updated all `@codingame/monaco-vscode` packages to `13.1.6`.

‎packages/client/package.json‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "monaco-languageclient",
3-
"version": "9.2.5",
3+
"version": "9.3.0",
44
"description": "Monaco Language client implementation",
55
"author": {
66
"name": "TypeFox GmbH",
@@ -76,17 +76,17 @@
7676
"LICENSE"
7777
],
7878
"dependencies": {
79-
"@codingame/monaco-vscode-api": "~13.1.6",
80-
"@codingame/monaco-vscode-configuration-service-override": "~13.1.6",
81-
"@codingame/monaco-vscode-editor-api": "~13.1.6",
82-
"@codingame/monaco-vscode-editor-service-override": "~13.1.6",
83-
"@codingame/monaco-vscode-extensions-service-override": "~13.1.6",
84-
"@codingame/monaco-vscode-extension-api": "~13.1.6",
85-
"@codingame/monaco-vscode-languages-service-override": "~13.1.6",
86-
"@codingame/monaco-vscode-localization-service-override": "~13.1.6",
87-
"@codingame/monaco-vscode-log-service-override": "~13.1.6",
88-
"@codingame/monaco-vscode-model-service-override": "~13.1.6",
89-
"vscode": "npm:@codingame/monaco-vscode-extension-api@~13.1.6",
79+
"@codingame/monaco-vscode-api": "~14.0.2",
80+
"@codingame/monaco-vscode-configuration-service-override": "~14.0.2",
81+
"@codingame/monaco-vscode-editor-api": "~14.0.2",
82+
"@codingame/monaco-vscode-editor-service-override": "~14.0.2",
83+
"@codingame/monaco-vscode-extensions-service-override": "~14.0.2",
84+
"@codingame/monaco-vscode-extension-api": "~14.0.2",
85+
"@codingame/monaco-vscode-languages-service-override": "~14.0.2",
86+
"@codingame/monaco-vscode-localization-service-override": "~14.0.2",
87+
"@codingame/monaco-vscode-log-service-override": "~14.0.2",
88+
"@codingame/monaco-vscode-model-service-override": "~14.0.2",
89+
"vscode": "npm:@codingame/monaco-vscode-extension-api@~14.0.2",
9090
"vscode-languageclient": "~9.0.1"
9191
},
9292
"scripts": {

‎packages/examples/CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22

33
All notable changes to this npm module are documented in this file.
44

5+
## [2025.2.5] - 2025-02-1x
6+
7+
- Integrate python debugger [#842](https://github.com/TypeFox/monaco-languageclient/pull/842)
8+
- Updated all `@codingame/monaco-vscode` packages to `14.0.2`.
9+
- Updated to `monaco-languageclient@9.3.0`, `monaco-editor-wrapper@6.3.0` and `@typefox/monaco-editor-react@6.3.0`.
10+
511
## [2025.2.4] - 2025-02-08
612

713
- Updated all `@codingame/monaco-vscode` packages to `13.1.6`.

‎packages/examples/package.json‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "monaco-languageclient-examples",
3-
"version": "2025.2.4",
3+
"version": "2025.2.5",
44
"description": "Monaco Language client examples",
55
"author": {
66
"name": "TypeFox GmbH",
@@ -71,49 +71,49 @@
7171
"LICENSE"
7272
],
7373
"dependencies": {
74-
"@codingame/monaco-vscode-configuration-service-override": "~13.1.6",
75-
"@codingame/monaco-vscode-cpp-default-extension": "~13.1.6",
76-
"@codingame/monaco-vscode-debug-service-override": "~13.1.6",
77-
"@codingame/monaco-vscode-editor-api": "~13.1.6",
78-
"@codingame/monaco-vscode-environment-service-override": "~13.1.6",
79-
"@codingame/monaco-vscode-explorer-service-override": "~13.1.6",
80-
"@codingame/monaco-vscode-files-service-override": "~13.1.6",
81-
"@codingame/monaco-vscode-groovy-default-extension": "~13.1.6",
82-
"@codingame/monaco-vscode-java-default-extension": "~13.1.6",
83-
"@codingame/monaco-vscode-javascript-default-extension": "~13.1.6",
84-
"@codingame/monaco-vscode-json-default-extension": "~13.1.6",
85-
"@codingame/monaco-vscode-keybindings-service-override": "~13.1.6",
86-
"@codingame/monaco-vscode-lifecycle-service-override": "~13.1.6",
87-
"@codingame/monaco-vscode-localization-service-override": "~13.1.6",
88-
"@codingame/monaco-vscode-preferences-service-override": "~13.1.6",
89-
"@codingame/monaco-vscode-python-default-extension": "~13.1.6",
90-
"@codingame/monaco-vscode-remote-agent-service-override": "~13.1.6",
91-
"@codingame/monaco-vscode-search-result-default-extension": "~13.1.6",
92-
"@codingame/monaco-vscode-search-service-override": "~13.1.6",
93-
"@codingame/monaco-vscode-secret-storage-service-override": "~13.1.6",
94-
"@codingame/monaco-vscode-standalone-json-language-features": "~13.1.6",
95-
"@codingame/monaco-vscode-standalone-languages": "~13.1.6",
96-
"@codingame/monaco-vscode-standalone-typescript-language-features": "~13.1.6",
97-
"@codingame/monaco-vscode-testing-service-override": "~13.1.6",
98-
"@codingame/monaco-vscode-storage-service-override": "~13.1.6",
99-
"@codingame/monaco-vscode-textmate-service-override": "~13.1.6",
100-
"@codingame/monaco-vscode-theme-defaults-default-extension": "~13.1.6",
101-
"@codingame/monaco-vscode-theme-service-override": "~13.1.6",
102-
"@codingame/monaco-vscode-typescript-basics-default-extension": "~13.1.6",
103-
"@codingame/monaco-vscode-typescript-language-features-default-extension": "~13.1.6",
104-
"@codingame/monaco-vscode-views-service-override": "~13.1.6",
105-
"@typefox/monaco-editor-react": "~6.2.5",
74+
"@codingame/monaco-vscode-configuration-service-override": "~14.0.2",
75+
"@codingame/monaco-vscode-cpp-default-extension": "~14.0.2",
76+
"@codingame/monaco-vscode-debug-service-override": "~14.0.2",
77+
"@codingame/monaco-vscode-editor-api": "~14.0.2",
78+
"@codingame/monaco-vscode-environment-service-override": "~14.0.2",
79+
"@codingame/monaco-vscode-explorer-service-override": "~14.0.2",
80+
"@codingame/monaco-vscode-files-service-override": "~14.0.2",
81+
"@codingame/monaco-vscode-groovy-default-extension": "~14.0.2",
82+
"@codingame/monaco-vscode-java-default-extension": "~14.0.2",
83+
"@codingame/monaco-vscode-javascript-default-extension": "~14.0.2",
84+
"@codingame/monaco-vscode-json-default-extension": "~14.0.2",
85+
"@codingame/monaco-vscode-keybindings-service-override": "~14.0.2",
86+
"@codingame/monaco-vscode-lifecycle-service-override": "~14.0.2",
87+
"@codingame/monaco-vscode-localization-service-override": "~14.0.2",
88+
"@codingame/monaco-vscode-preferences-service-override": "~14.0.2",
89+
"@codingame/monaco-vscode-python-default-extension": "~14.0.2",
90+
"@codingame/monaco-vscode-remote-agent-service-override": "~14.0.2",
91+
"@codingame/monaco-vscode-search-result-default-extension": "~14.0.2",
92+
"@codingame/monaco-vscode-search-service-override": "~14.0.2",
93+
"@codingame/monaco-vscode-secret-storage-service-override": "~14.0.2",
94+
"@codingame/monaco-vscode-standalone-json-language-features": "~14.0.2",
95+
"@codingame/monaco-vscode-standalone-languages": "~14.0.2",
96+
"@codingame/monaco-vscode-standalone-typescript-language-features": "~14.0.2",
97+
"@codingame/monaco-vscode-testing-service-override": "~14.0.2",
98+
"@codingame/monaco-vscode-storage-service-override": "~14.0.2",
99+
"@codingame/monaco-vscode-textmate-service-override": "~14.0.2",
100+
"@codingame/monaco-vscode-theme-defaults-default-extension": "~14.0.2",
101+
"@codingame/monaco-vscode-theme-service-override": "~14.0.2",
102+
"@codingame/monaco-vscode-typescript-basics-default-extension": "~14.0.2",
103+
"@codingame/monaco-vscode-typescript-language-features-default-extension": "~14.0.2",
104+
"@codingame/monaco-vscode-views-service-override": "~14.0.2",
105+
"@typefox/monaco-editor-react": "~6.3.0",
106106
"cors": "^2.8.5",
107107
"express": "~4.21.2",
108108
"jszip": "~3.10.1",
109109
"langium": "~3.3.1",
110-
"monaco-editor-wrapper": "~6.2.5",
111-
"monaco-languageclient": "~9.2.5",
110+
"monaco-editor-wrapper": "~6.3.0",
111+
"monaco-languageclient": "~9.3.0",
112112
"pyright": "~1.1.393",
113113
"react": "~19.0.0",
114114
"react-dom": "~19.0.0",
115115
"request-light": "~0.8.0",
116-
"vscode": "npm:@codingame/monaco-vscode-extension-api@~13.1.6",
116+
"vscode": "npm:@codingame/monaco-vscode-extension-api@~14.0.2",
117117
"vscode-json-languageservice": "~5.4.2",
118118
"vscode-languageclient": "~9.0.1",
119119
"vscode-languageserver": "~9.0.1",

‎packages/examples/src/multi/twoLanguageClients.ts‎

Lines changed: 36 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import getKeybindingsServiceOverride from '@codingame/monaco-vscode-keybindings-
99
import '@codingame/monaco-vscode-json-default-extension';
1010
import '@codingame/monaco-vscode-python-default-extension';
1111
import { LogLevel } from '@codingame/monaco-vscode-api';
12-
import { type CodePlusFileExt, configureAndInitVscodeApi, disposeLanguageClients, LanguageClientWrapper, MonacoEditorLanguageClientWrapper, type WrapperConfig } from 'monaco-editor-wrapper';
12+
import { type CodePlusFileExt, MonacoEditorLanguageClientWrapper, type WrapperConfig } from 'monaco-editor-wrapper';
1313
import { configureMonacoWorkers, disableElement } from '../common/client/utils.js';
1414
import { createJsonLanguageClientConfig, createPythonLanguageClientConfig } from './config.js';
1515

@@ -30,15 +30,6 @@ print("Hello Moon!")
3030
let currentText = textJson;
3131
let currenFileExt = 'json';
3232

33-
const lccJson = createJsonLanguageClientConfig();
34-
const lcwJson = new LanguageClientWrapper({
35-
languageClientConfig: lccJson
36-
});
37-
const lccPython = createPythonLanguageClientConfig();
38-
const lcwPython = new LanguageClientWrapper({
39-
languageClientConfig: lccPython
40-
});
41-
4233
const wrapperConfig: WrapperConfig = {
4334
id: '42',
4435
$type: 'extended',
@@ -64,71 +55,54 @@ print("Hello Moon!")
6455
}
6556
},
6657
monacoWorkerFactory: configureMonacoWorkers
58+
},
59+
languageClientConfigs: {
60+
json: createJsonLanguageClientConfig(),
61+
python: createPythonLanguageClientConfig()
6762
}
6863
};
6964

7065
const wrapper = new MonacoEditorLanguageClientWrapper();
7166

72-
try {
73-
document.querySelector('#button-start')?.addEventListener('click', async () => {
74-
wrapperConfig.vscodeApiConfig!.vscodeApiInitPerformExternally = (document.getElementById('checkbox-extlc')! as HTMLInputElement).checked;
75-
if (wrapperConfig.vscodeApiConfig!.vscodeApiInitPerformExternally === true) {
76-
77-
const logger = wrapper.getLogger();
78-
logger.setLevel(wrapperConfig.logLevel!);
79-
await configureAndInitVscodeApi(wrapperConfig.$type, {
80-
vscodeApiConfig: wrapperConfig.vscodeApiConfig!,
81-
logLevel: wrapperConfig.logLevel!,
82-
}, {
83-
htmlContainer: wrapperConfig.htmlContainer,
84-
caller: 'runMultipleLanguageClientsExample',
85-
logger
86-
});
67+
document.querySelector('#button-start')?.addEventListener('click', async () => {
68+
try {
69+
disableElement('button-start', true);
70+
disableElement('button-flip', false);
71+
disableElement('checkbox-extlc', true);
8772

88-
const allPromises: Array<Promise<void>> = [];
89-
if (!lcwJson.isStarted()) {
90-
allPromises.push(lcwJson.start());
91-
}
92-
if (!lcwPython.isStarted()) {
93-
allPromises.push(lcwPython.start());
94-
}
95-
await Promise.all(allPromises);
96-
} else {
97-
wrapperConfig.languageClientConfigs = {
98-
json: lccJson,
99-
python: lccPython
100-
};
101-
}
73+
const externalLc = (document.getElementById('checkbox-extlc')! as HTMLInputElement).checked;
10274

103-
await wrapper.initAndStart(wrapperConfig);
75+
await wrapper.initAndStart(wrapperConfig, !externalLc);
10476
if (wrapperConfig.editorAppConfig?.codeResources?.modified !== undefined) {
10577
(wrapperConfig.editorAppConfig.codeResources.modified as CodePlusFileExt).text = currentText;
10678
(wrapperConfig.editorAppConfig.codeResources.modified as CodePlusFileExt).fileExt = currenFileExt;
10779
}
10880

109-
disableElement('button-flip', false);
110-
disableElement('checkbox-extlc', true);
111-
});
112-
document.querySelector('#button-dispose')?.addEventListener('click', async () => {
113-
disableElement('button-flip', true);
81+
// init language clients after start
82+
if (externalLc === true) {
83+
wrapper.initLanguageClients();
84+
await wrapper.startLanguageClients();
85+
}
86+
} catch (e) {
87+
console.error(e);
88+
}
89+
});
90+
document.querySelector('#button-dispose')?.addEventListener('click', async () => {
91+
disableElement('button-flip', true);
92+
disableElement('button-dispose', true);
93+
disableElement('button-start', false);
11494

115-
wrapperConfig.vscodeApiConfig!.vscodeApiInitPerformExternally = (document.getElementById('checkbox-extlc')! as HTMLInputElement).checked;
116-
if (wrapperConfig.vscodeApiConfig!.vscodeApiInitPerformExternally === true) {
117-
disposeLanguageClients([lcwJson, lcwPython], false);
95+
await wrapper.dispose();
96+
});
97+
document.querySelector('#button-flip')?.addEventListener('click', async () => {
98+
currentText = currentText === textJson ? textPython : textJson;
99+
currenFileExt = currenFileExt === 'json' ? 'py' : 'json';
100+
wrapper.updateCodeResources({
101+
modified: {
102+
text: currentText,
103+
fileExt: currenFileExt
118104
}
119-
await wrapper.dispose();
120-
});
121-
document.querySelector('#button-flip')?.addEventListener('click', async () => {
122-
currentText = currentText === textJson ? textPython : textJson;
123-
currenFileExt = currenFileExt === 'json' ? 'py' : 'json';
124-
wrapper.updateCodeResources({
125-
modified: {
126-
text: currentText,
127-
fileExt: currenFileExt
128-
}
129-
});
130105
});
131-
} catch (e) {
132-
console.error(e);
133-
}
106+
});
107+
134108
};

‎packages/wrapper-react/CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22

33
All notable changes to npm module [@typefox/monaco-editor-react](https://www.npmjs.com/package/@typefox/monaco-editor-react) are documented in this file.
44

5+
## [6.3.0] - 2025-02-1x
6+
7+
- Move text changes handling from react component to the wrapper [#849](https://github.com/TypeFox/monaco-languageclient/pull/849)
8+
- Updated to `monaco-languageclient@9.3.0` and `monaco-editor-wrapper@6.3.0`.
9+
- Updated all `@codingame/monaco-vscode` packages to `14.0.2`.
10+
511
## [6.2.5] - 2025-02-08
612

713
- Updated to `monaco-languageclient@9.2.5` and `monaco-editor-wrapper@6.2.5`.

0 commit comments

Comments
 (0)