Skip to content

Commit 2af7bdd

Browse files
kaisalmenkaisalmen
committed
Update to latest monaco-vscode-api 2.2.2 and Langium next build 3.0.0-next.cc1a49c
1 parent b564e5e commit 2af7bdd

File tree

20 files changed

+477
-445
lines changed

20 files changed

+477
-445
lines changed

‎README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,10 @@ With v7 we decided to use readily treemended version of monaco-editor called [@c
9191

9292
```yaml
9393
"overrides": {
94-
"monaco-editor": "npm:@codingame/monaco-vscode-editor-api@~2.2.1"
94+
"monaco-editor": "npm:@codingame/monaco-vscode-editor-api@~2.2.2"
9595
},
9696
"resolutions": {
97-
"monaco-editor": "npm:@codingame/monaco-vscode-editor-api@~2.2.1"
97+
"monaco-editor": "npm:@codingame/monaco-vscode-editor-api@~2.2.2"
9898
}
9999
```
100100

@@ -336,7 +336,7 @@ loader.config({ monaco });
336336
If you use pnpm, you have to add `vscode` / `@codingame/monaco-vscode-api` as direct dependency (see the [following table](#monaco-editor--codingamemonaco-vscode-api-compatibility-table)), otherwise the installation will fail.
337337

338338
```json
339-
"vscode": "npm:@codingame/monaco-vscode-api@~2.2.1"
339+
"vscode": "npm:@codingame/monaco-vscode-api@~2.2.2"
340340
```
341341

342342
## Monaco-editor / @codingame/monaco-vscode-api compatibility table

‎package-lock.json

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

‎package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
"type": "module",
44
"devDependencies": {
55
"@codingame/esbuild-import-meta-url-plugin": "~1.0.2",
6-
"@types/node": "~20.11.20",
7-
"@types/react": "~18.2.59",
6+
"@types/node": "~20.11.21",
7+
"@types/react": "~18.2.60",
88
"@types/react-dom": "~18.2.19",
99
"@types/shelljs": "~0.8.15",
1010
"@types/vscode": "~1.86.0",

‎packages/client/package.json

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "monaco-languageclient",
3-
"version": "8.0.0-next.0",
3+
"version": "8.0.0-next.1",
44
"description": "Monaco Language client implementation",
55
"author": {
66
"name": "TypeFox GmbH",
@@ -48,19 +48,19 @@
4848
"License.txt"
4949
],
5050
"dependencies": {
51-
"@codingame/monaco-vscode-editor-service-override": "~2.2.1",
52-
"@codingame/monaco-vscode-languages-service-override": "~2.2.1",
53-
"@codingame/monaco-vscode-model-service-override": "~2.2.1",
54-
"@codingame/monaco-vscode-api": "~2.2.1",
55-
"@codingame/monaco-vscode-editor-api": "~2.2.1",
56-
"monaco-editor": "npm:@codingame/monaco-vscode-editor-api@~2.2.1",
57-
"vscode": "npm:@codingame/monaco-vscode-api@~2.2.1",
51+
"@codingame/monaco-vscode-editor-service-override": "~2.2.2",
52+
"@codingame/monaco-vscode-languages-service-override": "~2.2.2",
53+
"@codingame/monaco-vscode-model-service-override": "~2.2.2",
54+
"@codingame/monaco-vscode-api": "~2.2.2",
55+
"@codingame/monaco-vscode-editor-api": "~2.2.2",
56+
"monaco-editor": "npm:@codingame/monaco-vscode-editor-api@~2.2.2",
57+
"vscode": "npm:@codingame/monaco-vscode-api@~2.2.2",
5858
"vscode-languageclient": "~9.0.1"
5959
},
6060
"peerDependencies": {
61-
"@codingame/monaco-vscode-api": "~2.2.1",
62-
"@codingame/monaco-vscode-editor-api": "~2.2.1",
63-
"vscode": "npm:@codingame/monaco-vscode-api@~2.2.1"
61+
"@codingame/monaco-vscode-api": "~2.2.2",
62+
"@codingame/monaco-vscode-editor-api": "~2.2.2",
63+
"vscode": "npm:@codingame/monaco-vscode-api@~2.2.2"
6464
},
6565
"peerDependenciesMeta": {
6666
"@codingame/monaco-vscode-api": {
@@ -77,10 +77,10 @@
7777
}
7878
},
7979
"overrides": {
80-
"monaco-editor": "npm:@codingame/monaco-vscode-editor-api@~2.2.1"
80+
"monaco-editor": "npm:@codingame/monaco-vscode-editor-api@~2.2.2"
8181
},
8282
"resolutions": {
83-
"monaco-editor": "npm:@codingame/monaco-vscode-editor-api@~2.2.1"
83+
"monaco-editor": "npm:@codingame/monaco-vscode-editor-api@~2.2.2"
8484
},
8585
"scripts": {
8686
"clean": "shx rm -fr lib *.tsbuildinfo",

‎packages/examples/package.json

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "monaco-languageclient-examples",
3-
"version": "8.0.0-next.0",
3+
"version": "8.0.0-next.1",
44
"description": "Monaco Language client examples",
55
"author": {
66
"name": "TypeFox GmbH",
@@ -43,52 +43,52 @@
4343
}
4444
},
4545
"dependencies": {
46-
"@codingame/monaco-vscode-api": "~2.2.1",
47-
"@codingame/monaco-vscode-editor-api": "~2.2.1",
48-
"@codingame/monaco-vscode-configuration-service-override": "~2.2.1",
49-
"@codingame/monaco-vscode-editor-service-override": "~2.2.1",
50-
"@codingame/monaco-vscode-files-service-override": "~2.2.1",
51-
"@codingame/monaco-vscode-groovy-default-extension": "~2.2.1",
52-
"@codingame/monaco-vscode-json-default-extension": "~2.2.1",
53-
"@codingame/monaco-vscode-keybindings-service-override": "~2.2.1",
54-
"@codingame/monaco-vscode-python-default-extension": "~2.2.1",
55-
"@codingame/monaco-vscode-textmate-service-override": "~2.2.1",
56-
"@codingame/monaco-vscode-theme-defaults-default-extension": "~2.2.1",
57-
"@codingame/monaco-vscode-theme-service-override": "~2.2.1",
58-
"@codingame/monaco-vscode-typescript-basics-default-extension": "~2.2.1",
59-
"@codingame/monaco-vscode-typescript-language-features-default-extension": "~2.2.1",
60-
"@codingame/monaco-vscode-language-pack-de": "~2.2.1",
61-
"@codingame/monaco-vscode-language-pack-es": "~2.2.1",
62-
"@codingame/monaco-vscode-language-pack-fr": "~2.2.1",
63-
"@typefox/monaco-editor-react": "~3.0.0-next.0",
46+
"@codingame/monaco-vscode-api": "~2.2.2",
47+
"@codingame/monaco-vscode-editor-api": "~2.2.2",
48+
"@codingame/monaco-vscode-configuration-service-override": "~2.2.2",
49+
"@codingame/monaco-vscode-editor-service-override": "~2.2.2",
50+
"@codingame/monaco-vscode-files-service-override": "~2.2.2",
51+
"@codingame/monaco-vscode-groovy-default-extension": "~2.2.2",
52+
"@codingame/monaco-vscode-json-default-extension": "~2.2.2",
53+
"@codingame/monaco-vscode-keybindings-service-override": "~2.2.2",
54+
"@codingame/monaco-vscode-python-default-extension": "~2.2.2",
55+
"@codingame/monaco-vscode-textmate-service-override": "~2.2.2",
56+
"@codingame/monaco-vscode-theme-defaults-default-extension": "~2.2.2",
57+
"@codingame/monaco-vscode-theme-service-override": "~2.2.2",
58+
"@codingame/monaco-vscode-typescript-basics-default-extension": "~2.2.2",
59+
"@codingame/monaco-vscode-typescript-language-features-default-extension": "~2.2.2",
60+
"@codingame/monaco-vscode-language-pack-de": "~2.2.2",
61+
"@codingame/monaco-vscode-language-pack-es": "~2.2.2",
62+
"@codingame/monaco-vscode-language-pack-fr": "~2.2.2",
63+
"@typefox/monaco-editor-react": "~3.0.0-next.1",
6464
"express": "~4.18.2",
65-
"langium": "~2.1.3",
66-
"monaco-languageclient": "~8.0.0-next.0",
67-
"monaco-editor-wrapper": "~4.0.0-next.0",
65+
"langium": "3.0.0-next.cc1a49c",
66+
"monaco-languageclient": "~8.0.0-next.1",
67+
"monaco-editor-wrapper": "~4.0.0-next.1",
6868
"pyright": "~1.1.351",
6969
"react": "~18.2.0",
7070
"react-dom": "~18.2.0",
7171
"request-light": "~0.7.0",
72-
"vscode": "npm:@codingame/monaco-vscode-api@~2.2.1",
72+
"vscode": "npm:@codingame/monaco-vscode-api@~2.2.2",
7373
"vscode-json-languageservice": "~5.3.7",
7474
"vscode-languageclient": "~9.0.1",
7575
"vscode-languageserver": "~9.0.1",
7676
"vscode-uri": "~3.0.8",
77-
"vscode-ws-jsonrpc": "~3.3.0-next.0",
77+
"vscode-ws-jsonrpc": "~3.3.0-next.1",
7878
"ws": "~8.16.0"
7979
},
8080
"devDependencies": {
8181
"@types/express": "~4.17.21",
8282
"@types/ws": "~8.5.10",
83-
"langium-cli": "~2.1.0",
83+
"langium-cli": "3.0.0-next.cc1a49c",
8484
"ts-node": "~10.9.1",
8585
"vscode-languageserver-types": "~3.17.5"
8686
},
8787
"overrides": {
88-
"monaco-editor": "npm:@codingame/monaco-vscode-editor-api@~2.2.1"
88+
"monaco-editor": "npm:@codingame/monaco-vscode-editor-api@~2.2.2"
8989
},
9090
"resolutions": {
91-
"monaco-editor": "npm:@codingame/monaco-vscode-editor-api@~2.2.1"
91+
"monaco-editor": "npm:@codingame/monaco-vscode-editor-api@~2.2.2"
9292
},
9393
"volta": {
9494
"node": "20.11.0",
@@ -108,7 +108,7 @@
108108
"compile": "tsc --build tsconfig.src.json",
109109
"build:msg": "echo Building main examples:",
110110
"build:worker:vite": "vite --config vite.statemachine-worker.ts build",
111-
"build:worker:statemachine": "esbuild ./src/langium/statemachine/ls/main-browser.js --bundle --tree-shaking=true --minify --format=iife --outfile=./dist/worker/statemachineServerWorker.js",
111+
"build:worker:statemachine": "esbuild ./src/langium/statemachine/worker/statemachine-server.js --bundle --tree-shaking=true --minify --format=iife --outfile=./dist/worker/statemachineServerWorker.js",
112112
"build": "npm run build:msg && npm run clean && npm run compile && npm run build:worker:statemachine",
113113
"start:server:json": "node --loader ts-node/esm src/json/server/direct.ts",
114114
"start:server:python": "node --loader ts-node/esm src/python/server/direct.ts",

‎packages/examples/src/json/client/wrapperWs.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,6 @@ try {
7575
document.querySelector('#button-dispose')?.addEventListener('click', async () => {
7676
codeMain = await disposeEditor(userConfig.wrapperConfig.editorAppConfig.useDiffEditor);
7777
});
78-
79-
startEditor(userConfig, htmlElement, codeMain, codeOrg);
8078
} catch (e) {
8179
console.error(e);
8280
}

‎packages/examples/src/langium/langium-dsl/worker/langium-server.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
* Licensed under the MIT License. See License.txt in the project root for license information.
44
* ------------------------------------------------------------------------------------------ */
55

6-
import { DefaultSharedModuleContext, EmptyFileSystem, createLangiumGrammarServices, startLanguageServer } from 'langium';
6+
import { EmptyFileSystem } from 'langium';
7+
import { DefaultSharedModuleContext, startLanguageServer } from 'langium/lsp';
8+
import { createLangiumGrammarServices } from 'langium/grammar';
79
import { BrowserMessageReader, BrowserMessageWriter, createConnection } from 'vscode-languageserver/browser.js';
810

911
/* browser specific setup code */

‎packages/examples/src/langium/statemachine/ls/generated/ast.ts

Lines changed: 49 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/******************************************************************************
2-
* This file was generated by langium-cli 2.1.0.
2+
* This file was generated by langium-cli 3.0.0-next.e78aeba.
33
* DO NOT EDIT MANUALLY!
44
******************************************************************************/
55

@@ -17,7 +17,7 @@ export const StatemachineTerminals = {
1717
export interface Command extends AstNode {
1818
readonly $container: Statemachine;
1919
readonly $type: 'Command';
20-
name: string
20+
name: string;
2121
}
2222

2323
export const Command = 'Command';
@@ -29,7 +29,7 @@ export function isCommand(item: unknown): item is Command {
2929
export interface Event extends AstNode {
3030
readonly $container: Statemachine;
3131
readonly $type: 'Event';
32-
name: string
32+
name: string;
3333
}
3434

3535
export const Event = 'Event';
@@ -41,9 +41,9 @@ export function isEvent(item: unknown): item is Event {
4141
export interface State extends AstNode {
4242
readonly $container: Statemachine;
4343
readonly $type: 'State';
44-
actions: Array<Reference<Command>>
45-
name: string
46-
transitions: Array<Transition>
44+
actions: Array<Reference<Command>>;
45+
name: string;
46+
transitions: Array<Transition>;
4747
}
4848

4949
export const State = 'State';
@@ -54,11 +54,11 @@ export function isState(item: unknown): item is State {
5454

5555
export interface Statemachine extends AstNode {
5656
readonly $type: 'Statemachine';
57-
commands: Array<Command>
58-
events: Array<Event>
59-
init: Reference<State>
60-
name: string
61-
states: Array<State>
57+
commands: Array<Command>;
58+
events: Array<Event>;
59+
init: Reference<State>;
60+
name: string;
61+
states: Array<State>;
6262
}
6363

6464
export const Statemachine = 'Statemachine';
@@ -70,8 +70,8 @@ export function isStatemachine(item: unknown): item is Statemachine {
7070
export interface Transition extends AstNode {
7171
readonly $container: State;
7272
readonly $type: 'Transition';
73-
event: Reference<Event>
74-
state: Reference<State>
73+
event: Reference<Event>;
74+
state: Reference<State>;
7575
}
7676

7777
export const Transition = 'Transition';
@@ -123,29 +123,57 @@ export class StatemachineAstReflection extends AbstractAstReflection {
123123

124124
getTypeMetaData(type: string): TypeMetaData {
125125
switch (type) {
126+
case 'Command': {
127+
return {
128+
name: 'Command',
129+
properties: [
130+
{ name: 'name' }
131+
]
132+
};
133+
}
134+
case 'Event': {
135+
return {
136+
name: 'Event',
137+
properties: [
138+
{ name: 'name' }
139+
]
140+
};
141+
}
126142
case 'State': {
127143
return {
128144
name: 'State',
129-
mandatory: [
130-
{ name: 'actions', type: 'array' },
131-
{ name: 'transitions', type: 'array' }
145+
properties: [
146+
{ name: 'actions', defaultValue: [] },
147+
{ name: 'name' },
148+
{ name: 'transitions', defaultValue: [] }
132149
]
133150
};
134151
}
135152
case 'Statemachine': {
136153
return {
137154
name: 'Statemachine',
138-
mandatory: [
139-
{ name: 'commands', type: 'array' },
140-
{ name: 'events', type: 'array' },
141-
{ name: 'states', type: 'array' }
155+
properties: [
156+
{ name: 'commands', defaultValue: [] },
157+
{ name: 'events', defaultValue: [] },
158+
{ name: 'init' },
159+
{ name: 'name' },
160+
{ name: 'states', defaultValue: [] }
161+
]
162+
};
163+
}
164+
case 'Transition': {
165+
return {
166+
name: 'Transition',
167+
properties: [
168+
{ name: 'event' },
169+
{ name: 'state' }
142170
]
143171
};
144172
}
145173
default: {
146174
return {
147175
name: type,
148-
mandatory: []
176+
properties: []
149177
};
150178
}
151179
}

‎packages/examples/src/langium/statemachine/ls/generated/grammar.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/******************************************************************************
2-
* This file was generated by langium-cli 2.1.0.
2+
* This file was generated by langium-cli 3.0.0-next.e78aeba.
33
* DO NOT EDIT MANUALLY!
44
******************************************************************************/
55

‎packages/examples/src/langium/statemachine/ls/generated/module.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
/******************************************************************************
2-
* This file was generated by langium-cli 2.1.0.
2+
* This file was generated by langium-cli 3.0.0-next.e78aeba.
33
* DO NOT EDIT MANUALLY!
44
******************************************************************************/
55

6-
import type { LangiumGeneratedServices, LangiumGeneratedSharedServices, LangiumSharedServices, LangiumServices, LanguageMetaData, Module } from 'langium';
6+
import type { LangiumGeneratedCoreServices, LangiumGeneratedSharedCoreServices, LanguageMetaData, Module } from 'langium';
7+
import type { LangiumSharedServices, LangiumServices } from 'langium/lsp';
78
import { StatemachineAstReflection } from './ast.js';
89
import { StatemachineGrammar } from './grammar.js';
910

@@ -13,11 +14,11 @@ export const StatemachineLanguageMetaData = {
1314
caseInsensitive: false
1415
} as const satisfies LanguageMetaData;
1516

16-
export const StatemachineGeneratedSharedModule: Module<LangiumSharedServices, LangiumGeneratedSharedServices> = {
17+
export const StatemachineGeneratedSharedModule: Module<LangiumSharedServices, LangiumGeneratedSharedCoreServices> = {
1718
AstReflection: () => new StatemachineAstReflection()
1819
};
1920

20-
export const StatemachineGeneratedModule: Module<LangiumServices, LangiumGeneratedServices> = {
21+
export const StatemachineGeneratedModule: Module<LangiumServices, LangiumGeneratedCoreServices> = {
2122
Grammar: () => StatemachineGrammar(),
2223
LanguageMetaData: () => StatemachineLanguageMetaData,
2324
parser: {}

‎packages/examples/src/langium/statemachine/ls/statemachine-module.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,10 @@
44
* terms of the MIT License, which is available in the project root.
55
******************************************************************************/
66

7-
import type { DefaultSharedModuleContext, LangiumServices, LangiumSharedServices, Module, PartialLangiumServices } from 'langium';
8-
import { createDefaultModule, createDefaultSharedModule, inject } from 'langium';
7+
import type { Module } from 'langium';
8+
import type { DefaultSharedModuleContext, LangiumServices, LangiumSharedServices, PartialLangiumServices } from 'langium/lsp';
9+
import { inject } from 'langium';
10+
import { createDefaultModule, createDefaultSharedModule } from 'langium/lsp';
911
import { StatemachineGeneratedModule, StatemachineGeneratedSharedModule } from './generated/module.js';
1012
import { registerValidationChecks, StatemachineValidator } from './statemachine-validator.js';
1113

‎packages/examples/src/langium/statemachine/worker/statemachine-server-start.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
* Licensed under the MIT License. See License.txt in the project root for license information.
44
* ------------------------------------------------------------------------------------------ */
55

6-
import { EmptyFileSystem, startLanguageServer } from 'langium';
6+
import { EmptyFileSystem } from 'langium';
7+
import { startLanguageServer } from 'langium/lsp';
78
import { BrowserMessageReader, BrowserMessageWriter, createConnection } from 'vscode-languageserver/browser.js';
89
import { createStatemachineServices } from '../ls/statemachine-module.js';
910

0 commit comments

Comments
 (0)