monaco-languageclient-examples 2025.3.2 → 2025.3.4
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 +12 -1
- package/dist/common/client/utils.d.ts +1 -0
- package/dist/common/client/utils.d.ts.map +1 -1
- package/dist/common/client/utils.js +3 -0
- package/dist/common/client/utils.js.map +1 -1
- package/dist/groovy/client/main.js +1 -1
- package/dist/groovy/client/main.js.map +1 -1
- package/dist/json/client/wrapperWs.js +1 -1
- package/dist/json/client/wrapperWs.js.map +1 -1
- package/dist/langium/langium-dsl/config/classicConfig.d.ts +5 -1
- package/dist/langium/langium-dsl/config/classicConfig.d.ts.map +1 -1
- package/dist/langium/langium-dsl/config/classicConfig.js +7 -5
- package/dist/langium/langium-dsl/config/classicConfig.js.map +1 -1
- package/dist/langium/langium-dsl/config/extendedConfig.d.ts +5 -1
- package/dist/langium/langium-dsl/config/extendedConfig.d.ts.map +1 -1
- package/dist/langium/langium-dsl/config/extendedConfig.js +5 -7
- package/dist/langium/langium-dsl/config/extendedConfig.js.map +1 -1
- package/dist/langium/langium-dsl/worker/langium-server.js +3 -0
- package/dist/langium/langium-dsl/worker/langium-server.js.map +1 -1
- package/dist/langium/langium-dsl/wrapperLangium.d.ts.map +1 -1
- package/dist/langium/langium-dsl/wrapperLangium.js +26 -5
- package/dist/langium/langium-dsl/wrapperLangium.js.map +1 -1
- package/dist/langium/statemachine/config/wrapperStatemachineConfig.d.ts +2 -2
- package/dist/langium/statemachine/config/wrapperStatemachineConfig.d.ts.map +1 -1
- package/dist/langium/statemachine/config/wrapperStatemachineConfig.js +1 -8
- package/dist/langium/statemachine/config/wrapperStatemachineConfig.js.map +1 -1
- package/dist/langium/statemachine/main-react.d.ts.map +1 -1
- package/dist/langium/statemachine/main-react.js +4 -1
- package/dist/langium/statemachine/main-react.js.map +1 -1
- package/dist/langium/statemachine/main.d.ts.map +1 -1
- package/dist/langium/statemachine/main.js +21 -7
- package/dist/langium/statemachine/main.js.map +1 -1
- package/dist/multi/twoLanguageClients.js +3 -3
- package/dist/multi/twoLanguageClients.js.map +1 -1
- package/dist/ts/wrapperTs.js +1 -1
- package/dist/ts/wrapperTs.js.map +1 -1
- package/package.json +4 -4
- package/src/common/client/utils.ts +4 -0
- package/src/groovy/client/main.ts +1 -1
- package/src/json/client/wrapperWs.ts +1 -1
- package/src/langium/langium-dsl/config/classicConfig.ts +10 -5
- package/src/langium/langium-dsl/config/extendedConfig.ts +8 -9
- package/src/langium/langium-dsl/worker/langium-server.ts +4 -0
- package/src/langium/langium-dsl/wrapperLangium.ts +27 -6
- package/src/langium/statemachine/config/wrapperStatemachineConfig.ts +3 -11
- package/src/langium/statemachine/main-react.tsx +4 -1
- package/src/langium/statemachine/main.ts +23 -7
- package/src/multi/twoLanguageClients.ts +5 -5
- package/src/ts/wrapperTs.ts +2 -2
package/CHANGELOG.md
CHANGED
|
@@ -2,7 +2,18 @@
|
|
|
2
2
|
|
|
3
3
|
All notable changes to this npm module are documented in this file.
|
|
4
4
|
|
|
5
|
-
## [2025.3.
|
|
5
|
+
## [2025.3.4] - 2025-03-07
|
|
6
|
+
|
|
7
|
+
- Model handling improvements [#891](https://github.com/TypeFox/monaco-languageclient/pull/891)
|
|
8
|
+
- Updated to `monaco-editor-wrapper@6.6.0-next.0` and `@typefox/monaco-editor-react@6.6.0-next.0`.
|
|
9
|
+
- Aligned examples to api changes
|
|
10
|
+
- Langium examples log messsage exchange between client and language server
|
|
11
|
+
|
|
12
|
+
## [2025.3.3] - 2025-03-06
|
|
13
|
+
|
|
14
|
+
- Updated to `monaco-languageclient@9.4.1`, `monaco-editor-wrapper@6.5.0` and `@typefox/monaco-editor-react@6.5.0`.
|
|
15
|
+
|
|
16
|
+
## [2025.3.2] - 2025-03-05
|
|
6
17
|
|
|
7
18
|
- Updated to `monaco-languageclient@9.4.1-next.1`, `monaco-editor-wrapper@6.5.0-next.1` and `@typefox/monaco-editor-react@6.5.0-next.1`.
|
|
8
19
|
- Both regular and react statemachine examples log language server communication in the console.
|
|
@@ -2,4 +2,5 @@ import { RegisteredMemoryFile } from '@codingame/monaco-vscode-files-service-ove
|
|
|
2
2
|
import type { Uri } from 'vscode';
|
|
3
3
|
export declare const disableElement: (id: string, disabled: boolean) => void;
|
|
4
4
|
export declare const createDefaultWorkspaceFile: (workspaceFile: Uri, workspacePath: string) => RegisteredMemoryFile;
|
|
5
|
+
export declare const delayExecution: (ms: number) => Promise<unknown>;
|
|
5
6
|
//# 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,oBAAoB,EAAE,MAAM,iDAAiD,CAAC;AAEvF,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;AAElC,eAAO,MAAM,cAAc,GAAI,IAAI,MAAM,EAAE,UAAU,OAAO,SAK3D,CAAC;AAEF,eAAO,MAAM,0BAA0B,GAAI,eAAe,GAAG,EAAE,eAAe,MAAM,yBAenF,CAAC"}
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/common/client/utils.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,oBAAoB,EAAE,MAAM,iDAAiD,CAAC;AAEvF,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;AAElC,eAAO,MAAM,cAAc,GAAI,IAAI,MAAM,EAAE,UAAU,OAAO,SAK3D,CAAC;AAEF,eAAO,MAAM,0BAA0B,GAAI,eAAe,GAAG,EAAE,eAAe,MAAM,yBAenF,CAAC;AAEF,eAAO,MAAM,cAAc,GAAI,IAAI,MAAM,qBAExC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/common/client/utils.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,OAAO,EAAE,oBAAoB,EAAE,MAAM,iDAAiD,CAAC;AAIvF,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,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
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/common/client/utils.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,OAAO,EAAE,oBAAoB,EAAE,MAAM,iDAAiD,CAAC;AAIvF,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,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;AAEF,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,EAAU,EAAE,EAAE;IACzC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;AAC7D,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main.js","sourceRoot":"","sources":["../../../src/groovy/client/main.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,OAAO,6BAA6B,MAAM,uDAAuD,CAAC;AAClG,uCAAuC;AACvC,OAAO,mDAAmD,CAAC;AAC3D,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AACxD,OAAO,EAAE,iCAAiC,EAAsB,MAAM,uBAAuB,CAAC;AAC9F,OAAO,EAAE,6BAA6B,EAAE,MAAM,6CAA6C,CAAC;AAC5F,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAE5C,MAAM,IAAI,GAAG;;;CAGZ,CAAC;AAEF,MAAM,aAAa,GAAkB;IACjC,KAAK,EAAE,UAAU;IACjB,aAAa,EAAE,QAAQ,CAAC,cAAc,CAAC,oBAAoB,CAAE;IAC7D,QAAQ,EAAE,QAAQ,CAAC,KAAK;IACxB,eAAe,EAAE;QACb,gBAAgB,EAAE;YACd,GAAG,6BAA6B,EAAE;SACrC;QACD,iBAAiB,EAAE;YACf,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;gBACjB,sBAAsB,EAAE,qBAAqB;gBAC7C,sCAAsC,EAAE,QAAQ;gBAChD,6BAA6B,EAAE,KAAK;gBACpC,uCAAuC,EAAE,IAAI;aAChD,CAAC;SACL;KACJ;IACD,eAAe,EAAE;QACb,aAAa,EAAE;YACX,QAAQ,EAAE;gBACN,IAAI,EAAE,IAAI;gBACV,
|
|
1
|
+
{"version":3,"file":"main.js","sourceRoot":"","sources":["../../../src/groovy/client/main.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,OAAO,6BAA6B,MAAM,uDAAuD,CAAC;AAClG,uCAAuC;AACvC,OAAO,mDAAmD,CAAC;AAC3D,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AACxD,OAAO,EAAE,iCAAiC,EAAsB,MAAM,uBAAuB,CAAC;AAC9F,OAAO,EAAE,6BAA6B,EAAE,MAAM,6CAA6C,CAAC;AAC5F,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAE5C,MAAM,IAAI,GAAG;;;CAGZ,CAAC;AAEF,MAAM,aAAa,GAAkB;IACjC,KAAK,EAAE,UAAU;IACjB,aAAa,EAAE,QAAQ,CAAC,cAAc,CAAC,oBAAoB,CAAE;IAC7D,QAAQ,EAAE,QAAQ,CAAC,KAAK;IACxB,eAAe,EAAE;QACb,gBAAgB,EAAE;YACd,GAAG,6BAA6B,EAAE;SACrC;QACD,iBAAiB,EAAE;YACf,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;gBACjB,sBAAsB,EAAE,qBAAqB;gBAC7C,sCAAsC,EAAE,QAAQ;gBAChD,6BAA6B,EAAE,KAAK;gBACpC,uCAAuC,EAAE,IAAI;aAChD,CAAC;SACL;KACJ;IACD,eAAe,EAAE;QACb,aAAa,EAAE;YACX,QAAQ,EAAE;gBACN,IAAI,EAAE,IAAI;gBACV,GAAG,EAAE,wBAAwB;aAChC;SACJ;QACD,mBAAmB,EAAE,6BAA6B;KACrD;IACD,qBAAqB,EAAE;QACnB,OAAO,EAAE;YACL,MAAM,EAAE;gBACJ,aAAa,EAAE;oBACX,gBAAgB,EAAE,CAAC,QAAQ,CAAC;iBAC/B;gBACD,UAAU,EAAE;oBACR,OAAO,EAAE;wBACL,KAAK,EAAE,cAAc;wBACrB,GAAG,EAAE,kBAAkB,YAAY,CAAC,IAAI,GAAG,YAAY,CAAC,IAAI,EAAE;qBACjE;iBACJ;aACJ;SACJ;KACJ;CACJ,CAAC;AAEF,MAAM,CAAC,MAAM,eAAe,GAAG,GAAG,EAAE;IAChC,MAAM,OAAO,GAAG,IAAI,iCAAiC,EAAE,CAAC;IAExD,IAAI,CAAC;QACD,QAAQ,CAAC,aAAa,CAAC,eAAe,CAAC,EAAE,gBAAgB,CAAC,OAAO,EAAE,KAAK,IAAI,EAAE;YAC1E,MAAM,OAAO,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;QAC9C,CAAC,CAAC,CAAC;QACH,QAAQ,CAAC,aAAa,CAAC,iBAAiB,CAAC,EAAE,gBAAgB,CAAC,OAAO,EAAE,KAAK,IAAI,EAAE;YAC5E,MAAM,OAAO,CAAC,OAAO,EAAE,CAAC;QAC5B,CAAC,CAAC,CAAC;IACP,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACT,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACrB,CAAC;AACL,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wrapperWs.js","sourceRoot":"","sources":["../../../src/json/client/wrapperWs.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,OAAO,6BAA6B,MAAM,uDAAuD,CAAC;AAClG,uCAAuC;AACvC,OAAO,iDAAiD,CAAC;AACzD,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AACxD,OAAO,EAAE,iCAAiC,EAAsB,MAAM,uBAAuB,CAAC;AAC9F,OAAO,EAAE,6BAA6B,EAAE,MAAM,6CAA6C,CAAC;AAE5F,MAAM,IAAI,GAAG;;;EAGX,CAAC;AAEH,MAAM,CAAC,MAAM,yBAAyB,GAAG,CAAC,aAA2B,EAAiB,EAAE;IACpF,OAAO;QACH,KAAK,EAAE,UAAU;QACjB,aAAa;QACb,QAAQ,EAAE,QAAQ,CAAC,KAAK;QACxB,eAAe,EAAE;YACb,gBAAgB,EAAE;gBACd,GAAG,6BAA6B,EAAE;aACrC;YACD,iBAAiB,EAAE;gBACf,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;oBACjB,sBAAsB,EAAE,qBAAqB;oBAC7C,sCAAsC,EAAE,QAAQ;oBAChD,0BAA0B,EAAE,IAAI;oBAChC,6BAA6B,EAAE,KAAK;oBACpC,uCAAuC,EAAE,IAAI;iBAChD,CAAC;aACL;SACJ;QACD,eAAe,EAAE;YACb,aAAa,EAAE;gBACX,QAAQ,EAAE;oBACN,IAAI;oBACJ,
|
|
1
|
+
{"version":3,"file":"wrapperWs.js","sourceRoot":"","sources":["../../../src/json/client/wrapperWs.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,OAAO,6BAA6B,MAAM,uDAAuD,CAAC;AAClG,uCAAuC;AACvC,OAAO,iDAAiD,CAAC;AACzD,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AACxD,OAAO,EAAE,iCAAiC,EAAsB,MAAM,uBAAuB,CAAC;AAC9F,OAAO,EAAE,6BAA6B,EAAE,MAAM,6CAA6C,CAAC;AAE5F,MAAM,IAAI,GAAG;;;EAGX,CAAC;AAEH,MAAM,CAAC,MAAM,yBAAyB,GAAG,CAAC,aAA2B,EAAiB,EAAE;IACpF,OAAO;QACH,KAAK,EAAE,UAAU;QACjB,aAAa;QACb,QAAQ,EAAE,QAAQ,CAAC,KAAK;QACxB,eAAe,EAAE;YACb,gBAAgB,EAAE;gBACd,GAAG,6BAA6B,EAAE;aACrC;YACD,iBAAiB,EAAE;gBACf,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;oBACjB,sBAAsB,EAAE,qBAAqB;oBAC7C,sCAAsC,EAAE,QAAQ;oBAChD,0BAA0B,EAAE,IAAI;oBAChC,6BAA6B,EAAE,KAAK;oBACpC,uCAAuC,EAAE,IAAI;iBAChD,CAAC;aACL;SACJ;QACD,eAAe,EAAE;YACb,aAAa,EAAE;gBACX,QAAQ,EAAE;oBACN,IAAI;oBACJ,GAAG,EAAE,sBAAsB;iBAC9B;aACJ;YACD,mBAAmB,EAAE,6BAA6B;SACrD;QACD,qBAAqB,EAAE;YACnB,OAAO,EAAE;gBACL,IAAI,EAAE;oBACF,aAAa,EAAE;wBACX,gBAAgB,EAAE,CAAC,MAAM,CAAC;qBAC7B;oBACD,UAAU,EAAE;wBACR,OAAO,EAAE;4BACL,KAAK,EAAE,cAAc;4BACrB,GAAG,EAAE,mCAAmC;4BACxC,YAAY,EAAE;gCACV,MAAM,EAAE,GAAG,EAAE;oCACT,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC;gCACxC,CAAC;gCACD,YAAY,EAAE,IAAI;6BACrB;4BACD,WAAW,EAAE;gCACT,MAAM,EAAE,GAAG,EAAE;oCACT,OAAO,CAAC,GAAG,CAAC,2BAA2B,CAAC,CAAC;gCAC7C,CAAC;gCACD,YAAY,EAAE,IAAI;6BACrB;yBACJ;qBACJ;iBACJ;aACJ;SACJ;KACJ,CAAC;AACN,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,cAAc,GAAG,GAAG,EAAE;IAC/B,MAAM,OAAO,GAAG,IAAI,iCAAiC,EAAE,CAAC;IAExD,IAAI,CAAC;QACD,QAAQ,CAAC,aAAa,CAAC,eAAe,CAAC,EAAE,gBAAgB,CAAC,OAAO,EAAE,KAAK,IAAI,EAAE;YAC1E,MAAM,MAAM,GAAG,yBAAyB,CAAC,QAAQ,CAAC,cAAc,CAAC,oBAAoB,CAAE,CAAC,CAAC;YACzF,MAAM,OAAO,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;QACvC,CAAC,CAAC,CAAC;QACH,QAAQ,CAAC,aAAa,CAAC,iBAAiB,CAAC,EAAE,gBAAgB,CAAC,OAAO,EAAE,KAAK,IAAI,EAAE;YAC5E,MAAM,OAAO,CAAC,OAAO,EAAE,CAAC;QAC5B,CAAC,CAAC,CAAC;IACP,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACT,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACrB,CAAC;AACL,CAAC,CAAC"}
|
|
@@ -1,3 +1,7 @@
|
|
|
1
|
+
import { MessageTransports } from 'vscode-languageclient';
|
|
1
2
|
import type { WrapperConfig } from 'monaco-editor-wrapper';
|
|
2
|
-
export declare const setupLangiumClientClassic: (
|
|
3
|
+
export declare const setupLangiumClientClassic: (params: {
|
|
4
|
+
worker: Worker;
|
|
5
|
+
messageTransports?: MessageTransports;
|
|
6
|
+
}) => Promise<WrapperConfig>;
|
|
3
7
|
//# sourceMappingURL=classicConfig.d.ts.map
|
|
@@ -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":"AAOA,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAG1D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAK3D,eAAO,MAAM,yBAAyB,GAAU,QAAQ;IACpD,MAAM,EAAE,MAAM,CAAA;IACd,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;CACzC,KAAG,OAAO,CAAC,aAAa,CAqDxB,CAAC"}
|
|
@@ -4,11 +4,12 @@
|
|
|
4
4
|
* ------------------------------------------------------------------------------------------ */
|
|
5
5
|
import getKeybindingsServiceOverride from '@codingame/monaco-vscode-keybindings-service-override';
|
|
6
6
|
import { LogLevel } from '@codingame/monaco-vscode-api';
|
|
7
|
+
import { MessageTransports } from 'vscode-languageclient';
|
|
7
8
|
import { useWorkerFactory } from 'monaco-languageclient/workerFactory';
|
|
8
9
|
import { defineDefaultWorkerLoaders } from 'monaco-editor-wrapper/workers/workerLoaders';
|
|
9
10
|
import { LangiumMonarchContent } from './langium.monarch.js';
|
|
10
11
|
import code from '../../../../resources/langium/langium-dsl/example.langium?raw';
|
|
11
|
-
export const setupLangiumClientClassic = async (
|
|
12
|
+
export const setupLangiumClientClassic = async (params) => {
|
|
12
13
|
const workerLoaders = defineDefaultWorkerLoaders();
|
|
13
14
|
workerLoaders.TextMateWorker = undefined;
|
|
14
15
|
return {
|
|
@@ -24,7 +25,7 @@ export const setupLangiumClientClassic = async (langiumWorker) => {
|
|
|
24
25
|
codeResources: {
|
|
25
26
|
modified: {
|
|
26
27
|
text: code,
|
|
27
|
-
|
|
28
|
+
uri: '/workspace/grammar.langium',
|
|
28
29
|
enforceLanguageId: 'langium'
|
|
29
30
|
}
|
|
30
31
|
},
|
|
@@ -35,7 +36,7 @@ export const setupLangiumClientClassic = async (langiumWorker) => {
|
|
|
35
36
|
},
|
|
36
37
|
languageDef: {
|
|
37
38
|
monarchLanguage: LangiumMonarchContent,
|
|
38
|
-
languageExtensionConfig: { id: 'langium' }
|
|
39
|
+
languageExtensionConfig: { id: 'langium' }
|
|
39
40
|
},
|
|
40
41
|
monacoWorkerFactory: (logger) => {
|
|
41
42
|
useWorkerFactory({
|
|
@@ -53,8 +54,9 @@ export const setupLangiumClientClassic = async (langiumWorker) => {
|
|
|
53
54
|
connection: {
|
|
54
55
|
options: {
|
|
55
56
|
$type: 'WorkerDirect',
|
|
56
|
-
worker:
|
|
57
|
-
}
|
|
57
|
+
worker: params.worker
|
|
58
|
+
},
|
|
59
|
+
messageTransports: params.messageTransports
|
|
58
60
|
}
|
|
59
61
|
}
|
|
60
62
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"classicConfig.js","sourceRoot":"","sources":["../../../../src/langium/langium-dsl/config/classicConfig.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,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,6BAA6B,MAAM,uDAAuD,CAAC;AAClG,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AACxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAE1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AAEvE,OAAO,EAAE,0BAA0B,EAAE,MAAM,6CAA6C,CAAC;AACzF,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,IAAI,MAAM,+DAA+D,CAAC;AAEjF,MAAM,CAAC,MAAM,yBAAyB,GAAG,KAAK,EAAE,MAG/C,EAA0B,EAAE;IACzB,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,6BAA6B,EAAE;aACrC;SACJ;QACD,eAAe,EAAE;YACb,aAAa,EAAE;gBACX,QAAQ,EAAE;oBACN,IAAI,EAAE,IAAI;oBACV,GAAG,EAAE,4BAA4B;oBACjC,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,OAAO,EAAE;oBACL,aAAa,EAAE;wBACX,gBAAgB,EAAE,CAAC,SAAS,CAAC;qBAChC;oBACD,UAAU,EAAE;wBACR,OAAO,EAAE;4BACL,KAAK,EAAE,cAAc;4BACrB,MAAM,EAAE,MAAM,CAAC,MAAM;yBACxB;wBACD,iBAAiB,EAAE,MAAM,CAAC,iBAAiB;qBAC9C;iBACJ;aACJ;SACJ;KACJ,CAAC;AACN,CAAC,CAAC"}
|
|
@@ -1,4 +1,8 @@
|
|
|
1
1
|
import '../../../../resources/vsix/github-vscode-theme.vsix';
|
|
2
|
+
import { MessageTransports } from 'vscode-languageclient';
|
|
2
3
|
import type { WrapperConfig } from 'monaco-editor-wrapper';
|
|
3
|
-
export declare const setupLangiumClientExtended: (
|
|
4
|
+
export declare const setupLangiumClientExtended: (params: {
|
|
5
|
+
worker: Worker;
|
|
6
|
+
messageTransports?: MessageTransports;
|
|
7
|
+
}) => Promise<WrapperConfig>;
|
|
4
8
|
//# sourceMappingURL=extendedConfig.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extendedConfig.d.ts","sourceRoot":"","sources":["../../../../src/langium/langium-dsl/config/extendedConfig.ts"],"names":[],"mappings":"AAOA,OAAO,qDAAqD,CAAC;
|
|
1
|
+
{"version":3,"file":"extendedConfig.d.ts","sourceRoot":"","sources":["../../../../src/langium/langium-dsl/config/extendedConfig.ts"],"names":[],"mappings":"AAOA,OAAO,qDAAqD,CAAC;AAC7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAM3D,eAAO,MAAM,0BAA0B,GAAU,QAAQ;IACrD,MAAM,EAAE,MAAM,CAAA;IACd,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;CACzC,KAAG,OAAO,CAAC,aAAa,CAyExB,CAAC"}
|
|
@@ -5,18 +5,16 @@
|
|
|
5
5
|
import getKeybindingsServiceOverride from '@codingame/monaco-vscode-keybindings-service-override';
|
|
6
6
|
import { LogLevel } from '@codingame/monaco-vscode-api';
|
|
7
7
|
import '../../../../resources/vsix/github-vscode-theme.vsix';
|
|
8
|
-
import {
|
|
8
|
+
import { MessageTransports } from 'vscode-languageclient';
|
|
9
9
|
import { configureDefaultWorkerFactory } from 'monaco-editor-wrapper/workers/workerLoaders';
|
|
10
10
|
import langiumLanguageConfig from './langium.configuration.json?raw';
|
|
11
11
|
import langiumTextmateGrammar from './langium.tmLanguage.json?raw';
|
|
12
12
|
import text from '../../../../resources/langium/langium-dsl//example.langium?raw';
|
|
13
|
-
export const setupLangiumClientExtended = async (
|
|
13
|
+
export const setupLangiumClientExtended = async (params) => {
|
|
14
14
|
const extensionFilesOrContents = new Map();
|
|
15
15
|
// vite build is easier with string content
|
|
16
16
|
extensionFilesOrContents.set('/langium-configuration.json', langiumLanguageConfig);
|
|
17
17
|
extensionFilesOrContents.set('/langium-grammar.json', langiumTextmateGrammar);
|
|
18
|
-
const reader = new BrowserMessageReader(langiumWorker);
|
|
19
|
-
const writer = new BrowserMessageWriter(langiumWorker);
|
|
20
18
|
return {
|
|
21
19
|
$type: 'extended',
|
|
22
20
|
htmlContainer: document.getElementById('monaco-editor-root'),
|
|
@@ -62,7 +60,7 @@ export const setupLangiumClientExtended = async (langiumWorker) => {
|
|
|
62
60
|
codeResources: {
|
|
63
61
|
modified: {
|
|
64
62
|
text,
|
|
65
|
-
|
|
63
|
+
uri: '/workspace/grammar.langium'
|
|
66
64
|
}
|
|
67
65
|
},
|
|
68
66
|
monacoWorkerFactory: configureDefaultWorkerFactory
|
|
@@ -76,9 +74,9 @@ export const setupLangiumClientExtended = async (langiumWorker) => {
|
|
|
76
74
|
connection: {
|
|
77
75
|
options: {
|
|
78
76
|
$type: 'WorkerDirect',
|
|
79
|
-
worker:
|
|
77
|
+
worker: params.worker
|
|
80
78
|
},
|
|
81
|
-
messageTransports:
|
|
79
|
+
messageTransports: params.messageTransports
|
|
82
80
|
}
|
|
83
81
|
}
|
|
84
82
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extendedConfig.js","sourceRoot":"","sources":["../../../../src/langium/langium-dsl/config/extendedConfig.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,OAAO,6BAA6B,MAAM,uDAAuD,CAAC;AAClG,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AACxD,OAAO,qDAAqD,CAAC;AAC7D,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"extendedConfig.js","sourceRoot":"","sources":["../../../../src/langium/langium-dsl/config/extendedConfig.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,OAAO,6BAA6B,MAAM,uDAAuD,CAAC;AAClG,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AACxD,OAAO,qDAAqD,CAAC;AAC7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAE1D,OAAO,EAAE,6BAA6B,EAAE,MAAM,6CAA6C,CAAC;AAC5F,OAAO,qBAAqB,MAAM,kCAAkC,CAAC;AACrE,OAAO,sBAAsB,MAAM,+BAA+B,CAAC;AACnE,OAAO,IAAI,MAAM,gEAAgE,CAAC;AAElF,MAAM,CAAC,MAAM,0BAA0B,GAAG,KAAK,EAAE,MAGhD,EAA0B,EAAE;IAEzB,MAAM,wBAAwB,GAAG,IAAI,GAAG,EAAwB,CAAC;IACjE,2CAA2C;IAC3C,wBAAwB,CAAC,GAAG,CAAC,6BAA6B,EAAE,qBAAqB,CAAC,CAAC;IACnF,wBAAwB,CAAC,GAAG,CAAC,uBAAuB,EAAE,sBAAsB,CAAC,CAAC;IAC9E,OAAO;QACH,KAAK,EAAE,UAAU;QACjB,aAAa,EAAE,QAAQ,CAAC,cAAc,CAAC,oBAAoB,CAAE;QAC7D,QAAQ,EAAE,QAAQ,CAAC,KAAK;QACxB,eAAe,EAAE;YACb,gBAAgB,EAAE;gBACd,GAAG,6BAA6B,EAAE;aACrC;YACD,iBAAiB,EAAE;gBACf,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;oBACjB,sBAAsB,EAAE,2BAA2B;oBACnD,sCAAsC,EAAE,QAAQ;oBAChD,6BAA6B,EAAE,KAAK;oBACpC,uCAAuC,EAAE,IAAI;iBAChD,CAAC;aACL;SACJ;QACD,UAAU,EAAE,CAAC;gBACT,MAAM,EAAE;oBACJ,IAAI,EAAE,iBAAiB;oBACvB,SAAS,EAAE,SAAS;oBACpB,OAAO,EAAE,OAAO;oBAChB,OAAO,EAAE;wBACL,MAAM,EAAE,GAAG;qBACd;oBACD,WAAW,EAAE;wBACT,SAAS,EAAE,CAAC;gCACR,EAAE,EAAE,SAAS;gCACb,UAAU,EAAE,CAAC,UAAU,CAAC;gCACxB,OAAO,EAAE,CAAC,SAAS,EAAE,SAAS,CAAC;gCAC/B,aAAa,EAAE,8BAA8B;6BAChD,CAAC;wBACF,QAAQ,EAAE,CAAC;gCACP,QAAQ,EAAE,SAAS;gCACnB,SAAS,EAAE,gBAAgB;gCAC3B,IAAI,EAAE,wBAAwB;6BACjC,CAAC;qBACL;iBACJ;gBACD,eAAe,EAAE,wBAAwB;aAC5C,CAAC;QACF,eAAe,EAAE;YACb,aAAa,EAAE;gBACX,QAAQ,EAAE;oBACN,IAAI;oBACJ,GAAG,EAAE,4BAA4B;iBACpC;aACJ;YACD,mBAAmB,EAAE,6BAA6B;SACrD;QACD,qBAAqB,EAAE;YACnB,OAAO,EAAE;gBACL,OAAO,EAAE;oBACL,aAAa,EAAE;wBACX,gBAAgB,EAAE,CAAC,SAAS,CAAC;qBAChC;oBACD,UAAU,EAAE;wBACR,OAAO,EAAE;4BACL,KAAK,EAAE,cAAc;4BACrB,MAAM,EAAE,MAAM,CAAC,MAAM;yBACxB;wBACD,iBAAiB,EAAE,MAAM,CAAC,iBAAiB;qBAC9C;iBACJ;aACJ;SACJ;KACJ,CAAC;AACN,CAAC,CAAC"}
|
|
@@ -10,6 +10,9 @@ import { BrowserMessageReader, BrowserMessageWriter, createConnection } from 'vs
|
|
|
10
10
|
/* browser specific setup code */
|
|
11
11
|
const messageReader = new BrowserMessageReader(self);
|
|
12
12
|
const messageWriter = new BrowserMessageWriter(self);
|
|
13
|
+
messageReader.listen((message) => {
|
|
14
|
+
console.log('Received message from main thread:', message);
|
|
15
|
+
});
|
|
13
16
|
// Inject the shared services and language-specific services
|
|
14
17
|
const context = {
|
|
15
18
|
connection: createConnection(messageReader, messageWriter),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"langium-server.js","sourceRoot":"","sources":["../../../../src/langium/langium-dsl/worker/langium-server.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAChG,iCAAiC;AAEjC,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAC1C,OAAO,EAAmC,mBAAmB,EAAE,MAAM,aAAa,CAAC;AACnF,OAAO,EAAE,4BAA4B,EAAE,MAAM,iBAAiB,CAAC;AAC/D,OAAO,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AAEhH,iCAAiC;AACjC,MAAM,aAAa,GAAG,IAAI,oBAAoB,CAAC,IAAkC,CAAC,CAAC;AACnF,MAAM,aAAa,GAAG,IAAI,oBAAoB,CAAC,IAAkC,CAAC,CAAC;AAEnF,4DAA4D;AAC5D,MAAM,OAAO,GAAG;IACZ,UAAU,EAAE,gBAAgB,CAAC,aAAa,EAAE,aAAa,CAAC;IAC1D,GAAG,eAAe;CACoB,CAAC;AAC3C,MAAM,EAAE,MAAM,EAAE,GAAG,4BAA4B,CAAC,OAAO,CAAC,CAAC;AAEzD,qDAAqD;AACrD,mBAAmB,CAAC,MAAM,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"langium-server.js","sourceRoot":"","sources":["../../../../src/langium/langium-dsl/worker/langium-server.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAChG,iCAAiC;AAEjC,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAC1C,OAAO,EAAmC,mBAAmB,EAAE,MAAM,aAAa,CAAC;AACnF,OAAO,EAAE,4BAA4B,EAAE,MAAM,iBAAiB,CAAC;AAC/D,OAAO,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AAEhH,iCAAiC;AACjC,MAAM,aAAa,GAAG,IAAI,oBAAoB,CAAC,IAAkC,CAAC,CAAC;AACnF,MAAM,aAAa,GAAG,IAAI,oBAAoB,CAAC,IAAkC,CAAC,CAAC;AAEnF,aAAa,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE;IAC7B,OAAO,CAAC,GAAG,CAAC,oCAAoC,EAAE,OAAO,CAAC,CAAC;AAC/D,CAAC,CAAC,CAAC;AAEH,4DAA4D;AAC5D,MAAM,OAAO,GAAG;IACZ,UAAU,EAAE,gBAAgB,CAAC,aAAa,EAAE,aAAa,CAAC;IAC1D,GAAG,eAAe;CACoB,CAAC;AAC3C,MAAM,EAAE,MAAM,EAAE,GAAG,4BAA4B,CAAC,OAAO,CAAC,CAAC;AAEzD,qDAAqD;AACrD,mBAAmB,CAAC,MAAM,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wrapperLangium.d.ts","sourceRoot":"","sources":["../../../src/langium/langium-dsl/wrapperLangium.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"wrapperLangium.d.ts","sourceRoot":"","sources":["../../../src/langium/langium-dsl/wrapperLangium.ts"],"names":[],"mappings":"AAaA,eAAO,MAAM,oBAAoB,GAAU,cAAc,OAAO,kBAsE/D,CAAC"}
|
|
@@ -2,10 +2,12 @@
|
|
|
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 { BrowserMessageReader, BrowserMessageWriter } from 'vscode-languageclient/browser.js';
|
|
5
6
|
import { MonacoEditorLanguageClientWrapper } from 'monaco-editor-wrapper';
|
|
6
7
|
import { setupLangiumClientExtended } from './config/extendedConfig.js';
|
|
7
8
|
import { setupLangiumClientClassic } from './config/classicConfig.js';
|
|
8
|
-
import { disableElement } from '../../common/client/utils.js';
|
|
9
|
+
import { delayExecution, disableElement } from '../../common/client/utils.js';
|
|
10
|
+
import text from '../../../resources/langium/langium-dsl/example.langium?raw';
|
|
9
11
|
import workerUrl from './worker/langium-server?worker&url';
|
|
10
12
|
export const runLangiumDslWrapper = async (extendedMode) => {
|
|
11
13
|
try {
|
|
@@ -28,17 +30,36 @@ export const runLangiumDslWrapper = async (extendedMode) => {
|
|
|
28
30
|
if (checkStarted())
|
|
29
31
|
return;
|
|
30
32
|
disableElement('button-start', true);
|
|
31
|
-
const
|
|
33
|
+
const worker = loadLangiumWorker();
|
|
34
|
+
const reader = new BrowserMessageReader(worker);
|
|
35
|
+
const writer = new BrowserMessageWriter(worker);
|
|
36
|
+
reader.listen((message) => {
|
|
37
|
+
console.log('Received message from worker:', message);
|
|
38
|
+
});
|
|
32
39
|
if (extendedMode) {
|
|
33
|
-
const config = await setupLangiumClientExtended(
|
|
40
|
+
const config = await setupLangiumClientExtended({
|
|
41
|
+
worker,
|
|
42
|
+
messageTransports: { reader, writer }
|
|
43
|
+
});
|
|
34
44
|
wrapper = new MonacoEditorLanguageClientWrapper();
|
|
35
|
-
wrapper.initAndStart(config);
|
|
45
|
+
await wrapper.initAndStart(config);
|
|
36
46
|
}
|
|
37
47
|
else {
|
|
38
|
-
const config = await setupLangiumClientClassic(
|
|
48
|
+
const config = await setupLangiumClientClassic({
|
|
49
|
+
worker,
|
|
50
|
+
messageTransports: { reader, writer }
|
|
51
|
+
});
|
|
39
52
|
wrapper = new MonacoEditorLanguageClientWrapper();
|
|
40
53
|
await wrapper.initAndStart(config);
|
|
41
54
|
}
|
|
55
|
+
await delayExecution(1000);
|
|
56
|
+
await wrapper.updateCodeResources({
|
|
57
|
+
modified: {
|
|
58
|
+
text: `// modified file\n\n${text}`,
|
|
59
|
+
uri: '/workspace/mod.langium',
|
|
60
|
+
enforceLanguageId: 'langium'
|
|
61
|
+
}
|
|
62
|
+
});
|
|
42
63
|
};
|
|
43
64
|
const disposeEditor = async () => {
|
|
44
65
|
if (!wrapper)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wrapperLangium.js","sourceRoot":"","sources":["../../../src/langium/langium-dsl/wrapperLangium.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,OAAO,EAAE,iCAAiC,EAAE,MAAM,uBAAuB,CAAC;AAC1E,OAAO,EAAE,0BAA0B,EAAE,MAAM,4BAA4B,CAAC;AACxE,OAAO,EAAE,yBAAyB,EAAE,MAAM,2BAA2B,CAAC;AACtE,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"wrapperLangium.js","sourceRoot":"","sources":["../../../src/langium/langium-dsl/wrapperLangium.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { MessageTransports } from 'vscode-languageclient';
|
|
2
|
-
import type { WrapperConfig } from 'monaco-editor-wrapper';
|
|
2
|
+
import type { CodeContent, WrapperConfig } from 'monaco-editor-wrapper';
|
|
3
3
|
export declare const createLangiumGlobalConfig: (params: {
|
|
4
4
|
languageServerId: string;
|
|
5
5
|
useLanguageClient: boolean;
|
|
6
|
-
|
|
6
|
+
codeContent: CodeContent;
|
|
7
7
|
worker?: Worker;
|
|
8
8
|
messagePort?: MessagePort;
|
|
9
9
|
messageTransports?: MessageTransports;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wrapperStatemachineConfig.d.ts","sourceRoot":"","sources":["../../../../src/langium/statemachine/config/wrapperStatemachineConfig.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,KAAK,EAAyB,aAAa,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"wrapperStatemachineConfig.d.ts","sourceRoot":"","sources":["../../../../src/langium/statemachine/config/wrapperStatemachineConfig.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,KAAK,EAAE,WAAW,EAAyB,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAO/F,eAAO,MAAM,yBAAyB,GAAI,QAAQ;IAC9C,gBAAgB,EAAE,MAAM,CAAC;IACzB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,WAAW,EAAE,WAAW,CAAC;IACzB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;IACtC,aAAa,EAAE,WAAW,CAAA;CAC7B,KAAG,aA0EH,CAAC"}
|
|
@@ -16,13 +16,6 @@ export const createLangiumGlobalConfig = (params) => {
|
|
|
16
16
|
const extensionFilesOrContents = new Map();
|
|
17
17
|
extensionFilesOrContents.set(`/${params.languageServerId}-statemachine-configuration.json`, statemachineLanguageConfig);
|
|
18
18
|
extensionFilesOrContents.set(`/${params.languageServerId}-statemachine-grammar.json`, responseStatemachineTm);
|
|
19
|
-
let modified;
|
|
20
|
-
if (params.text !== undefined) {
|
|
21
|
-
modified = {
|
|
22
|
-
text: params.text,
|
|
23
|
-
fileExt: 'statemachine'
|
|
24
|
-
};
|
|
25
|
-
}
|
|
26
19
|
const languageClientConfigs = params.useLanguageClient && params.worker ? {
|
|
27
20
|
configs: {
|
|
28
21
|
statemachine: {
|
|
@@ -85,7 +78,7 @@ export const createLangiumGlobalConfig = (params) => {
|
|
|
85
78
|
}],
|
|
86
79
|
editorAppConfig: {
|
|
87
80
|
codeResources: {
|
|
88
|
-
modified
|
|
81
|
+
modified: params.codeContent
|
|
89
82
|
},
|
|
90
83
|
monacoWorkerFactory: configureDefaultWorkerFactory
|
|
91
84
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wrapperStatemachineConfig.js","sourceRoot":"","sources":["../../../../src/langium/statemachine/config/wrapperStatemachineConfig.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,OAAO,6BAA6B,MAAM,uDAAuD,CAAC;AAClG,OAAO,2BAA2B,MAAM,qDAAqD,CAAC;AAC9F,OAAO,8BAA8B,MAAM,wDAAwD,CAAC;AACpG,OAAO,EAAE,gCAAgC,EAAE,MAAM,uCAAuC,CAAC;AACzF,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AACxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAE1D,OAAO,EAAE,6BAA6B,EAAE,MAAM,6CAA6C,CAAC;AAE5F,2DAA2D;AAC3D,OAAO,0BAA0B,MAAM,mCAAmC,CAAC;AAC3E,OAAO,sBAAsB,MAAM,8CAA8C,CAAC;AAElF,MAAM,CAAC,MAAM,yBAAyB,GAAG,CAAC,MAQzC,EAAiB,EAAE;IAChB,MAAM,wBAAwB,GAAG,IAAI,GAAG,EAAwB,CAAC;IACjE,wBAAwB,CAAC,GAAG,CAAC,IAAI,MAAM,CAAC,gBAAgB,kCAAkC,EAAE,0BAA0B,CAAC,CAAC;IACxH,wBAAwB,CAAC,GAAG,CAAC,IAAI,MAAM,CAAC,gBAAgB,4BAA4B,EAAE,sBAAsB,CAAC,CAAC;IAE9G,
|
|
1
|
+
{"version":3,"file":"wrapperStatemachineConfig.js","sourceRoot":"","sources":["../../../../src/langium/statemachine/config/wrapperStatemachineConfig.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main-react.d.ts","sourceRoot":"","sources":["../../../src/langium/statemachine/main-react.tsx"],"names":[],"mappings":"AAeA,eAAO,MAAM,oBAAoB,
|
|
1
|
+
{"version":3,"file":"main-react.d.ts","sourceRoot":"","sources":["../../../src/langium/statemachine/main-react.tsx"],"names":[],"mappings":"AAeA,eAAO,MAAM,oBAAoB,qBAmEhC,CAAC"}
|
|
@@ -20,7 +20,10 @@ export const runStatemachineReact = async () => {
|
|
|
20
20
|
const wrapperConfig = createLangiumGlobalConfig({
|
|
21
21
|
languageServerId: 'react',
|
|
22
22
|
useLanguageClient: true,
|
|
23
|
-
|
|
23
|
+
codeContent: {
|
|
24
|
+
text,
|
|
25
|
+
uri: '/workspace/example.statemachine'
|
|
26
|
+
},
|
|
24
27
|
worker,
|
|
25
28
|
messageTransports: { reader, writer },
|
|
26
29
|
htmlContainer: document.getElementById('monaco-editor-root')
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main-react.js","sourceRoot":"","sources":["../../../src/langium/statemachine/main-react.tsx"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,OAAO,KAAK,EAAE,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAC/D,OAAO,QAAQ,MAAM,kBAAkB,CAAC;AACxC,OAAO,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AAE9F,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AACrE,OAAO,EAAE,yBAAyB,EAAE,MAAM,uCAAuC,CAAC;AAClF,OAAO,EAAE,6BAA6B,EAAE,MAAM,WAAW,CAAC;AAC1D,OAAO,IAAI,MAAM,kEAAkE,CAAC;AACpF,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAE9D,MAAM,CAAC,MAAM,oBAAoB,GAAG,KAAK,IAAI,EAAE;IAC3C,MAAM,MAAM,GAAG,6BAA6B,EAAE,CAAC;IAC/C,MAAM,MAAM,GAAG,IAAI,oBAAoB,CAAC,MAAM,CAAC,CAAC;IAChD,MAAM,MAAM,GAAG,IAAI,oBAAoB,CAAC,MAAM,CAAC,CAAC;IAChD,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE;QACtB,OAAO,CAAC,GAAG,CAAC,+BAA+B,EAAE,OAAO,CAAC,CAAC;IAC1D,CAAC,CAAC,CAAC;IACH,MAAM,aAAa,GAAG,yBAAyB,CAAC;QAC5C,gBAAgB,EAAE,OAAO;QACzB,iBAAiB,EAAE,IAAI;QACvB,IAAI;
|
|
1
|
+
{"version":3,"file":"main-react.js","sourceRoot":"","sources":["../../../src/langium/statemachine/main-react.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../../src/langium/statemachine/main.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../../src/langium/statemachine/main.ts"],"names":[],"mappings":"AA2GA,eAAO,MAAM,sBAAsB,qBAOlC,CAAC;AAEF,eAAO,MAAM,6BAA6B,cAOzC,CAAC;AAEF,eAAO,MAAM,yBAAyB,cAOrC,CAAC"}
|
|
@@ -3,15 +3,14 @@
|
|
|
3
3
|
* Licensed under the MIT License. See LICENSE in the package root for license information.
|
|
4
4
|
* ------------------------------------------------------------------------------------------ */
|
|
5
5
|
import * as vscode from 'vscode';
|
|
6
|
-
import { createModelReference } from '@codingame/monaco-vscode-api/monaco';
|
|
7
6
|
import { BrowserMessageReader, BrowserMessageWriter } from 'vscode-languageclient/browser.js';
|
|
8
|
-
import { MonacoEditorLanguageClientWrapper } from 'monaco-editor-wrapper';
|
|
7
|
+
import { buildModelReference, MonacoEditorLanguageClientWrapper } from 'monaco-editor-wrapper';
|
|
9
8
|
import { createLangiumGlobalConfig } from './config/wrapperStatemachineConfig.js';
|
|
10
9
|
import workerUrl from './worker/statemachine-server?worker&url';
|
|
11
10
|
import workerPortUrl from './worker/statemachine-server-port?worker&url';
|
|
12
11
|
import text from '../../../resources/langium/statemachine/example.statemachine?raw';
|
|
13
12
|
import textMod from '../../../resources/langium/statemachine/example-mod.statemachine?raw';
|
|
14
|
-
import { disableElement } from '../../common/client/utils.js';
|
|
13
|
+
import { delayExecution, disableElement } from '../../common/client/utils.js';
|
|
15
14
|
const wrapper = new MonacoEditorLanguageClientWrapper();
|
|
16
15
|
const wrapper2 = new MonacoEditorLanguageClientWrapper();
|
|
17
16
|
const startEditor = async () => {
|
|
@@ -39,6 +38,10 @@ const startEditor = async () => {
|
|
|
39
38
|
// the configuration does not contain any text content
|
|
40
39
|
const langiumGlobalConfig = createLangiumGlobalConfig({
|
|
41
40
|
languageServerId: 'first',
|
|
41
|
+
codeContent: {
|
|
42
|
+
text,
|
|
43
|
+
uri: '/workspace/example.statemachine'
|
|
44
|
+
},
|
|
42
45
|
useLanguageClient: true,
|
|
43
46
|
worker: stateMachineWorkerPort,
|
|
44
47
|
messagePort: channel.port1,
|
|
@@ -47,23 +50,34 @@ const startEditor = async () => {
|
|
|
47
50
|
});
|
|
48
51
|
await wrapper.initAndStart(langiumGlobalConfig);
|
|
49
52
|
// here the modelReference is created manually and given to the updateEditorModels of the wrapper
|
|
50
|
-
const uri = vscode.Uri.parse('/workspace/statemachine-mod.statemachine');
|
|
51
|
-
const modelRefModified = await createModelReference(uri, text);
|
|
52
53
|
wrapper.updateEditorModels({
|
|
53
|
-
modelRefModified
|
|
54
|
+
modelRefModified: await buildModelReference({
|
|
55
|
+
text,
|
|
56
|
+
uri: '/workspace/statemachine-mod.statemachine'
|
|
57
|
+
})
|
|
54
58
|
});
|
|
55
59
|
// start the second wrapper without any languageclient config
|
|
56
60
|
// => they share the language server and both text contents have different uris
|
|
57
61
|
const langiumGlobalConfig2 = createLangiumGlobalConfig({
|
|
58
62
|
languageServerId: 'second',
|
|
59
63
|
useLanguageClient: false,
|
|
60
|
-
|
|
64
|
+
codeContent: {
|
|
65
|
+
text: textMod,
|
|
66
|
+
uri: '/workspace/example-mod.statemachine'
|
|
67
|
+
},
|
|
61
68
|
htmlContainer: document.getElementById('monaco-editor-root2')
|
|
62
69
|
});
|
|
63
70
|
await wrapper2.initAndStart(langiumGlobalConfig2);
|
|
64
71
|
vscode.commands.getCommands().then((x) => {
|
|
65
72
|
console.log('Currently registered # of vscode commands: ' + x.length);
|
|
66
73
|
});
|
|
74
|
+
await delayExecution(1000);
|
|
75
|
+
wrapper.updateEditorModels({
|
|
76
|
+
modelRefModified: await buildModelReference({
|
|
77
|
+
text: `// modified file\n\n${text}`,
|
|
78
|
+
uri: '/workspace/statemachine-mod2.statemachine'
|
|
79
|
+
})
|
|
80
|
+
});
|
|
67
81
|
};
|
|
68
82
|
const disposeEditor = async () => {
|
|
69
83
|
disableElement('button-start', false);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main.js","sourceRoot":"","sources":["../../../src/langium/statemachine/main.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AACjC,OAAO,EAAE,oBAAoB,EAAE,
|
|
1
|
+
{"version":3,"file":"main.js","sourceRoot":"","sources":["../../../src/langium/statemachine/main.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AACjC,OAAO,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AAC9F,OAAO,EAAE,mBAAmB,EAAE,iCAAiC,EAAE,MAAM,uBAAuB,CAAC;AAC/F,OAAO,EAAE,yBAAyB,EAAE,MAAM,uCAAuC,CAAC;AAClF,OAAO,SAAS,MAAM,yCAAyC,CAAC;AAChE,OAAO,aAAa,MAAM,8CAA8C,CAAC;AACzE,OAAO,IAAI,MAAM,kEAAkE,CAAC;AACpF,OAAO,OAAO,MAAM,sEAAsE,CAAC;AAC3F,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAE9E,MAAM,OAAO,GAAG,IAAI,iCAAiC,EAAE,CAAC;AACxD,MAAM,QAAQ,GAAG,IAAI,iCAAiC,EAAE,CAAC;AAEzD,MAAM,WAAW,GAAG,KAAK,IAAI,EAAE;IAC3B,cAAc,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC;IACrC,cAAc,CAAC,gBAAgB,EAAE,KAAK,CAAC,CAAC;IAExC,IAAI,OAAO,CAAC,SAAS,EAAE,IAAI,QAAQ,CAAC,SAAS,EAAE,EAAE,CAAC;QAC9C,KAAK,CAAC,6BAA6B,CAAC,CAAC;QACrC,OAAO;IACX,CAAC;IAED,8CAA8C;IAC9C,MAAM,sBAAsB,GAAG,yBAAyB,EAAE,CAAC;IAC3D,uGAAuG;IACvG,sBAAsB,CAAC,SAAS,GAAG,CAAC,KAAK,EAAE,EAAE;QACzC,OAAO,CAAC,GAAG,CAAC,gCAAgC,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC;IAC/D,CAAC,CAAC;IACF,MAAM,OAAO,GAAG,IAAI,cAAc,EAAE,CAAC;IACrC,sBAAsB,CAAC,WAAW,CAAC;QAC/B,IAAI,EAAE,OAAO,CAAC,KAAK;KACtB,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;IAEpB,MAAM,MAAM,GAAG,IAAI,oBAAoB,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IACvD,MAAM,MAAM,GAAG,IAAI,oBAAoB,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IACvD,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE;QACtB,OAAO,CAAC,GAAG,CAAC,+BAA+B,EAAE,OAAO,CAAC,CAAC;IAC1D,CAAC,CAAC,CAAC;IAEH,sDAAsD;IACtD,MAAM,mBAAmB,GAAG,yBAAyB,CAAC;QAClD,gBAAgB,EAAE,OAAO;QACzB,WAAW,EAAE;YACT,IAAI;YACJ,GAAG,EAAE,iCAAiC;SACzC;QACD,iBAAiB,EAAE,IAAI;QACvB,MAAM,EAAE,sBAAsB;QAC9B,WAAW,EAAE,OAAO,CAAC,KAAK;QAC1B,iBAAiB,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE;QACrC,aAAa,EAAE,QAAQ,CAAC,cAAc,CAAC,oBAAoB,CAAE;KAChE,CAAC,CAAC;IACH,MAAM,OAAO,CAAC,YAAY,CAAC,mBAAmB,CAAC,CAAC;IAEhD,iGAAiG;IACjG,OAAO,CAAC,kBAAkB,CAAC;QACvB,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;YACxC,IAAI;YACJ,GAAG,EAAE,0CAA0C;SAClD,CAAC;KACL,CAAC,CAAC;IAEH,6DAA6D;IAC7D,+EAA+E;IAC/E,MAAM,oBAAoB,GAAG,yBAAyB,CAAC;QACnD,gBAAgB,EAAE,QAAQ;QAC1B,iBAAiB,EAAE,KAAK;QACxB,WAAW,EAAE;YACT,IAAI,EAAE,OAAO;YACb,GAAG,EAAE,qCAAqC;SAC7C;QACD,aAAa,EAAE,QAAQ,CAAC,cAAc,CAAC,qBAAqB,CAAE;KACjE,CAAC,CAAC;IACH,MAAM,QAAQ,CAAC,YAAY,CAAC,oBAAoB,CAAC,CAAC;IAElD,MAAM,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE;QACrC,OAAO,CAAC,GAAG,CAAC,6CAA6C,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC;IAC1E,CAAC,CAAC,CAAC;IAEH,MAAM,cAAc,CAAC,IAAI,CAAC,CAAC;IAE3B,OAAO,CAAC,kBAAkB,CAAC;QACvB,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;YACxC,IAAI,EAAE,uBAAuB,IAAI,EAAE;YACnC,GAAG,EAAE,2CAA2C;SACnD,CAAC;KACL,CAAC,CAAC;AACP,CAAC,CAAC;AAEF,MAAM,aAAa,GAAG,KAAK,IAAI,EAAE;IAC7B,cAAc,CAAC,cAAc,EAAE,KAAK,CAAC,CAAC;IACtC,cAAc,CAAC,gBAAgB,EAAE,IAAI,CAAC,CAAC;IAEvC,OAAO,CAAC,YAAY,EAAE,CAAC;IACvB,MAAM,OAAO,CAAC,OAAO,EAAE,CAAC;IACxB,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IAE/C,QAAQ,CAAC,YAAY,EAAE,CAAC;IACxB,MAAM,QAAQ,CAAC,OAAO,EAAE,CAAC;IACzB,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,YAAY,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;AACpD,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,sBAAsB,GAAG,KAAK,IAAI,EAAE;IAC7C,IAAI,CAAC;QACD,QAAQ,CAAC,aAAa,CAAC,eAAe,CAAC,EAAE,gBAAgB,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;QAChF,QAAQ,CAAC,aAAa,CAAC,iBAAiB,CAAC,EAAE,gBAAgB,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;IACxF,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACT,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACrB,CAAC;AACL,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,6BAA6B,GAAG,GAAG,EAAE;IAC9C,8BAA8B;IAC9B,OAAO,CAAC,GAAG,CAAC,uBAAuB,SAAS,EAAE,CAAC,CAAC;IAChD,OAAO,IAAI,MAAM,CAAC,SAAS,EAAE;QACzB,IAAI,EAAE,QAAQ;QACd,IAAI,EAAE,6BAA6B;KACtC,CAAC,CAAC;AACP,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,yBAAyB,GAAG,GAAG,EAAE;IAC1C,8BAA8B;IAC9B,OAAO,CAAC,GAAG,CAAC,uBAAuB,aAAa,EAAE,CAAC,CAAC;IACpD,OAAO,IAAI,MAAM,CAAC,aAAa,EAAE;QAC7B,IAAI,EAAE,QAAQ;QACd,IAAI,EAAE,0BAA0B;KACnC,CAAC,CAAC;AACP,CAAC,CAAC"}
|
|
@@ -46,7 +46,7 @@ print("Hello Moon!")
|
|
|
46
46
|
codeResources: {
|
|
47
47
|
modified: {
|
|
48
48
|
text: currentText,
|
|
49
|
-
|
|
49
|
+
uri: `/workspace/example.${currenFileExt}`
|
|
50
50
|
}
|
|
51
51
|
},
|
|
52
52
|
monacoWorkerFactory: configureDefaultWorkerFactory
|
|
@@ -71,7 +71,7 @@ print("Hello Moon!")
|
|
|
71
71
|
await wrapper.initAndStart(wrapperConfig);
|
|
72
72
|
if (wrapperConfig.editorAppConfig?.codeResources?.modified !== undefined) {
|
|
73
73
|
wrapperConfig.editorAppConfig.codeResources.modified.text = currentText;
|
|
74
|
-
wrapperConfig.editorAppConfig.codeResources.modified.
|
|
74
|
+
wrapperConfig.editorAppConfig.codeResources.modified.uri = `/workspace/example.${currenFileExt}`;
|
|
75
75
|
}
|
|
76
76
|
// init language clients after start
|
|
77
77
|
if (externalLc) {
|
|
@@ -99,7 +99,7 @@ print("Hello Moon!")
|
|
|
99
99
|
wrapper.updateCodeResources({
|
|
100
100
|
modified: {
|
|
101
101
|
text: currentText,
|
|
102
|
-
|
|
102
|
+
uri: `/workspace/example.${currenFileExt}`
|
|
103
103
|
}
|
|
104
104
|
});
|
|
105
105
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"twoLanguageClients.js","sourceRoot":"","sources":["../../src/multi/twoLanguageClients.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,OAAO,2BAA2B,CAAC;AACnC,OAAO,6BAA6B,MAAM,uDAAuD,CAAC;AAClG,uCAAuC;AACvC,OAAO,iDAAiD,CAAC;AACzD,OAAO,mDAAmD,CAAC;AAC3D,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AACxD,OAAO,
|
|
1
|
+
{"version":3,"file":"twoLanguageClients.js","sourceRoot":"","sources":["../../src/multi/twoLanguageClients.ts"],"names":[],"mappings":"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"}
|
package/dist/ts/wrapperTs.js
CHANGED
|
@@ -68,7 +68,7 @@ export const runTsWrapper = async () => {
|
|
|
68
68
|
});
|
|
69
69
|
document.querySelector('#button-swap-code')?.addEventListener('click', () => {
|
|
70
70
|
const codeResources = wrapper.getMonacoEditorApp()?.getConfig().codeResources;
|
|
71
|
-
if (
|
|
71
|
+
if (codeResources?.modified?.uri === codeUri) {
|
|
72
72
|
wrapper.updateCodeResources({
|
|
73
73
|
modified: {
|
|
74
74
|
text: codeOriginal,
|
package/dist/ts/wrapperTs.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wrapperTs.js","sourceRoot":"","sources":["../../src/ts/wrapperTs.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AACjC,OAAO,6BAA6B,MAAM,uDAAuD,CAAC;AAClG,OAAO,8DAA8D,CAAC;AACtE,OAAO,yEAAyE,CAAC;AACjF,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AACxD,OAAO,
|
|
1
|
+
{"version":3,"file":"wrapperTs.js","sourceRoot":"","sources":["../../src/ts/wrapperTs.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "monaco-languageclient-examples",
|
|
3
|
-
"version": "2025.3.
|
|
3
|
+
"version": "2025.3.4",
|
|
4
4
|
"description": "Monaco Language client examples",
|
|
5
5
|
"author": {
|
|
6
6
|
"name": "TypeFox GmbH",
|
|
@@ -102,13 +102,13 @@
|
|
|
102
102
|
"@codingame/monaco-vscode-typescript-basics-default-extension": "~14.0.6",
|
|
103
103
|
"@codingame/monaco-vscode-typescript-language-features-default-extension": "~14.0.6",
|
|
104
104
|
"@codingame/monaco-vscode-views-service-override": "~14.0.6",
|
|
105
|
-
"@typefox/monaco-editor-react": "~6.
|
|
105
|
+
"@typefox/monaco-editor-react": "~6.6.0-next.0",
|
|
106
106
|
"cors": "^2.8.5",
|
|
107
107
|
"express": "~4.21.2",
|
|
108
108
|
"jszip": "~3.10.1",
|
|
109
109
|
"langium": "~3.4.0",
|
|
110
|
-
"monaco-editor-wrapper": "~6.
|
|
111
|
-
"monaco-languageclient": "~9.4.1
|
|
110
|
+
"monaco-editor-wrapper": "~6.6.0-next.0",
|
|
111
|
+
"monaco-languageclient": "~9.4.1",
|
|
112
112
|
"pyright": "~1.1.396",
|
|
113
113
|
"react": "~19.0.0",
|
|
114
114
|
"react-dom": "~19.0.0",
|
|
@@ -5,6 +5,7 @@
|
|
|
5
5
|
|
|
6
6
|
import getKeybindingsServiceOverride from '@codingame/monaco-vscode-keybindings-service-override';
|
|
7
7
|
import { LogLevel } from '@codingame/monaco-vscode-api';
|
|
8
|
+
import { MessageTransports } from 'vscode-languageclient';
|
|
8
9
|
import type { Logger } from 'monaco-languageclient/tools';
|
|
9
10
|
import { useWorkerFactory } from 'monaco-languageclient/workerFactory';
|
|
10
11
|
import type { WrapperConfig } from 'monaco-editor-wrapper';
|
|
@@ -12,7 +13,10 @@ import { defineDefaultWorkerLoaders } from 'monaco-editor-wrapper/workers/worker
|
|
|
12
13
|
import { LangiumMonarchContent } from './langium.monarch.js';
|
|
13
14
|
import code from '../../../../resources/langium/langium-dsl/example.langium?raw';
|
|
14
15
|
|
|
15
|
-
export const setupLangiumClientClassic = async (
|
|
16
|
+
export const setupLangiumClientClassic = async (params: {
|
|
17
|
+
worker: Worker
|
|
18
|
+
messageTransports?: MessageTransports,
|
|
19
|
+
}): Promise<WrapperConfig> => {
|
|
16
20
|
const workerLoaders = defineDefaultWorkerLoaders();
|
|
17
21
|
workerLoaders.TextMateWorker = undefined;
|
|
18
22
|
return {
|
|
@@ -28,7 +32,7 @@ export const setupLangiumClientClassic = async (langiumWorker: Worker): Promise<
|
|
|
28
32
|
codeResources: {
|
|
29
33
|
modified: {
|
|
30
34
|
text: code,
|
|
31
|
-
|
|
35
|
+
uri: '/workspace/grammar.langium',
|
|
32
36
|
enforceLanguageId: 'langium'
|
|
33
37
|
}
|
|
34
38
|
},
|
|
@@ -39,7 +43,7 @@ export const setupLangiumClientClassic = async (langiumWorker: Worker): Promise<
|
|
|
39
43
|
},
|
|
40
44
|
languageDef: {
|
|
41
45
|
monarchLanguage: LangiumMonarchContent,
|
|
42
|
-
languageExtensionConfig: { id: 'langium' }
|
|
46
|
+
languageExtensionConfig: { id: 'langium' }
|
|
43
47
|
},
|
|
44
48
|
monacoWorkerFactory: (logger?: Logger) => {
|
|
45
49
|
useWorkerFactory({
|
|
@@ -57,8 +61,9 @@ export const setupLangiumClientClassic = async (langiumWorker: Worker): Promise<
|
|
|
57
61
|
connection: {
|
|
58
62
|
options: {
|
|
59
63
|
$type: 'WorkerDirect',
|
|
60
|
-
worker:
|
|
61
|
-
}
|
|
64
|
+
worker: params.worker
|
|
65
|
+
},
|
|
66
|
+
messageTransports: params.messageTransports
|
|
62
67
|
}
|
|
63
68
|
}
|
|
64
69
|
}
|
|
@@ -6,23 +6,22 @@
|
|
|
6
6
|
import getKeybindingsServiceOverride from '@codingame/monaco-vscode-keybindings-service-override';
|
|
7
7
|
import { LogLevel } from '@codingame/monaco-vscode-api';
|
|
8
8
|
import '../../../../resources/vsix/github-vscode-theme.vsix';
|
|
9
|
-
import {
|
|
9
|
+
import { MessageTransports } from 'vscode-languageclient';
|
|
10
10
|
import type { WrapperConfig } from 'monaco-editor-wrapper';
|
|
11
11
|
import { configureDefaultWorkerFactory } from 'monaco-editor-wrapper/workers/workerLoaders';
|
|
12
12
|
import langiumLanguageConfig from './langium.configuration.json?raw';
|
|
13
13
|
import langiumTextmateGrammar from './langium.tmLanguage.json?raw';
|
|
14
14
|
import text from '../../../../resources/langium/langium-dsl//example.langium?raw';
|
|
15
15
|
|
|
16
|
-
export const setupLangiumClientExtended = async (
|
|
16
|
+
export const setupLangiumClientExtended = async (params: {
|
|
17
|
+
worker: Worker
|
|
18
|
+
messageTransports?: MessageTransports,
|
|
19
|
+
}): Promise<WrapperConfig> => {
|
|
17
20
|
|
|
18
21
|
const extensionFilesOrContents = new Map<string, string | URL>();
|
|
19
22
|
// vite build is easier with string content
|
|
20
23
|
extensionFilesOrContents.set('/langium-configuration.json', langiumLanguageConfig);
|
|
21
24
|
extensionFilesOrContents.set('/langium-grammar.json', langiumTextmateGrammar);
|
|
22
|
-
|
|
23
|
-
const reader = new BrowserMessageReader(langiumWorker);
|
|
24
|
-
const writer = new BrowserMessageWriter(langiumWorker);
|
|
25
|
-
|
|
26
25
|
return {
|
|
27
26
|
$type: 'extended',
|
|
28
27
|
htmlContainer: document.getElementById('monaco-editor-root')!,
|
|
@@ -68,7 +67,7 @@ export const setupLangiumClientExtended = async (langiumWorker: Worker): Promise
|
|
|
68
67
|
codeResources: {
|
|
69
68
|
modified: {
|
|
70
69
|
text,
|
|
71
|
-
|
|
70
|
+
uri: '/workspace/grammar.langium'
|
|
72
71
|
}
|
|
73
72
|
},
|
|
74
73
|
monacoWorkerFactory: configureDefaultWorkerFactory
|
|
@@ -82,9 +81,9 @@ export const setupLangiumClientExtended = async (langiumWorker: Worker): Promise
|
|
|
82
81
|
connection: {
|
|
83
82
|
options: {
|
|
84
83
|
$type: 'WorkerDirect',
|
|
85
|
-
worker:
|
|
84
|
+
worker: params.worker
|
|
86
85
|
},
|
|
87
|
-
messageTransports:
|
|
86
|
+
messageTransports: params.messageTransports
|
|
88
87
|
}
|
|
89
88
|
}
|
|
90
89
|
}
|
|
@@ -13,6 +13,10 @@ import { BrowserMessageReader, BrowserMessageWriter, createConnection } from 'vs
|
|
|
13
13
|
const messageReader = new BrowserMessageReader(self as DedicatedWorkerGlobalScope);
|
|
14
14
|
const messageWriter = new BrowserMessageWriter(self as DedicatedWorkerGlobalScope);
|
|
15
15
|
|
|
16
|
+
messageReader.listen((message) => {
|
|
17
|
+
console.log('Received message from main thread:', message);
|
|
18
|
+
});
|
|
19
|
+
|
|
16
20
|
// Inject the shared services and language-specific services
|
|
17
21
|
const context = {
|
|
18
22
|
connection: createConnection(messageReader, messageWriter),
|
|
@@ -3,11 +3,12 @@
|
|
|
3
3
|
* Licensed under the MIT License. See LICENSE in the package root for license information.
|
|
4
4
|
* ------------------------------------------------------------------------------------------ */
|
|
5
5
|
|
|
6
|
+
import { BrowserMessageReader, BrowserMessageWriter } from 'vscode-languageclient/browser.js';
|
|
6
7
|
import { MonacoEditorLanguageClientWrapper } from 'monaco-editor-wrapper';
|
|
7
8
|
import { setupLangiumClientExtended } from './config/extendedConfig.js';
|
|
8
9
|
import { setupLangiumClientClassic } from './config/classicConfig.js';
|
|
9
|
-
import { disableElement } from '../../common/client/utils.js';
|
|
10
|
-
|
|
10
|
+
import { delayExecution, disableElement } from '../../common/client/utils.js';
|
|
11
|
+
import text from '../../../resources/langium/langium-dsl/example.langium?raw';
|
|
11
12
|
import workerUrl from './worker/langium-server?worker&url';
|
|
12
13
|
|
|
13
14
|
export const runLangiumDslWrapper = async (extendedMode: boolean) => {
|
|
@@ -34,17 +35,37 @@ export const runLangiumDslWrapper = async (extendedMode: boolean) => {
|
|
|
34
35
|
if (checkStarted()) return;
|
|
35
36
|
disableElement('button-start', true);
|
|
36
37
|
|
|
37
|
-
const
|
|
38
|
+
const worker = loadLangiumWorker();
|
|
39
|
+
const reader = new BrowserMessageReader(worker);
|
|
40
|
+
const writer = new BrowserMessageWriter(worker);
|
|
41
|
+
reader.listen((message) => {
|
|
42
|
+
console.log('Received message from worker:', message);
|
|
43
|
+
});
|
|
38
44
|
|
|
39
45
|
if (extendedMode) {
|
|
40
|
-
const config = await setupLangiumClientExtended(
|
|
46
|
+
const config = await setupLangiumClientExtended({
|
|
47
|
+
worker,
|
|
48
|
+
messageTransports: { reader, writer }
|
|
49
|
+
});
|
|
41
50
|
wrapper = new MonacoEditorLanguageClientWrapper();
|
|
42
|
-
wrapper.initAndStart(config);
|
|
51
|
+
await wrapper.initAndStart(config);
|
|
43
52
|
} else {
|
|
44
|
-
const config = await setupLangiumClientClassic(
|
|
53
|
+
const config = await setupLangiumClientClassic({
|
|
54
|
+
worker,
|
|
55
|
+
messageTransports: { reader, writer }
|
|
56
|
+
});
|
|
45
57
|
wrapper = new MonacoEditorLanguageClientWrapper();
|
|
46
58
|
await wrapper.initAndStart(config);
|
|
47
59
|
}
|
|
60
|
+
|
|
61
|
+
await delayExecution(1000);
|
|
62
|
+
await wrapper.updateCodeResources({
|
|
63
|
+
modified: {
|
|
64
|
+
text: `// modified file\n\n${text}`,
|
|
65
|
+
uri: '/workspace/mod.langium',
|
|
66
|
+
enforceLanguageId: 'langium'
|
|
67
|
+
}
|
|
68
|
+
});
|
|
48
69
|
};
|
|
49
70
|
|
|
50
71
|
const disposeEditor = async () => {
|
|
@@ -9,7 +9,7 @@ import getLocalizationServiceOverride from '@codingame/monaco-vscode-localizatio
|
|
|
9
9
|
import { createDefaultLocaleConfiguration } from 'monaco-languageclient/vscode/services';
|
|
10
10
|
import { LogLevel } from '@codingame/monaco-vscode-api';
|
|
11
11
|
import { MessageTransports } from 'vscode-languageclient';
|
|
12
|
-
import type { LanguageClientConfigs, WrapperConfig } from 'monaco-editor-wrapper';
|
|
12
|
+
import type { CodeContent, LanguageClientConfigs, WrapperConfig } from 'monaco-editor-wrapper';
|
|
13
13
|
import { configureDefaultWorkerFactory } from 'monaco-editor-wrapper/workers/workerLoaders';
|
|
14
14
|
|
|
15
15
|
// cannot be imported with assert as json contains comments
|
|
@@ -19,7 +19,7 @@ import responseStatemachineTm from '../syntaxes/statemachine.tmLanguage.json?raw
|
|
|
19
19
|
export const createLangiumGlobalConfig = (params: {
|
|
20
20
|
languageServerId: string,
|
|
21
21
|
useLanguageClient: boolean,
|
|
22
|
-
|
|
22
|
+
codeContent: CodeContent,
|
|
23
23
|
worker?: Worker,
|
|
24
24
|
messagePort?: MessagePort,
|
|
25
25
|
messageTransports?: MessageTransports,
|
|
@@ -29,14 +29,6 @@ export const createLangiumGlobalConfig = (params: {
|
|
|
29
29
|
extensionFilesOrContents.set(`/${params.languageServerId}-statemachine-configuration.json`, statemachineLanguageConfig);
|
|
30
30
|
extensionFilesOrContents.set(`/${params.languageServerId}-statemachine-grammar.json`, responseStatemachineTm);
|
|
31
31
|
|
|
32
|
-
let modified;
|
|
33
|
-
if (params.text !== undefined) {
|
|
34
|
-
modified = {
|
|
35
|
-
text: params.text,
|
|
36
|
-
fileExt: 'statemachine'
|
|
37
|
-
};
|
|
38
|
-
}
|
|
39
|
-
|
|
40
32
|
const languageClientConfigs: LanguageClientConfigs | undefined = params.useLanguageClient && params.worker ? {
|
|
41
33
|
configs: {
|
|
42
34
|
statemachine: {
|
|
@@ -100,7 +92,7 @@ export const createLangiumGlobalConfig = (params: {
|
|
|
100
92
|
}],
|
|
101
93
|
editorAppConfig: {
|
|
102
94
|
codeResources: {
|
|
103
|
-
modified
|
|
95
|
+
modified: params.codeContent
|
|
104
96
|
},
|
|
105
97
|
monacoWorkerFactory: configureDefaultWorkerFactory
|
|
106
98
|
},
|
|
@@ -23,7 +23,10 @@ export const runStatemachineReact = async () => {
|
|
|
23
23
|
const wrapperConfig = createLangiumGlobalConfig({
|
|
24
24
|
languageServerId: 'react',
|
|
25
25
|
useLanguageClient: true,
|
|
26
|
-
|
|
26
|
+
codeContent: {
|
|
27
|
+
text,
|
|
28
|
+
uri: '/workspace/example.statemachine'
|
|
29
|
+
},
|
|
27
30
|
worker,
|
|
28
31
|
messageTransports: { reader, writer },
|
|
29
32
|
htmlContainer: document.getElementById('monaco-editor-root')!
|
|
@@ -4,15 +4,14 @@
|
|
|
4
4
|
* ------------------------------------------------------------------------------------------ */
|
|
5
5
|
|
|
6
6
|
import * as vscode from 'vscode';
|
|
7
|
-
import { createModelReference } from '@codingame/monaco-vscode-api/monaco';
|
|
8
7
|
import { BrowserMessageReader, BrowserMessageWriter } from 'vscode-languageclient/browser.js';
|
|
9
|
-
import { MonacoEditorLanguageClientWrapper } from 'monaco-editor-wrapper';
|
|
8
|
+
import { buildModelReference, MonacoEditorLanguageClientWrapper } from 'monaco-editor-wrapper';
|
|
10
9
|
import { createLangiumGlobalConfig } from './config/wrapperStatemachineConfig.js';
|
|
11
10
|
import workerUrl from './worker/statemachine-server?worker&url';
|
|
12
11
|
import workerPortUrl from './worker/statemachine-server-port?worker&url';
|
|
13
12
|
import text from '../../../resources/langium/statemachine/example.statemachine?raw';
|
|
14
13
|
import textMod from '../../../resources/langium/statemachine/example-mod.statemachine?raw';
|
|
15
|
-
import { disableElement } from '../../common/client/utils.js';
|
|
14
|
+
import { delayExecution, disableElement } from '../../common/client/utils.js';
|
|
16
15
|
|
|
17
16
|
const wrapper = new MonacoEditorLanguageClientWrapper();
|
|
18
17
|
const wrapper2 = new MonacoEditorLanguageClientWrapper();
|
|
@@ -46,6 +45,10 @@ const startEditor = async () => {
|
|
|
46
45
|
// the configuration does not contain any text content
|
|
47
46
|
const langiumGlobalConfig = createLangiumGlobalConfig({
|
|
48
47
|
languageServerId: 'first',
|
|
48
|
+
codeContent: {
|
|
49
|
+
text,
|
|
50
|
+
uri: '/workspace/example.statemachine'
|
|
51
|
+
},
|
|
49
52
|
useLanguageClient: true,
|
|
50
53
|
worker: stateMachineWorkerPort,
|
|
51
54
|
messagePort: channel.port1,
|
|
@@ -55,10 +58,11 @@ const startEditor = async () => {
|
|
|
55
58
|
await wrapper.initAndStart(langiumGlobalConfig);
|
|
56
59
|
|
|
57
60
|
// here the modelReference is created manually and given to the updateEditorModels of the wrapper
|
|
58
|
-
const uri = vscode.Uri.parse('/workspace/statemachine-mod.statemachine');
|
|
59
|
-
const modelRefModified = await createModelReference(uri, text);
|
|
60
61
|
wrapper.updateEditorModels({
|
|
61
|
-
modelRefModified
|
|
62
|
+
modelRefModified: await buildModelReference({
|
|
63
|
+
text,
|
|
64
|
+
uri: '/workspace/statemachine-mod.statemachine'
|
|
65
|
+
})
|
|
62
66
|
});
|
|
63
67
|
|
|
64
68
|
// start the second wrapper without any languageclient config
|
|
@@ -66,7 +70,10 @@ const startEditor = async () => {
|
|
|
66
70
|
const langiumGlobalConfig2 = createLangiumGlobalConfig({
|
|
67
71
|
languageServerId: 'second',
|
|
68
72
|
useLanguageClient: false,
|
|
69
|
-
|
|
73
|
+
codeContent: {
|
|
74
|
+
text: textMod,
|
|
75
|
+
uri: '/workspace/example-mod.statemachine'
|
|
76
|
+
},
|
|
70
77
|
htmlContainer: document.getElementById('monaco-editor-root2')!
|
|
71
78
|
});
|
|
72
79
|
await wrapper2.initAndStart(langiumGlobalConfig2);
|
|
@@ -74,6 +81,15 @@ const startEditor = async () => {
|
|
|
74
81
|
vscode.commands.getCommands().then((x) => {
|
|
75
82
|
console.log('Currently registered # of vscode commands: ' + x.length);
|
|
76
83
|
});
|
|
84
|
+
|
|
85
|
+
await delayExecution(1000);
|
|
86
|
+
|
|
87
|
+
wrapper.updateEditorModels({
|
|
88
|
+
modelRefModified: await buildModelReference({
|
|
89
|
+
text: `// modified file\n\n${text}`,
|
|
90
|
+
uri: '/workspace/statemachine-mod2.statemachine'
|
|
91
|
+
})
|
|
92
|
+
});
|
|
77
93
|
};
|
|
78
94
|
|
|
79
95
|
const disposeEditor = async () => {
|
|
@@ -9,7 +9,7 @@ import getKeybindingsServiceOverride from '@codingame/monaco-vscode-keybindings-
|
|
|
9
9
|
import '@codingame/monaco-vscode-json-default-extension';
|
|
10
10
|
import '@codingame/monaco-vscode-python-default-extension';
|
|
11
11
|
import { LogLevel } from '@codingame/monaco-vscode-api';
|
|
12
|
-
import {
|
|
12
|
+
import { MonacoEditorLanguageClientWrapper, type WrapperConfig } from 'monaco-editor-wrapper';
|
|
13
13
|
import { configureDefaultWorkerFactory } from 'monaco-editor-wrapper/workers/workerLoaders';
|
|
14
14
|
import { disableElement } from '../common/client/utils.js';
|
|
15
15
|
import { createJsonLanguageClientConfig, createPythonLanguageClientConfig } from './config.js';
|
|
@@ -52,7 +52,7 @@ print("Hello Moon!")
|
|
|
52
52
|
codeResources: {
|
|
53
53
|
modified: {
|
|
54
54
|
text: currentText,
|
|
55
|
-
|
|
55
|
+
uri: `/workspace/example.${currenFileExt}`
|
|
56
56
|
}
|
|
57
57
|
},
|
|
58
58
|
monacoWorkerFactory: configureDefaultWorkerFactory
|
|
@@ -80,8 +80,8 @@ print("Hello Moon!")
|
|
|
80
80
|
|
|
81
81
|
await wrapper.initAndStart(wrapperConfig);
|
|
82
82
|
if (wrapperConfig.editorAppConfig?.codeResources?.modified !== undefined) {
|
|
83
|
-
|
|
84
|
-
|
|
83
|
+
wrapperConfig.editorAppConfig.codeResources.modified.text = currentText;
|
|
84
|
+
wrapperConfig.editorAppConfig.codeResources.modified.uri = `/workspace/example.${currenFileExt}`;
|
|
85
85
|
}
|
|
86
86
|
|
|
87
87
|
// init language clients after start
|
|
@@ -112,7 +112,7 @@ print("Hello Moon!")
|
|
|
112
112
|
wrapper.updateCodeResources({
|
|
113
113
|
modified: {
|
|
114
114
|
text: currentText,
|
|
115
|
-
|
|
115
|
+
uri: `/workspace/example.${currenFileExt}`
|
|
116
116
|
}
|
|
117
117
|
});
|
|
118
118
|
});
|
package/src/ts/wrapperTs.ts
CHANGED
|
@@ -8,7 +8,7 @@ import getKeybindingsServiceOverride from '@codingame/monaco-vscode-keybindings-
|
|
|
8
8
|
import '@codingame/monaco-vscode-typescript-basics-default-extension';
|
|
9
9
|
import '@codingame/monaco-vscode-typescript-language-features-default-extension';
|
|
10
10
|
import { LogLevel } from '@codingame/monaco-vscode-api';
|
|
11
|
-
import {
|
|
11
|
+
import { MonacoEditorLanguageClientWrapper, type WrapperConfig } from 'monaco-editor-wrapper';
|
|
12
12
|
import { configureDefaultWorkerFactory } from 'monaco-editor-wrapper/workers/workerLoaders';
|
|
13
13
|
|
|
14
14
|
export const runTsWrapper = async () => {
|
|
@@ -76,7 +76,7 @@ export const runTsWrapper = async () => {
|
|
|
76
76
|
});
|
|
77
77
|
document.querySelector('#button-swap-code')?.addEventListener('click', () => {
|
|
78
78
|
const codeResources = wrapper.getMonacoEditorApp()?.getConfig().codeResources;
|
|
79
|
-
if (
|
|
79
|
+
if (codeResources?.modified?.uri === codeUri) {
|
|
80
80
|
wrapper.updateCodeResources({
|
|
81
81
|
modified: {
|
|
82
82
|
text: codeOriginal,
|