monaco-languageclient-examples 2024.10.5 → 2024.11.2

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.
Files changed (85) hide show
  1. package/CHANGELOG.md +13 -0
  2. package/dist/appPlayground/main.d.ts.map +1 -1
  3. package/dist/appPlayground/main.js +15 -15
  4. package/dist/appPlayground/main.js.map +1 -1
  5. package/dist/bare/client.d.ts +0 -1
  6. package/dist/bare/client.d.ts.map +1 -1
  7. package/dist/bare/client.js +4 -8
  8. package/dist/bare/client.js.map +1 -1
  9. package/dist/browser/main.d.ts.map +1 -1
  10. package/dist/browser/main.js +4 -5
  11. package/dist/browser/main.js.map +1 -1
  12. package/dist/clangd/client/config.d.ts.map +1 -1
  13. package/dist/clangd/client/config.js +15 -17
  14. package/dist/clangd/client/config.js.map +1 -1
  15. package/dist/eclipse.jdt.ls/client/main.d.ts.map +1 -1
  16. package/dist/eclipse.jdt.ls/client/main.js +4 -6
  17. package/dist/eclipse.jdt.ls/client/main.js.map +1 -1
  18. package/dist/groovy/client/main.d.ts.map +1 -1
  19. package/dist/groovy/client/main.js +7 -6
  20. package/dist/groovy/client/main.js.map +1 -1
  21. package/dist/json/client/wrapperWs.d.ts.map +1 -1
  22. package/dist/json/client/wrapperWs.js +7 -6
  23. package/dist/json/client/wrapperWs.js.map +1 -1
  24. package/dist/langium/langium-dsl/config/classicConfig.d.ts.map +1 -1
  25. package/dist/langium/langium-dsl/config/classicConfig.js +7 -6
  26. package/dist/langium/langium-dsl/config/classicConfig.js.map +1 -1
  27. package/dist/langium/langium-dsl/config/extendedConfig.d.ts.map +1 -1
  28. package/dist/langium/langium-dsl/config/extendedConfig.js +31 -30
  29. package/dist/langium/langium-dsl/config/extendedConfig.js.map +1 -1
  30. package/dist/langium/statemachine/config/wrapperStatemachineConfig.d.ts.map +1 -1
  31. package/dist/langium/statemachine/config/wrapperStatemachineConfig.js +31 -30
  32. package/dist/langium/statemachine/config/wrapperStatemachineConfig.js.map +1 -1
  33. package/dist/langium/statemachine/ls/generated/ast.d.ts +4 -1
  34. package/dist/langium/statemachine/ls/generated/ast.d.ts.map +1 -1
  35. package/dist/langium/statemachine/ls/generated/ast.js +12 -12
  36. package/dist/langium/statemachine/ls/generated/ast.js.map +1 -1
  37. package/dist/langium/statemachine/ls/generated/grammar.d.ts +1 -1
  38. package/dist/langium/statemachine/ls/generated/grammar.js +1 -1
  39. package/dist/langium/statemachine/ls/generated/module.d.ts +2 -1
  40. package/dist/langium/statemachine/ls/generated/module.d.ts.map +1 -1
  41. package/dist/langium/statemachine/ls/generated/module.js +3 -2
  42. package/dist/langium/statemachine/ls/generated/module.js.map +1 -1
  43. package/dist/langium/statemachine/main-react.js +1 -1
  44. package/dist/langium/statemachine/main-react.js.map +1 -1
  45. package/dist/multi/config.d.ts +4 -0
  46. package/dist/multi/config.d.ts.map +1 -0
  47. package/dist/multi/config.js +59 -0
  48. package/dist/multi/config.js.map +1 -0
  49. package/dist/multi/twoLanguageClients.d.ts +1 -0
  50. package/dist/multi/twoLanguageClients.d.ts.map +1 -1
  51. package/dist/multi/twoLanguageClients.js +49 -61
  52. package/dist/multi/twoLanguageClients.js.map +1 -1
  53. package/dist/python/client/config.d.ts.map +1 -1
  54. package/dist/python/client/config.js +5 -7
  55. package/dist/python/client/config.js.map +1 -1
  56. package/dist/python/client/reactPython.js +1 -1
  57. package/dist/python/client/reactPython.js.map +1 -1
  58. package/dist/ts/wrapperTs.d.ts +1 -1
  59. package/dist/ts/wrapperTs.d.ts.map +1 -1
  60. package/dist/ts/wrapperTs.js +5 -6
  61. package/dist/ts/wrapperTs.js.map +1 -1
  62. package/ghp_appPlayground.html +1 -1
  63. package/package.json +37 -37
  64. package/react_python.html +1 -1
  65. package/react_statemachine.html +1 -1
  66. package/src/appPlayground/main.ts +17 -16
  67. package/src/bare/client.ts +4 -8
  68. package/src/browser/main.ts +4 -5
  69. package/src/clangd/client/config.ts +15 -17
  70. package/src/eclipse.jdt.ls/client/main.ts +4 -6
  71. package/src/groovy/client/main.ts +7 -6
  72. package/src/json/client/wrapperWs.ts +7 -6
  73. package/src/langium/langium-dsl/config/classicConfig.ts +7 -6
  74. package/src/langium/langium-dsl/config/extendedConfig.ts +31 -30
  75. package/src/langium/statemachine/config/wrapperStatemachineConfig.ts +31 -30
  76. package/src/langium/statemachine/ls/generated/ast.ts +28 -12
  77. package/src/langium/statemachine/ls/generated/grammar.ts +1 -1
  78. package/src/langium/statemachine/ls/generated/module.ts +3 -2
  79. package/src/langium/statemachine/main-react.tsx +1 -1
  80. package/src/multi/config.ts +63 -0
  81. package/src/multi/twoLanguageClients.ts +53 -62
  82. package/src/python/client/config.ts +5 -7
  83. package/src/python/client/reactPython.tsx +1 -1
  84. package/src/ts/wrapperTs.ts +7 -8
  85. package/two_langauge_clients.html +1 -0
package/CHANGELOG.md CHANGED
@@ -2,6 +2,19 @@
2
2
 
3
3
  All notable changes to this npm module are documented in this file.
4
4
 
5
+ ## [2024.11.2] - 2024-11-21
6
+
7
+ - Updated to `monaco-languageclient@9.0.0-next.8`, `monaco-editor-wrapper@6.0.0-next.8` and `@typefox/monaco-editor-react@6.0.0-next.8`.
8
+ - Updated all `@codingame/monaco-vscode` packages to `11.1.1`.
9
+ - Run language clients independent of wrapper lifecycle [#784](https://github.com/TypeFox/monaco-languageclient/pull/784)
10
+ - Aligned examples with API changes
11
+ - Two language clients example can now be launch with both language clients initialized by the wrapper or externally
12
+
13
+ ## [2024.10.6] - 2024-11-13
14
+
15
+ - Updated to `monaco-languageclient@9.0.0-next.7`, `monaco-editor-wrapper@6.0.0-next.7` and `@typefox/monaco-editor-react@6.0.0-next.7`.
16
+ - Updated all `@codingame/monaco-vscode` packages to `11.1.0`.
17
+
5
18
  ## [2024.10.5] - 2024-10-31
6
19
 
7
20
  - Updated to `monaco-languageclient@9.0.0-next.6`, `monaco-editor-wrapper@6.0.0-next.6` and `@typefox/monaco-editor-react@6.0.0-next.6`.
@@ -1 +1 @@
1
- {"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../src/appPlayground/main.ts"],"names":[],"mappings":"AAoBA,OAAO,8DAA8D,CAAC;AACtE,OAAO,yEAAyE,CAAC;AAEjF,OAAO,oDAAoD,CAAC;AAW5D,eAAO,MAAM,wBAAwB,qBAmGpC,CAAC"}
1
+ {"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../src/appPlayground/main.ts"],"names":[],"mappings":"AAqBA,OAAO,8DAA8D,CAAC;AACtE,OAAO,yEAAyE,CAAC;AAEjF,OAAO,oDAAoD,CAAC;AAW5D,eAAO,MAAM,wBAAwB,qBAmGpC,CAAC"}
@@ -30,10 +30,12 @@ const wrapper = new MonacoEditorLanguageClientWrapper();
30
30
  export const runApplicationPlayground = async () => {
31
31
  const workspaceFile = vscode.Uri.file('/workspace/.vscode/workspace.code-workspace');
32
32
  const wrapperConfig = {
33
+ $type: 'extended',
33
34
  id: 'AAP',
34
35
  logLevel: LogLevel.Debug,
36
+ htmlContainer: document.body,
35
37
  vscodeApiConfig: {
36
- userServices: {
38
+ serviceOverrides: {
37
39
  ...getConfigurationServiceOverride(),
38
40
  ...getKeybindingsServiceOverride(),
39
41
  ...getLifecycleServiceOverride(),
@@ -88,20 +90,18 @@ export const runApplicationPlayground = async () => {
88
90
  })
89
91
  },
90
92
  },
91
- editorAppConfig: {
92
- $type: 'extended',
93
- extensions: [{
94
- config: {
95
- name: 'mlc-app-playground',
96
- publisher: 'TypeFox',
97
- version: '1.0.0',
98
- engines: {
99
- vscode: '*'
100
- }
93
+ extensions: [{
94
+ config: {
95
+ name: 'mlc-app-playground',
96
+ publisher: 'TypeFox',
97
+ version: '1.0.0',
98
+ engines: {
99
+ vscode: '*'
101
100
  }
102
- }],
103
- monacoWorkerFactory: configureMonacoWorkers,
104
- htmlContainer: document.body
101
+ }
102
+ }],
103
+ editorAppConfig: {
104
+ monacoWorkerFactory: configureMonacoWorkers
105
105
  }
106
106
  };
107
107
  const htmlContainer = document.createElement('div', { is: 'app' });
@@ -115,7 +115,7 @@ export const runApplicationPlayground = async () => {
115
115
  fileSystemProvider.registerFile(createDefaultWorkspaceFile(workspaceFile, '/workspace'));
116
116
  registerFileSystemOverlay(1, fileSystemProvider);
117
117
  await wrapper.init(wrapperConfig);
118
- const result = wrapper.getMonacoEditorApp().getExtensionRegisterResult('mlc-app-playground');
118
+ const result = wrapper.getExtensionRegisterResult('mlc-app-playground');
119
119
  result.setAsDefaultApi();
120
120
  await Promise.all([
121
121
  await vscode.window.showTextDocument(helloTsUri),
@@ -1 +1 @@
1
- {"version":3,"file":"main.js","sourceRoot":"","sources":["../../src/appPlayground/main.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"main.js","sourceRoot":"","sources":["../../src/appPlayground/main.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,3 @@
1
- import '@codingame/monaco-vscode-theme-defaults-default-extension';
2
1
  import '@codingame/monaco-vscode-json-default-extension';
3
2
  import { MonacoLanguageClient } from 'monaco-languageclient';
4
3
  import { MessageTransports } from 'vscode-languageclient/browser.js';
@@ -1 +1 @@
1
- {"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/bare/client.ts"],"names":[],"mappings":"AAaA,OAAO,2DAA2D,CAAC;AACnE,OAAO,iDAAiD,CAAC;AACzD,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAE7D,OAAO,EAA4B,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AAK/F,eAAO,MAAM,SAAS,qBAsCrB,CAAC;AAEF,qDAAqD;AACrD,eAAO,MAAM,2BAA2B,QAAS,MAAM,KAAG,SAczD,CAAC;AAEF,eAAO,MAAM,oBAAoB,sBAAuB,iBAAiB,KAAG,oBAe3E,CAAC"}
1
+ {"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/bare/client.ts"],"names":[],"mappings":"AAWA,OAAO,iDAAiD,CAAC;AACzD,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAE7D,OAAO,EAA4B,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AAK/F,eAAO,MAAM,SAAS,qBAqCrB,CAAC;AAEF,qDAAqD;AACrD,eAAO,MAAM,2BAA2B,QAAS,MAAM,KAAG,SAczD,CAAC;AAEF,eAAO,MAAM,oBAAoB,sBAAuB,iBAAiB,KAAG,oBAe3E,CAAC"}
@@ -7,10 +7,7 @@ import { initServices } from 'monaco-languageclient/vscode/services';
7
7
  import { LogLevel } from 'vscode/services';
8
8
  // monaco-editor does not supply json highlighting with the json worker,
9
9
  // that's why we use the textmate extension from VSCode
10
- import getThemeServiceOverride from '@codingame/monaco-vscode-theme-service-override';
11
- import getTextmateServiceOverride from '@codingame/monaco-vscode-textmate-service-override';
12
10
  import getConfigurationServiceOverride from '@codingame/monaco-vscode-configuration-service-override';
13
- import '@codingame/monaco-vscode-theme-defaults-default-extension';
14
11
  import '@codingame/monaco-vscode-json-default-extension';
15
12
  import { MonacoLanguageClient } from 'monaco-languageclient';
16
13
  import { WebSocketMessageReader, WebSocketMessageWriter, toSocket } from 'vscode-ws-jsonrpc';
@@ -22,11 +19,10 @@ export const runClient = async () => {
22
19
  const logger = new ConsoleLogger(LogLevel.Debug);
23
20
  const htmlContainer = document.getElementById('monaco-editor-root');
24
21
  await initServices({
25
- userServices: {
26
- ...getConfigurationServiceOverride(),
27
- ...getThemeServiceOverride(),
28
- ...getTextmateServiceOverride(),
29
- },
22
+ serviceOverrides: {
23
+ ...getConfigurationServiceOverride()
24
+ }
25
+ }, {
30
26
  htmlContainer,
31
27
  logger
32
28
  });
@@ -1 +1 @@
1
- {"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/bare/client.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/bare/client.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../src/browser/main.ts"],"names":[],"mappings":"AAOA,OAAO,2DAA2D,CAAC;AACnE,OAAO,iDAAiD,CAAC;AAQzD,eAAO,MAAM,gBAAgB,qBAmJ5B,CAAC"}
1
+ {"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../src/browser/main.ts"],"names":[],"mappings":"AAOA,OAAO,2DAA2D,CAAC;AACnE,OAAO,iDAAiD,CAAC;AAQzD,eAAO,MAAM,gBAAgB,qBAkJ5B,CAAC"}
@@ -25,9 +25,11 @@ export const runBrowserEditor = async () => {
25
25
  const codeUri = '/workspace/model.json';
26
26
  const wrapper = new MonacoEditorLanguageClientWrapper();
27
27
  const jsonClientUserConfig = {
28
+ $type: 'extended',
29
+ htmlContainer,
28
30
  logLevel: LogLevel.Debug,
29
31
  vscodeApiConfig: {
30
- userServices: {
32
+ serviceOverrides: {
31
33
  ...getKeybindingsServiceOverride(),
32
34
  },
33
35
  userConfiguration: {
@@ -40,16 +42,13 @@ export const runBrowserEditor = async () => {
40
42
  }
41
43
  },
42
44
  editorAppConfig: {
43
- $type: 'extended',
44
45
  codeResources: {
45
46
  main: {
46
47
  text: code,
47
48
  uri: codeUri
48
49
  }
49
50
  },
50
- useDiffEditor: false,
51
- monacoWorkerFactory: configureMonacoWorkers,
52
- htmlContainer
51
+ monacoWorkerFactory: configureMonacoWorkers
53
52
  }
54
53
  };
55
54
  await wrapper.init(jsonClientUserConfig);
@@ -1 +1 @@
1
- {"version":3,"file":"main.js","sourceRoot":"","sources":["../../src/browser/main.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"main.js","sourceRoot":"","sources":["../../src/browser/main.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../src/clangd/client/config.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;AAY7B,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAEtD,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAGzD,eAAO,MAAM,mBAAmB,WAAkB;IAC9C,aAAa,EAAE,WAAW,CAAC;IAC3B,YAAY,EAAE,GAAG,CAAC;IAClB,gBAAgB,EAAE,GAAG,CAAC;IACtB,mBAAmB,EAAE,mBAAmB,CAAC;IACzC,kBAAkB,EAAE,WAAW,CAAA;CAClC,KAAG,OAAO,CAAC,aAAa,CAmGxB,CAAC"}
1
+ {"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../src/clangd/client/config.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;AAY7B,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAEtD,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAGzD,eAAO,MAAM,mBAAmB,WAAkB;IAC9C,aAAa,EAAE,WAAW,CAAC;IAC3B,YAAY,EAAE,GAAG,CAAC;IAClB,gBAAgB,EAAE,GAAG,CAAC;IACtB,mBAAmB,EAAE,mBAAmB,CAAC;IACzC,kBAAkB,EAAE,WAAW,CAAA;CAClC,KAAG,OAAO,CAAC,aAAa,CAiGxB,CAAC"}
@@ -16,12 +16,12 @@ import { LogLevel } from 'vscode/services';
16
16
  import { configureMonacoWorkers } from '../../common/client/utils.js';
17
17
  import { defaultViewsInit } from 'monaco-editor-wrapper/vscode/services';
18
18
  export const createWrapperConfig = async (config) => {
19
- const languageId = 'cpp';
20
19
  return {
20
+ $type: 'extended',
21
+ htmlContainer: config.htmlContainer,
21
22
  logLevel: LogLevel.Debug,
22
23
  languageClientConfigs: {
23
24
  LANGUAGE_ID: {
24
- languageId: languageId,
25
25
  name: 'Clangd WASM Language Server',
26
26
  connection: {
27
27
  options: {
@@ -36,7 +36,7 @@ export const createWrapperConfig = async (config) => {
36
36
  keepWorker: true
37
37
  },
38
38
  clientOptions: {
39
- documentSelector: [languageId],
39
+ documentSelector: ['cpp'],
40
40
  workspaceFolder: {
41
41
  index: 0,
42
42
  name: 'workspace',
@@ -46,7 +46,7 @@ export const createWrapperConfig = async (config) => {
46
46
  }
47
47
  },
48
48
  vscodeApiConfig: {
49
- userServices: {
49
+ serviceOverrides: {
50
50
  ...getConfigurationServiceOverride(),
51
51
  ...getKeybindingsServiceOverride(),
52
52
  ...getLifecycleServiceOverride(),
@@ -98,20 +98,18 @@ export const createWrapperConfig = async (config) => {
98
98
  })
99
99
  }
100
100
  },
101
- editorAppConfig: {
102
- $type: 'extended',
103
- extensions: [{
104
- config: {
105
- name: 'mlc-clangd-example',
106
- publisher: 'TypeFox',
107
- version: '1.0.0',
108
- engines: {
109
- vscode: '*'
110
- }
101
+ extensions: [{
102
+ config: {
103
+ name: 'mlc-clangd-example',
104
+ publisher: 'TypeFox',
105
+ version: '1.0.0',
106
+ engines: {
107
+ vscode: '*'
111
108
  }
112
- }],
113
- monacoWorkerFactory: configureMonacoWorkers,
114
- htmlContainer: config.htmlContainer
109
+ }
110
+ }],
111
+ editorAppConfig: {
112
+ monacoWorkerFactory: configureMonacoWorkers
115
113
  }
116
114
  };
117
115
  };
@@ -1 +1 @@
1
- {"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/clangd/client/config.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/clangd/client/config.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../../src/eclipse.jdt.ls/client/main.ts"],"names":[],"mappings":"AASA,OAAO,iDAAiD,CAAC;AAOzD,eAAO,MAAM,qBAAqB,YAuEjC,CAAC"}
1
+ {"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../../src/eclipse.jdt.ls/client/main.ts"],"names":[],"mappings":"AASA,OAAO,iDAAiD,CAAC;AAOzD,eAAO,MAAM,qBAAqB,YAqEjC,CAAC"}
@@ -18,9 +18,11 @@ export const runEclipseJdtLsClient = () => {
18
18
  fileSystemProvider.registerFile(new RegisteredMemoryFile(helloJavaUri, helloJavaCode));
19
19
  registerFileSystemOverlay(1, fileSystemProvider);
20
20
  const userConfig = {
21
+ $type: 'extended',
22
+ htmlContainer: document.getElementById('monaco-editor-root'),
21
23
  logLevel: LogLevel.Debug,
22
24
  vscodeApiConfig: {
23
- userServices: {
25
+ serviceOverrides: {
24
26
  ...getKeybindingsServiceOverride(),
25
27
  },
26
28
  userConfiguration: {
@@ -33,20 +35,16 @@ export const runEclipseJdtLsClient = () => {
33
35
  }
34
36
  },
35
37
  editorAppConfig: {
36
- $type: 'extended',
37
38
  codeResources: {
38
39
  main: {
39
40
  text: helloJavaCode,
40
41
  uri: `${eclipseJdtLsConfig.basePath}/workspace/hello.java`
41
42
  }
42
43
  },
43
- useDiffEditor: false,
44
- monacoWorkerFactory: configureMonacoWorkers,
45
- htmlContainer: document.getElementById('monaco-editor-root')
44
+ monacoWorkerFactory: configureMonacoWorkers
46
45
  },
47
46
  languageClientConfigs: {
48
47
  java: {
49
- languageId: 'java',
50
48
  connection: {
51
49
  options: {
52
50
  $type: 'WebSocketUrl',
@@ -1 +1 @@
1
- {"version":3,"file":"main.js","sourceRoot":"","sources":["../../../src/eclipse.jdt.ls/client/main.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"main.js","sourceRoot":"","sources":["../../../src/eclipse.jdt.ls/client/main.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../../src/groovy/client/main.ts"],"names":[],"mappings":"AAOA,OAAO,mDAAmD,CAAC;AAmD3D,eAAO,MAAM,eAAe,YAa3B,CAAC"}
1
+ {"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../../src/groovy/client/main.ts"],"names":[],"mappings":"AAOA,OAAO,mDAAmD,CAAC;AAoD3D,eAAO,MAAM,eAAe,YAa3B,CAAC"}
@@ -14,9 +14,11 @@ import java.io.File;
14
14
  File file = new File("E:/Example.txt");
15
15
  `;
16
16
  const userConfig = {
17
+ $type: 'extended',
18
+ htmlContainer: document.getElementById('monaco-editor-root'),
17
19
  logLevel: LogLevel.Debug,
18
20
  vscodeApiConfig: {
19
- userServices: {
21
+ serviceOverrides: {
20
22
  ...getKeybindingsServiceOverride(),
21
23
  },
22
24
  userConfiguration: {
@@ -29,20 +31,19 @@ const userConfig = {
29
31
  }
30
32
  },
31
33
  editorAppConfig: {
32
- $type: 'extended',
33
34
  codeResources: {
34
35
  main: {
35
36
  text: code,
36
37
  fileExt: 'groovy'
37
38
  }
38
39
  },
39
- useDiffEditor: false,
40
- monacoWorkerFactory: configureMonacoWorkers,
41
- htmlContainer: document.getElementById('monaco-editor-root')
40
+ monacoWorkerFactory: configureMonacoWorkers
42
41
  },
43
42
  languageClientConfigs: {
44
43
  groovy: {
45
- languageId: 'groovy',
44
+ clientOptions: {
45
+ documentSelector: ['groovy']
46
+ },
46
47
  connection: {
47
48
  options: {
48
49
  $type: 'WebSocketUrl',
@@ -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,iBAAiB,CAAC;AAC3C,OAAO,EAAE,iCAAiC,EAAiB,MAAM,uBAAuB,CAAC;AACzF,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AAEtE,MAAM,IAAI,GAAG;;;CAGZ,CAAC;AAEF,MAAM,UAAU,GAAkB;IAC9B,QAAQ,EAAE,QAAQ,CAAC,KAAK;IACxB,eAAe,EAAE;QACb,YAAY,EAAE;YACV,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,KAAK,EAAE,UAAU;QACjB,aAAa,EAAE;YACX,IAAI,EAAE;gBACF,IAAI,EAAE,IAAI;gBACV,OAAO,EAAE,QAAQ;aACpB;SACJ;QACD,aAAa,EAAE,KAAK;QACpB,mBAAmB,EAAE,sBAAsB;QAC3C,aAAa,EAAE,QAAQ,CAAC,cAAc,CAAC,oBAAoB,CAAE;KAChE;IACD,qBAAqB,EAAE;QACnB,MAAM,EAAE;YACJ,UAAU,EAAE,QAAQ;YACpB,UAAU,EAAE;gBACR,OAAO,EAAE;oBACL,KAAK,EAAE,cAAc;oBACrB,GAAG,EAAE,kBAAkB,YAAY,CAAC,IAAI,GAAG,YAAY,CAAC,IAAI,EAAE;iBACjE;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,UAAU,CAAC,CAAC;QAC3C,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
+ {"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,iBAAiB,CAAC;AAC3C,OAAO,EAAE,iCAAiC,EAAiB,MAAM,uBAAuB,CAAC;AACzF,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AAEtE,MAAM,IAAI,GAAG;;;CAGZ,CAAC;AAEF,MAAM,UAAU,GAAkB;IAC9B,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,IAAI,EAAE;gBACF,IAAI,EAAE,IAAI;gBACV,OAAO,EAAE,QAAQ;aACpB;SACJ;QACD,mBAAmB,EAAE,sBAAsB;KAC9C;IACD,qBAAqB,EAAE;QACnB,MAAM,EAAE;YACJ,aAAa,EAAE;gBACX,gBAAgB,EAAE,CAAC,QAAQ,CAAC;aAC/B;YACD,UAAU,EAAE;gBACR,OAAO,EAAE;oBACL,KAAK,EAAE,cAAc;oBACrB,GAAG,EAAE,kBAAkB,YAAY,CAAC,IAAI,GAAG,YAAY,CAAC,IAAI,EAAE;iBACjE;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,UAAU,CAAC,CAAC;QAC3C,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.d.ts","sourceRoot":"","sources":["../../../src/json/client/wrapperWs.ts"],"names":[],"mappings":"AAOA,OAAO,iDAAiD,CAAC;AAEzD,OAAO,EAAqC,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAQzF,eAAO,MAAM,yBAAyB,WAAY;IAC9C,aAAa,EAAE,WAAW,CAAA;CAC7B,KAAG,aAqDH,CAAC;AAEF,eAAO,MAAM,cAAc,YAgB1B,CAAC"}
1
+ {"version":3,"file":"wrapperWs.d.ts","sourceRoot":"","sources":["../../../src/json/client/wrapperWs.ts"],"names":[],"mappings":"AAOA,OAAO,iDAAiD,CAAC;AAEzD,OAAO,EAAqC,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAQzF,eAAO,MAAM,yBAAyB,WAAY;IAC9C,aAAa,EAAE,WAAW,CAAA;CAC7B,KAAG,aAsDH,CAAC;AAEF,eAAO,MAAM,cAAc,YAgB1B,CAAC"}
@@ -14,9 +14,11 @@ const text = `{
14
14
  }`;
15
15
  export const buildJsonClientUserConfig = (params) => {
16
16
  return {
17
+ $type: 'extended',
18
+ htmlContainer: params.htmlContainer,
17
19
  logLevel: LogLevel.Debug,
18
20
  vscodeApiConfig: {
19
- userServices: {
21
+ serviceOverrides: {
20
22
  ...getKeybindingsServiceOverride(),
21
23
  },
22
24
  userConfiguration: {
@@ -30,20 +32,19 @@ export const buildJsonClientUserConfig = (params) => {
30
32
  }
31
33
  },
32
34
  editorAppConfig: {
33
- $type: 'extended',
34
35
  codeResources: {
35
36
  main: {
36
37
  text,
37
38
  fileExt: 'json'
38
39
  }
39
40
  },
40
- useDiffEditor: false,
41
- monacoWorkerFactory: configureMonacoWorkers,
42
- htmlContainer: params.htmlContainer
41
+ monacoWorkerFactory: configureMonacoWorkers
43
42
  },
44
43
  languageClientConfigs: {
45
44
  json: {
46
- languageId: 'json',
45
+ clientOptions: {
46
+ documentSelector: ['json']
47
+ },
47
48
  connection: {
48
49
  options: {
49
50
  $type: 'WebSocketUrl',
@@ -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,iBAAiB,CAAC;AAC3C,OAAO,EAAE,iCAAiC,EAAiB,MAAM,uBAAuB,CAAC;AACzF,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AAEtE,MAAM,IAAI,GAAG;;;EAGX,CAAC;AAEH,MAAM,CAAC,MAAM,yBAAyB,GAAG,CAAC,MAEzC,EAAiB,EAAE;IAChB,OAAO;QACH,QAAQ,EAAE,QAAQ,CAAC,KAAK;QACxB,eAAe,EAAE;YACb,YAAY,EAAE;gBACV,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,KAAK,EAAE,UAAU;YACjB,aAAa,EAAE;gBACX,IAAI,EAAE;oBACF,IAAI;oBACJ,OAAO,EAAE,MAAM;iBAClB;aACJ;YACD,aAAa,EAAE,KAAK;YACpB,mBAAmB,EAAE,sBAAsB;YAC3C,aAAa,EAAE,MAAM,CAAC,aAAa;SACtC;QACD,qBAAqB,EAAE;YACnB,IAAI,EAAE;gBACF,UAAU,EAAE,MAAM;gBAClB,UAAU,EAAE;oBACR,OAAO,EAAE;wBACL,KAAK,EAAE,cAAc;wBACrB,GAAG,EAAE,mCAAmC;wBACxC,YAAY,EAAE;4BACV,MAAM,EAAE,GAAG,EAAE;gCACT,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC;4BACxC,CAAC;4BACD,YAAY,EAAE,IAAI;yBACrB;wBACD,WAAW,EAAE;4BACT,MAAM,EAAE,GAAG,EAAE;gCACT,OAAO,CAAC,GAAG,CAAC,2BAA2B,CAAC,CAAC;4BAC7C,CAAC;4BACD,YAAY,EAAE,IAAI;yBACrB;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;gBACrC,aAAa,EAAE,QAAQ,CAAC,cAAc,CAAC,oBAAoB,CAAE;aAChE,CAAC,CAAC;YACH,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
+ {"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,iBAAiB,CAAC;AAC3C,OAAO,EAAE,iCAAiC,EAAiB,MAAM,uBAAuB,CAAC;AACzF,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AAEtE,MAAM,IAAI,GAAG;;;EAGX,CAAC;AAEH,MAAM,CAAC,MAAM,yBAAyB,GAAG,CAAC,MAEzC,EAAiB,EAAE;IAChB,OAAO;QACH,KAAK,EAAE,UAAU;QACjB,aAAa,EAAE,MAAM,CAAC,aAAa;QACnC,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,IAAI,EAAE;oBACF,IAAI;oBACJ,OAAO,EAAE,MAAM;iBAClB;aACJ;YACD,mBAAmB,EAAE,sBAAsB;SAC9C;QACD,qBAAqB,EAAE;YACnB,IAAI,EAAE;gBACF,aAAa,EAAE;oBACX,gBAAgB,EAAE,CAAC,MAAM,CAAC;iBAC7B;gBACD,UAAU,EAAE;oBACR,OAAO,EAAE;wBACL,KAAK,EAAE,cAAc;wBACrB,GAAG,EAAE,mCAAmC;wBACxC,YAAY,EAAE;4BACV,MAAM,EAAE,GAAG,EAAE;gCACT,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC;4BACxC,CAAC;4BACD,YAAY,EAAE,IAAI;yBACrB;wBACD,WAAW,EAAE;4BACT,MAAM,EAAE,GAAG,EAAE;gCACT,OAAO,CAAC,GAAG,CAAC,2BAA2B,CAAC,CAAC;4BAC7C,CAAC;4BACD,YAAY,EAAE,IAAI;yBACrB;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;gBACrC,aAAa,EAAE,QAAQ,CAAC,cAAc,CAAC,oBAAoB,CAAE;aAChE,CAAC,CAAC;YACH,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 +1 @@
1
- {"version":3,"file":"classicConfig.d.ts","sourceRoot":"","sources":["../../../../src/langium/langium-dsl/config/classicConfig.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAMtD,eAAO,MAAM,yBAAyB,QAAa,OAAO,CAAC,aAAa,CAgDvE,CAAC"}
1
+ {"version":3,"file":"classicConfig.d.ts","sourceRoot":"","sources":["../../../../src/langium/langium-dsl/config/classicConfig.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAMtD,eAAO,MAAM,yBAAyB,QAAa,OAAO,CAAC,aAAa,CAiDvE,CAAC"}
@@ -12,15 +12,16 @@ import code from '../../../../resources/langium/langium-dsl/example.langium?raw'
12
12
  export const setupLangiumClientClassic = async () => {
13
13
  const langiumWorker = loadLangiumWorker();
14
14
  return {
15
+ $type: 'classic',
16
+ htmlContainer: document.getElementById('monaco-editor-root'),
15
17
  logLevel: LogLevel.Debug,
16
18
  vscodeApiConfig: {
17
- userServices: {
19
+ serviceOverrides: {
18
20
  ...getConfigurationServiceOverride(),
19
21
  ...getKeybindingsServiceOverride()
20
22
  }
21
23
  },
22
24
  editorAppConfig: {
23
- $type: 'classic',
24
25
  codeResources: {
25
26
  main: {
26
27
  text: code,
@@ -28,7 +29,6 @@ export const setupLangiumClientClassic = async () => {
28
29
  enforceLanguageId: 'langium'
29
30
  }
30
31
  },
31
- useDiffEditor: false,
32
32
  editorOptions: {
33
33
  'semanticHighlighting.enabled': true,
34
34
  wordBasedSuggestions: 'off',
@@ -42,12 +42,13 @@ export const setupLangiumClientClassic = async () => {
42
42
  useWorkerFactory({
43
43
  logger
44
44
  });
45
- },
46
- htmlContainer: document.getElementById('monaco-editor-root')
45
+ }
47
46
  },
48
47
  languageClientConfigs: {
49
48
  langium: {
50
- languageId: 'langium',
49
+ clientOptions: {
50
+ documentSelector: ['langium']
51
+ },
51
52
  connection: {
52
53
  options: {
53
54
  $type: 'WorkerDirect',
@@ -1 +1 @@
1
- {"version":3,"file":"classicConfig.js","sourceRoot":"","sources":["../../../../src/langium/langium-dsl/config/classicConfig.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,OAAO,+BAA+B,MAAM,yDAAyD,CAAC;AACtG,OAAO,6BAA6B,MAAM,uDAAuD,CAAC;AAClG,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAG3C,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AACvE,OAAO,IAAI,MAAM,+DAA+D,CAAC;AAEjF,MAAM,CAAC,MAAM,yBAAyB,GAAG,KAAK,IAA4B,EAAE;IACxE,MAAM,aAAa,GAAG,iBAAiB,EAAE,CAAC;IAC1C,OAAO;QACH,QAAQ,EAAE,QAAQ,CAAC,KAAK;QACxB,eAAe,EAAE;YACb,YAAY,EAAE;gBACV,GAAG,+BAA+B,EAAE;gBACpC,GAAG,6BAA6B,EAAE;aACrC;SACJ;QACD,eAAe,EAAE;YACb,KAAK,EAAE,SAAS;YAChB,aAAa,EAAE;gBACX,IAAI,EAAE;oBACF,IAAI,EAAE,IAAI;oBACV,OAAO,EAAE,SAAS;oBAClB,iBAAiB,EAAE,SAAS;iBAC/B;aACJ;YACD,aAAa,EAAE,KAAK;YACpB,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,MAAM;iBACT,CAAC,CAAC;YACP,CAAC;YACD,aAAa,EAAE,QAAQ,CAAC,cAAc,CAAC,oBAAoB,CAAE;SAChE;QACD,qBAAqB,EAAE;YACnB,OAAO,EAAE;gBACL,UAAU,EAAE,SAAS;gBACrB,UAAU,EAAE;oBACR,OAAO,EAAE;wBACL,KAAK,EAAE,cAAc;wBACrB,MAAM,EAAE,aAAa;qBACxB;iBACJ;aACJ;SACJ;KACJ,CAAC;AACN,CAAC,CAAC"}
1
+ {"version":3,"file":"classicConfig.js","sourceRoot":"","sources":["../../../../src/langium/langium-dsl/config/classicConfig.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,OAAO,+BAA+B,MAAM,yDAAyD,CAAC;AACtG,OAAO,6BAA6B,MAAM,uDAAuD,CAAC;AAClG,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAG3C,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AACvE,OAAO,IAAI,MAAM,+DAA+D,CAAC;AAEjF,MAAM,CAAC,MAAM,yBAAyB,GAAG,KAAK,IAA4B,EAAE;IACxE,MAAM,aAAa,GAAG,iBAAiB,EAAE,CAAC;IAC1C,OAAO;QACH,KAAK,EAAE,SAAS;QAChB,aAAa,EAAE,QAAQ,CAAC,cAAc,CAAC,oBAAoB,CAAE;QAC7D,QAAQ,EAAE,QAAQ,CAAC,KAAK;QACxB,eAAe,EAAE;YACb,gBAAgB,EAAE;gBACd,GAAG,+BAA+B,EAAE;gBACpC,GAAG,6BAA6B,EAAE;aACrC;SACJ;QACD,eAAe,EAAE;YACb,aAAa,EAAE;gBACX,IAAI,EAAE;oBACF,IAAI,EAAE,IAAI;oBACV,OAAO,EAAE,SAAS;oBAClB,iBAAiB,EAAE,SAAS;iBAC/B;aACJ;YACD,aAAa,EAAE;gBACX,8BAA8B,EAAE,IAAI;gBACpC,oBAAoB,EAAE,KAAK;gBAC3B,KAAK,EAAE,SAAS;aACnB;YACD,WAAW,EAAE;gBACT,eAAe,EAAE,qBAAqB;gBACtC,uBAAuB,EAAE,EAAE,EAAE,EAAE,SAAS,EAAE;aAC7C;YACD,mBAAmB,EAAE,CAAC,MAAe,EAAE,EAAE;gBACrC,gBAAgB,CAAC;oBACb,MAAM;iBACT,CAAC,CAAC;YACP,CAAC;SACJ;QACD,qBAAqB,EAAE;YACnB,OAAO,EAAE;gBACL,aAAa,EAAE;oBACX,gBAAgB,EAAE,CAAC,SAAS,CAAC;iBAChC;gBACD,UAAU,EAAE;oBACR,OAAO,EAAE;wBACL,KAAK,EAAE,cAAc;wBACrB,MAAM,EAAE,aAAa;qBACxB;iBACJ;aACJ;SACJ;KACJ,CAAC;AACN,CAAC,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"extendedConfig.d.ts","sourceRoot":"","sources":["../../../../src/langium/langium-dsl/config/extendedConfig.ts"],"names":[],"mappings":"AAMA,OAAO,qDAAqD,CAAC;AAI7D,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAOtD,eAAO,MAAM,0BAA0B,QAAa,OAAO,CAAC,aAAa,CA2ExE,CAAC"}
1
+ {"version":3,"file":"extendedConfig.d.ts","sourceRoot":"","sources":["../../../../src/langium/langium-dsl/config/extendedConfig.ts"],"names":[],"mappings":"AAMA,OAAO,qDAAqD,CAAC;AAI7D,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAOtD,eAAO,MAAM,0BAA0B,QAAa,OAAO,CAAC,aAAa,CA4ExE,CAAC"}
@@ -20,9 +20,11 @@ export const setupLangiumClientExtended = async () => {
20
20
  const reader = new BrowserMessageReader(langiumWorker);
21
21
  const writer = new BrowserMessageWriter(langiumWorker);
22
22
  return {
23
+ $type: 'extended',
24
+ htmlContainer: document.getElementById('monaco-editor-root'),
23
25
  logLevel: LogLevel.Debug,
24
26
  vscodeApiConfig: {
25
- userServices: {
27
+ serviceOverrides: {
26
28
  ...getKeybindingsServiceOverride()
27
29
  },
28
30
  userConfiguration: {
@@ -34,45 +36,44 @@ export const setupLangiumClientExtended = async () => {
34
36
  })
35
37
  }
36
38
  },
39
+ extensions: [{
40
+ config: {
41
+ name: 'langium-example',
42
+ publisher: 'TypeFox',
43
+ version: '1.0.0',
44
+ engines: {
45
+ vscode: '*'
46
+ },
47
+ contributes: {
48
+ languages: [{
49
+ id: 'langium',
50
+ extensions: ['.langium'],
51
+ aliases: ['langium', 'LANGIUM'],
52
+ configuration: './langium-configuration.json'
53
+ }],
54
+ grammars: [{
55
+ language: 'langium',
56
+ scopeName: 'source.langium',
57
+ path: './langium-grammar.json'
58
+ }]
59
+ }
60
+ },
61
+ filesOrContents: extensionFilesOrContents
62
+ }],
37
63
  editorAppConfig: {
38
- $type: 'extended',
39
64
  codeResources: {
40
65
  main: {
41
66
  text,
42
67
  fileExt: 'langium'
43
68
  }
44
69
  },
45
- useDiffEditor: false,
46
- extensions: [{
47
- config: {
48
- name: 'langium-example',
49
- publisher: 'TypeFox',
50
- version: '1.0.0',
51
- engines: {
52
- vscode: '*'
53
- },
54
- contributes: {
55
- languages: [{
56
- id: 'langium',
57
- extensions: ['.langium'],
58
- aliases: ['langium', 'LANGIUM'],
59
- configuration: './langium-configuration.json'
60
- }],
61
- grammars: [{
62
- language: 'langium',
63
- scopeName: 'source.langium',
64
- path: './langium-grammar.json'
65
- }]
66
- }
67
- },
68
- filesOrContents: extensionFilesOrContents
69
- }],
70
- monacoWorkerFactory: configureMonacoWorkers,
71
- htmlContainer: document.getElementById('monaco-editor-root')
70
+ monacoWorkerFactory: configureMonacoWorkers
72
71
  },
73
72
  languageClientConfigs: {
74
73
  langium: {
75
- languageId: 'langium',
74
+ clientOptions: {
75
+ documentSelector: ['langium']
76
+ },
76
77
  connection: {
77
78
  options: {
78
79
  $type: 'WorkerDirect',