monaco-languageclient-examples 2024.12.6 → 2025.1.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (63) hide show
  1. package/CHANGELOG.md +5 -0
  2. package/appPlayground.html +1 -3
  3. package/dist/appPlayground/common.d.ts +4 -0
  4. package/dist/appPlayground/common.d.ts.map +1 -0
  5. package/dist/appPlayground/common.js +20 -0
  6. package/dist/appPlayground/common.js.map +1 -0
  7. package/dist/appPlayground/config.d.ts +14 -0
  8. package/dist/appPlayground/config.d.ts.map +1 -0
  9. package/dist/appPlayground/config.js +125 -0
  10. package/dist/appPlayground/config.js.map +1 -0
  11. package/dist/appPlayground/main.d.ts +0 -3
  12. package/dist/appPlayground/main.d.ts.map +1 -1
  13. package/dist/appPlayground/main.js +5 -116
  14. package/dist/appPlayground/main.js.map +1 -1
  15. package/dist/appPlayground/reactLauncher.d.ts +2 -0
  16. package/dist/appPlayground/reactLauncher.d.ts.map +1 -0
  17. package/dist/appPlayground/reactLauncher.js +9 -0
  18. package/dist/appPlayground/reactLauncher.js.map +1 -0
  19. package/dist/appPlayground/reactMain.d.ts +2 -0
  20. package/dist/appPlayground/reactMain.d.ts.map +1 -0
  21. package/dist/appPlayground/reactMain.js +41 -0
  22. package/dist/appPlayground/reactMain.js.map +1 -0
  23. package/dist/bare/client.d.ts.map +1 -1
  24. package/dist/bare/client.js +6 -5
  25. package/dist/bare/client.js.map +1 -1
  26. package/dist/clangd/client/config.d.ts.map +1 -1
  27. package/dist/clangd/client/config.js +2 -1
  28. package/dist/clangd/client/config.js.map +1 -1
  29. package/dist/clangd/client/main.d.ts.map +1 -1
  30. package/dist/clangd/client/main.js +2 -6
  31. package/dist/clangd/client/main.js.map +1 -1
  32. package/dist/eclipse.jdt.ls/client/main.js +2 -2
  33. package/dist/eclipse.jdt.ls/client/main.js.map +1 -1
  34. package/dist/groovy/client/main.js +2 -2
  35. package/dist/groovy/client/main.js.map +1 -1
  36. package/dist/python/client/config.d.ts +1 -1
  37. package/dist/python/client/config.d.ts.map +1 -1
  38. package/dist/python/client/config.js +1 -1
  39. package/dist/python/client/config.js.map +1 -1
  40. package/dist/python/client/main.js +3 -3
  41. package/dist/python/client/main.js.map +1 -1
  42. package/dist/python/client/reactPython.js +2 -2
  43. package/dist/python/client/reactPython.js.map +1 -1
  44. package/ghp_appPlayground.html +2 -3
  45. package/ghp_react_appPlayground.html +25 -0
  46. package/ghp_react_statemachine.html +1 -1
  47. package/index.html +2 -0
  48. package/package.json +9 -6
  49. package/react_appPlayground.html +24 -0
  50. package/src/appPlayground/common.ts +28 -0
  51. package/src/appPlayground/config.ts +140 -0
  52. package/src/appPlayground/main.ts +6 -125
  53. package/src/appPlayground/reactLauncher.ts +10 -0
  54. package/src/appPlayground/reactMain.tsx +50 -0
  55. package/src/bare/client.ts +6 -6
  56. package/src/clangd/client/config.ts +2 -1
  57. package/src/clangd/client/main.ts +2 -7
  58. package/src/eclipse.jdt.ls/client/main.ts +2 -2
  59. package/src/groovy/client/main.ts +2 -2
  60. package/src/python/client/config.ts +1 -1
  61. package/src/python/client/main.ts +3 -3
  62. package/src/python/client/reactPython.tsx +2 -2
  63. package/vite.production.base.ts +1 -0
package/CHANGELOG.md CHANGED
@@ -2,6 +2,11 @@
2
2
 
3
3
  All notable changes to this npm module are documented in this file.
4
4
 
5
+ ## [2025.1.1] - 2025-01-10
6
+
7
+ - Updated to `monaco-languageclient@9.1.0`, `monaco-editor-wrapper@6.1.0` and `@typefox/monaco-editor-react@6.1.0`.
8
+ - Added a react version of the app playground to verify PR "`@typefox/monaco-editor-react` now works with views service" [#823](https://github.com/TypeFox/monaco-languageclient/pull/823)
9
+
5
10
  ## [2024.12.6] - 2024-12-18
6
11
 
7
12
  - Use final release of `monaco-languageclient@9.0.0`, `vscode-ws-jsonrpc@3.4.0`, `monaco-editor-wrapper@6.0.0` and `@typefox/monaco-editor-react@6.0.0`.
@@ -11,9 +11,7 @@
11
11
 
12
12
  <body>
13
13
  <div class="exampleHeadelineDiv">
14
- <b class="exampleHeadeline">Application Playground</b> - [<a href="../../index.html">Back to Index</a>]
15
- <br>
16
- <b>Heads up:</b> This is a prototype and still evolving.
14
+ <b class="exampleHeadeline">Application Playground</b> - [<a href="../../index.html">Back to Index</a>] <b>Heads up:</b> This is a prototype and still evolving.
17
15
  </div>
18
16
  <script type="module" rel="modulepreload" src="./src/appPlayground/launcher"></script>
19
17
  </body>
@@ -0,0 +1,4 @@
1
+ import { MonacoEditorLanguageClientWrapper } from 'monaco-editor-wrapper';
2
+ import { ConfigResult } from './config.js';
3
+ export declare const configurePostStart: (wrapper: MonacoEditorLanguageClientWrapper, configResult: ConfigResult) => Promise<void>;
4
+ //# sourceMappingURL=common.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../src/appPlayground/common.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,iCAAiC,EAAE,MAAM,uBAAuB,CAAC;AAC1E,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE3C,eAAO,MAAM,kBAAkB,YAAmB,iCAAiC,gBAAgB,YAAY,kBAiB9G,CAAC"}
@@ -0,0 +1,20 @@
1
+ /* --------------------------------------------------------------------------------------------
2
+ * Copyright (c) 2024 TypeFox and others.
3
+ * Licensed under the MIT License. See LICENSE in the package root for license information.
4
+ * ------------------------------------------------------------------------------------------ */
5
+ import * as vscode from 'vscode';
6
+ export const configurePostStart = async (wrapper, configResult) => {
7
+ const result = wrapper.getExtensionRegisterResult('mlc-app-playground');
8
+ result.setAsDefaultApi();
9
+ // WA: Force show explorer and not search
10
+ // await vscode.commands.executeCommand('workbench.view.explorer');
11
+ await Promise.all([
12
+ await vscode.workspace.openTextDocument(configResult.helloTsUri),
13
+ await vscode.workspace.openTextDocument(configResult.testerTsUri)
14
+ ]);
15
+ await Promise.all([
16
+ await vscode.window.showTextDocument(configResult.helloTsUri)
17
+ ]);
18
+ console.log('Application Playground started');
19
+ };
20
+ //# sourceMappingURL=common.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"common.js","sourceRoot":"","sources":["../../src/appPlayground/common.ts"],"names":[],"mappings":"AAAA;;;+FAG+F;AAE/F,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AAKjC,MAAM,CAAC,MAAM,kBAAkB,GAAG,KAAK,EAAE,OAA0C,EAAE,YAA0B,EAAE,EAAE;IAC/G,MAAM,MAAM,GAAG,OAAO,CAAC,0BAA0B,CAAC,oBAAoB,CAAwC,CAAC;IAC/G,MAAM,CAAC,eAAe,EAAE,CAAC;IAEzB,yCAAyC;IACzC,mEAAmE;IAEnE,MAAM,OAAO,CAAC,GAAG,CAAC;QACd,MAAM,MAAM,CAAC,SAAS,CAAC,gBAAgB,CAAC,YAAY,CAAC,UAAU,CAAC;QAChE,MAAM,MAAM,CAAC,SAAS,CAAC,gBAAgB,CAAC,YAAY,CAAC,WAAW,CAAC;KACpE,CAAC,CAAC;IAEH,MAAM,OAAO,CAAC,GAAG,CAAC;QACd,MAAM,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC,YAAY,CAAC,UAAU,CAAC;KAChE,CAAC,CAAC;IAEH,OAAO,CAAC,GAAG,CAAC,gCAAgC,CAAC,CAAC;AAClD,CAAC,CAAC"}
@@ -0,0 +1,14 @@
1
+ import * as vscode from 'vscode';
2
+ import '@codingame/monaco-vscode-typescript-basics-default-extension';
3
+ import '@codingame/monaco-vscode-typescript-language-features-default-extension';
4
+ import '@codingame/monaco-vscode-search-result-default-extension';
5
+ import '../../resources/vsix/open-collaboration-tools.vsix';
6
+ import { WrapperConfig } from 'monaco-editor-wrapper';
7
+ export type ConfigResult = {
8
+ wrapperConfig: WrapperConfig;
9
+ workspaceFile: vscode.Uri;
10
+ helloTsUri: vscode.Uri;
11
+ testerTsUri: vscode.Uri;
12
+ };
13
+ export declare const configure: (htmlContainer?: HTMLElement) => ConfigResult;
14
+ //# sourceMappingURL=config.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/appPlayground/config.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AAkBjC,OAAO,8DAA8D,CAAC;AACtE,OAAO,yEAAyE,CAAC;AACjF,OAAO,0DAA0D,CAAC;AAElE,OAAO,oDAAoD,CAAC;AAM5D,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAGtD,MAAM,MAAM,YAAY,GAAG;IACvB,aAAa,EAAE,aAAa,CAAA;IAC5B,aAAa,EAAE,MAAM,CAAC,GAAG,CAAC;IAC1B,UAAU,EAAE,MAAM,CAAC,GAAG,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC,GAAG,CAAC;CAC3B,CAAC;AAEF,eAAO,MAAM,SAAS,mBAAoB,WAAW,KAAG,YAgGvD,CAAC"}
@@ -0,0 +1,125 @@
1
+ /* --------------------------------------------------------------------------------------------
2
+ * Copyright (c) 2024 TypeFox and others.
3
+ * Licensed under the MIT License. See LICENSE in the package root for license information.
4
+ * ------------------------------------------------------------------------------------------ */
5
+ import * as vscode from 'vscode';
6
+ import { LogLevel } from 'vscode/services';
7
+ import { RegisteredFileSystemProvider, registerFileSystemOverlay, RegisteredMemoryFile } from '@codingame/monaco-vscode-files-service-override';
8
+ import getConfigurationServiceOverride from '@codingame/monaco-vscode-configuration-service-override';
9
+ import getKeybindingsServiceOverride from '@codingame/monaco-vscode-keybindings-service-override';
10
+ import getLifecycleServiceOverride from '@codingame/monaco-vscode-lifecycle-service-override';
11
+ import getLocalizationServiceOverride from '@codingame/monaco-vscode-localization-service-override';
12
+ import getBannerServiceOverride from '@codingame/monaco-vscode-view-banner-service-override';
13
+ import getStatusBarServiceOverride from '@codingame/monaco-vscode-view-status-bar-service-override';
14
+ import getTitleBarServiceOverride from '@codingame/monaco-vscode-view-title-bar-service-override';
15
+ import getExplorerServiceOverride from '@codingame/monaco-vscode-explorer-service-override';
16
+ import getRemoteAgentServiceOverride from '@codingame/monaco-vscode-remote-agent-service-override';
17
+ import getEnvironmentServiceOverride from '@codingame/monaco-vscode-environment-service-override';
18
+ import getSecretStorageServiceOverride from '@codingame/monaco-vscode-secret-storage-service-override';
19
+ import getStorageServiceOverride from '@codingame/monaco-vscode-storage-service-override';
20
+ import getSearchServiceOverride from '@codingame/monaco-vscode-search-service-override';
21
+ // this is required syntax highlighting
22
+ import '@codingame/monaco-vscode-typescript-basics-default-extension';
23
+ import '@codingame/monaco-vscode-typescript-language-features-default-extension';
24
+ import '@codingame/monaco-vscode-search-result-default-extension';
25
+ import '../../resources/vsix/open-collaboration-tools.vsix';
26
+ import { createDefaultLocaleConfiguration } from 'monaco-languageclient/vscode/services';
27
+ import { configureMonacoWorkers, createDefaultWorkspaceFile } from '../common/client/utils.js';
28
+ import helloTsCode from '../../resources/appPlayground/hello.ts?raw';
29
+ import testerTsCode from '../../resources/appPlayground/tester.ts?raw';
30
+ import { defaultHtmlAugmentationInstructions, defaultViewsInit } from 'monaco-editor-wrapper/vscode/services';
31
+ export const configure = (htmlContainer) => {
32
+ const workspaceFile = vscode.Uri.file('/workspace/.vscode/workspace.code-workspace');
33
+ const wrapperConfig = {
34
+ $type: 'extended',
35
+ id: 'AAP',
36
+ logLevel: LogLevel.Debug,
37
+ htmlContainer,
38
+ vscodeApiConfig: {
39
+ serviceOverrides: {
40
+ ...getConfigurationServiceOverride(),
41
+ ...getKeybindingsServiceOverride(),
42
+ ...getLifecycleServiceOverride(),
43
+ ...getLocalizationServiceOverride(createDefaultLocaleConfiguration()),
44
+ ...getBannerServiceOverride(),
45
+ ...getStatusBarServiceOverride(),
46
+ ...getTitleBarServiceOverride(),
47
+ ...getExplorerServiceOverride(),
48
+ ...getRemoteAgentServiceOverride(),
49
+ ...getEnvironmentServiceOverride(),
50
+ ...getSecretStorageServiceOverride(),
51
+ ...getStorageServiceOverride(),
52
+ ...getSearchServiceOverride()
53
+ },
54
+ enableExtHostWorker: true,
55
+ viewsConfig: {
56
+ viewServiceType: 'ViewsService',
57
+ htmlAugmentationInstructions: defaultHtmlAugmentationInstructions,
58
+ viewsInitFunc: defaultViewsInit
59
+ },
60
+ workspaceConfig: {
61
+ enableWorkspaceTrust: true,
62
+ windowIndicator: {
63
+ label: 'mlc-app-playground',
64
+ tooltip: '',
65
+ command: ''
66
+ },
67
+ workspaceProvider: {
68
+ trusted: true,
69
+ async open() {
70
+ window.open(window.location.href);
71
+ return true;
72
+ },
73
+ workspace: {
74
+ workspaceUri: workspaceFile
75
+ }
76
+ },
77
+ configurationDefaults: {
78
+ 'window.title': 'mlc-app-playground${separator}${dirty}${activeEditorShort}'
79
+ },
80
+ productConfiguration: {
81
+ nameShort: 'mlc-app-playground',
82
+ nameLong: 'mlc-app-playground'
83
+ }
84
+ },
85
+ userConfiguration: {
86
+ json: JSON.stringify({
87
+ 'workbench.colorTheme': 'Default Dark Modern',
88
+ 'editor.wordBasedSuggestions': 'off',
89
+ 'typescript.tsserver.web.projectWideIntellisense.enabled': true,
90
+ 'typescript.tsserver.web.projectWideIntellisense.suppressSemanticErrors': false,
91
+ 'editor.guides.bracketPairsHorizontal': true,
92
+ 'oct.serverUrl': 'https://api.open-collab.tools/',
93
+ 'editor.experimental.asyncTokenization': false
94
+ })
95
+ },
96
+ },
97
+ extensions: [{
98
+ config: {
99
+ name: 'mlc-app-playground',
100
+ publisher: 'TypeFox',
101
+ version: '1.0.0',
102
+ engines: {
103
+ vscode: '*'
104
+ }
105
+ }
106
+ }],
107
+ editorAppConfig: {
108
+ monacoWorkerFactory: configureMonacoWorkers
109
+ }
110
+ };
111
+ const helloTsUri = vscode.Uri.file('/workspace/hello.ts');
112
+ const testerTsUri = vscode.Uri.file('/workspace/tester.ts');
113
+ const fileSystemProvider = new RegisteredFileSystemProvider(false);
114
+ fileSystemProvider.registerFile(new RegisteredMemoryFile(helloTsUri, helloTsCode));
115
+ fileSystemProvider.registerFile(new RegisteredMemoryFile(testerTsUri, testerTsCode));
116
+ fileSystemProvider.registerFile(createDefaultWorkspaceFile(workspaceFile, '/workspace'));
117
+ registerFileSystemOverlay(1, fileSystemProvider);
118
+ return {
119
+ wrapperConfig,
120
+ workspaceFile,
121
+ helloTsUri,
122
+ testerTsUri
123
+ };
124
+ };
125
+ //# sourceMappingURL=config.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/appPlayground/config.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,2 @@
1
- import '@codingame/monaco-vscode-typescript-basics-default-extension';
2
- import '@codingame/monaco-vscode-typescript-language-features-default-extension';
3
- import '../../resources/vsix/open-collaboration-tools.vsix';
4
1
  export declare const runApplicationPlayground: () => Promise<void>;
5
2
  //# sourceMappingURL=main.d.ts.map
@@ -1 +1 @@
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"}
1
+ {"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../src/appPlayground/main.ts"],"names":[],"mappings":"AAWA,eAAO,MAAM,wBAAwB,qBAIpC,CAAC"}
@@ -2,124 +2,13 @@
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 * as vscode from 'vscode';
6
- import { LogLevel } from 'vscode/services';
7
- import getConfigurationServiceOverride from '@codingame/monaco-vscode-configuration-service-override';
8
- import getKeybindingsServiceOverride from '@codingame/monaco-vscode-keybindings-service-override';
9
- import getLifecycleServiceOverride from '@codingame/monaco-vscode-lifecycle-service-override';
10
- import getLocalizationServiceOverride from '@codingame/monaco-vscode-localization-service-override';
11
- import getBannerServiceOverride from '@codingame/monaco-vscode-view-banner-service-override';
12
- import getStatusBarServiceOverride from '@codingame/monaco-vscode-view-status-bar-service-override';
13
- import getTitleBarServiceOverride from '@codingame/monaco-vscode-view-title-bar-service-override';
14
- import getExplorerServiceOverride from '@codingame/monaco-vscode-explorer-service-override';
15
- import { RegisteredFileSystemProvider, registerFileSystemOverlay, RegisteredMemoryFile } from '@codingame/monaco-vscode-files-service-override';
16
- import getRemoteAgentServiceOverride from '@codingame/monaco-vscode-remote-agent-service-override';
17
- import getEnvironmentServiceOverride from '@codingame/monaco-vscode-environment-service-override';
18
- import getSecretStorageServiceOverride from '@codingame/monaco-vscode-secret-storage-service-override';
19
- // this is required syntax highlighting
20
- import '@codingame/monaco-vscode-typescript-basics-default-extension';
21
- import '@codingame/monaco-vscode-typescript-language-features-default-extension';
22
- import '../../resources/vsix/open-collaboration-tools.vsix';
23
5
  import { MonacoEditorLanguageClientWrapper } from 'monaco-editor-wrapper';
24
- import { createDefaultLocaleConfiguration } from 'monaco-languageclient/vscode/services';
25
- import { configureMonacoWorkers, createDefaultWorkspaceFile } from '../common/client/utils.js';
26
- import helloTsCode from '../../resources/appPlayground/hello.ts?raw';
27
- import testerTsCode from '../../resources/appPlayground/tester.ts?raw';
28
- import { defaultViewsHtml, defaultViewsInit } from 'monaco-editor-wrapper/vscode/services';
6
+ import { configure } from './config.js';
7
+ import { configurePostStart } from './common.js';
29
8
  const wrapper = new MonacoEditorLanguageClientWrapper();
30
9
  export const runApplicationPlayground = async () => {
31
- const workspaceFile = vscode.Uri.file('/workspace/.vscode/workspace.code-workspace');
32
- const wrapperConfig = {
33
- $type: 'extended',
34
- id: 'AAP',
35
- logLevel: LogLevel.Debug,
36
- htmlContainer: document.body,
37
- vscodeApiConfig: {
38
- serviceOverrides: {
39
- ...getConfigurationServiceOverride(),
40
- ...getKeybindingsServiceOverride(),
41
- ...getLifecycleServiceOverride(),
42
- ...getLocalizationServiceOverride(createDefaultLocaleConfiguration()),
43
- ...getBannerServiceOverride(),
44
- ...getStatusBarServiceOverride(),
45
- ...getTitleBarServiceOverride(),
46
- ...getExplorerServiceOverride(),
47
- ...getRemoteAgentServiceOverride(),
48
- ...getEnvironmentServiceOverride(),
49
- ...getSecretStorageServiceOverride()
50
- },
51
- enableExtHostWorker: true,
52
- viewsConfig: {
53
- viewServiceType: 'ViewsService',
54
- viewsInitFunc: defaultViewsInit
55
- },
56
- workspaceConfig: {
57
- enableWorkspaceTrust: true,
58
- windowIndicator: {
59
- label: 'mlc-app-playground',
60
- tooltip: '',
61
- command: ''
62
- },
63
- workspaceProvider: {
64
- trusted: true,
65
- async open() {
66
- window.open(window.location.href);
67
- return true;
68
- },
69
- workspace: {
70
- workspaceUri: workspaceFile
71
- }
72
- },
73
- configurationDefaults: {
74
- 'window.title': 'mlc-app-playground${separator}${dirty}${activeEditorShort}'
75
- },
76
- productConfiguration: {
77
- nameShort: 'mlc-app-playground',
78
- nameLong: 'mlc-app-playground'
79
- }
80
- },
81
- userConfiguration: {
82
- json: JSON.stringify({
83
- 'workbench.colorTheme': 'Default Dark Modern',
84
- 'editor.wordBasedSuggestions': 'off',
85
- 'typescript.tsserver.web.projectWideIntellisense.enabled': true,
86
- 'typescript.tsserver.web.projectWideIntellisense.suppressSemanticErrors': false,
87
- 'editor.guides.bracketPairsHorizontal': true,
88
- 'oct.serverUrl': 'https://api.open-collab.tools/',
89
- 'editor.experimental.asyncTokenization': false
90
- })
91
- },
92
- },
93
- extensions: [{
94
- config: {
95
- name: 'mlc-app-playground',
96
- publisher: 'TypeFox',
97
- version: '1.0.0',
98
- engines: {
99
- vscode: '*'
100
- }
101
- }
102
- }],
103
- editorAppConfig: {
104
- monacoWorkerFactory: configureMonacoWorkers
105
- }
106
- };
107
- const htmlContainer = document.createElement('div', { is: 'app' });
108
- htmlContainer.innerHTML = defaultViewsHtml;
109
- document.body.append(htmlContainer);
110
- const helloTsUri = vscode.Uri.file('/workspace/hello.ts');
111
- const testerTsUri = vscode.Uri.file('/workspace/tester.ts');
112
- const fileSystemProvider = new RegisteredFileSystemProvider(false);
113
- fileSystemProvider.registerFile(new RegisteredMemoryFile(helloTsUri, helloTsCode));
114
- fileSystemProvider.registerFile(new RegisteredMemoryFile(testerTsUri, testerTsCode));
115
- fileSystemProvider.registerFile(createDefaultWorkspaceFile(workspaceFile, '/workspace'));
116
- registerFileSystemOverlay(1, fileSystemProvider);
117
- await wrapper.init(wrapperConfig);
118
- const result = wrapper.getExtensionRegisterResult('mlc-app-playground');
119
- result.setAsDefaultApi();
120
- await Promise.all([
121
- await vscode.window.showTextDocument(helloTsUri),
122
- await vscode.window.showTextDocument(testerTsUri, { viewColumn: vscode.ViewColumn.Two })
123
- ]);
10
+ const configResult = configure(document.body);
11
+ await wrapper.init(configResult.wrapperConfig);
12
+ await configurePostStart(wrapper, configResult);
124
13
  };
125
14
  //# sourceMappingURL=main.js.map
@@ -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":"AAAA;;;gGAGgG;AAEhG,OAAO,EAAE,iCAAiC,EAAE,MAAM,uBAAuB,CAAC;AAC1E,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAEjD,MAAM,OAAO,GAAG,IAAI,iCAAiC,EAAE,CAAC;AAExD,MAAM,CAAC,MAAM,wBAAwB,GAAG,KAAK,IAAI,EAAE;IAC/C,MAAM,YAAY,GAAG,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC9C,MAAM,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;IAC/C,MAAM,kBAAkB,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;AACpD,CAAC,CAAC"}
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=reactLauncher.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"reactLauncher.d.ts","sourceRoot":"","sources":["../../src/appPlayground/reactLauncher.ts"],"names":[],"mappings":""}
@@ -0,0 +1,9 @@
1
+ /* --------------------------------------------------------------------------------------------
2
+ * Copyright (c) 2024 TypeFox and others.
3
+ * Licensed under the MIT License. See LICENSE in the package root for license information.
4
+ * ------------------------------------------------------------------------------------------ */
5
+ import { initLocaleLoader } from 'monaco-editor-wrapper/vscode/locale';
6
+ await initLocaleLoader();
7
+ const { runApplicationPlaygroundReact } = await import('./reactMain.js');
8
+ runApplicationPlaygroundReact();
9
+ //# sourceMappingURL=reactLauncher.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"reactLauncher.js","sourceRoot":"","sources":["../../src/appPlayground/reactLauncher.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,OAAO,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AACvE,MAAM,gBAAgB,EAAE,CAAC;AAEzB,MAAM,EAAE,6BAA6B,EAAE,GAAG,MAAM,MAAM,CAAC,gBAAgB,CAAC,CAAC;AACzE,6BAA6B,EAAE,CAAC"}
@@ -0,0 +1,2 @@
1
+ export declare const runApplicationPlaygroundReact: () => Promise<void>;
2
+ //# sourceMappingURL=reactMain.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"reactMain.d.ts","sourceRoot":"","sources":["../../src/appPlayground/reactMain.tsx"],"names":[],"mappings":"AAYA,eAAO,MAAM,6BAA6B,qBAqCzC,CAAC"}
@@ -0,0 +1,41 @@
1
+ /* --------------------------------------------------------------------------------------------
2
+ * Copyright (c) 2024 TypeFox and others.
3
+ * Licensed under the MIT License. See LICENSE in the package root for license information.
4
+ * ------------------------------------------------------------------------------------------ */
5
+ import React, { StrictMode } from 'react';
6
+ import ReactDOM from 'react-dom/client';
7
+ import { MonacoEditorReactComp } from '@typefox/monaco-editor-react';
8
+ import { configure } from './config.js';
9
+ import { configurePostStart } from './common.js';
10
+ export const runApplicationPlaygroundReact = async () => {
11
+ const onTextChanged = (textChanges) => {
12
+ console.log(`Dirty? ${textChanges.isDirty}\ntext: ${textChanges.modified}\ntextOriginal: ${textChanges.original}`);
13
+ };
14
+ const configResult = configure();
15
+ const root = ReactDOM.createRoot(document.getElementById('react-root'));
16
+ try {
17
+ document.querySelector('#button-start')?.addEventListener('click', async () => {
18
+ const App = () => {
19
+ return (React.createElement("div", { style: { 'backgroundColor': '#1f1f1f' } },
20
+ React.createElement(MonacoEditorReactComp, { wrapperConfig: configResult.wrapperConfig, onTextChanged: onTextChanged, onLoad: async (wrapper) => {
21
+ await configurePostStart(wrapper, configResult);
22
+ }, onError: (e) => {
23
+ console.error(e);
24
+ } })));
25
+ };
26
+ const checkElem = document.getElementById('checkbox-strictmode');
27
+ const strictMode = checkElem?.checked;
28
+ if (strictMode === true) {
29
+ root.render(React.createElement(StrictMode, null,
30
+ React.createElement(App, null)));
31
+ }
32
+ else {
33
+ root.render(React.createElement(App, null));
34
+ }
35
+ });
36
+ }
37
+ catch (e) {
38
+ console.error(e);
39
+ }
40
+ };
41
+ //# sourceMappingURL=reactMain.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"reactMain.js","sourceRoot":"","sources":["../../src/appPlayground/reactMain.tsx"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,OAAO,KAAK,EAAE,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AAC1C,OAAO,QAAQ,MAAM,kBAAkB,CAAC;AAExC,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AACrE,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAEjD,MAAM,CAAC,MAAM,6BAA6B,GAAG,KAAK,IAAI,EAAE;IAEpD,MAAM,aAAa,GAAG,CAAC,WAAwB,EAAE,EAAE;QAC/C,OAAO,CAAC,GAAG,CAAC,UAAU,WAAW,CAAC,OAAO,WAAW,WAAW,CAAC,QAAQ,mBAAmB,WAAW,CAAC,QAAQ,EAAE,CAAC,CAAC;IACvH,CAAC,CAAC;IACF,MAAM,YAAY,GAAG,SAAS,EAAE,CAAC;IACjC,MAAM,IAAI,GAAG,QAAQ,CAAC,UAAU,CAAC,QAAQ,CAAC,cAAc,CAAC,YAAY,CAAE,CAAC,CAAC;IAEzE,IAAI,CAAC;QACD,QAAQ,CAAC,aAAa,CAAC,eAAe,CAAC,EAAE,gBAAgB,CAAC,OAAO,EAAE,KAAK,IAAI,EAAE;YAC1E,MAAM,GAAG,GAAG,GAAG,EAAE;gBACb,OAAO,CACH,6BAAK,KAAK,EAAE,EAAE,iBAAiB,EAAE,SAAS,EAAE;oBACxC,oBAAC,qBAAqB,IAClB,aAAa,EAAE,YAAY,CAAC,aAAa,EACzC,aAAa,EAAE,aAAa,EAC5B,MAAM,EAAE,KAAK,EAAE,OAA0C,EAAE,EAAE;4BACzD,MAAM,kBAAkB,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;wBACpD,CAAC,EACD,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE;4BACX,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;wBACrB,CAAC,GAAI,CACP,CACT,CAAC;YACN,CAAC,CAAC;YAEF,MAAM,SAAS,GAAG,QAAQ,CAAC,cAAc,CAAC,qBAAqB,CAA4B,CAAC;YAC5F,MAAM,UAAU,GAAG,SAAS,EAAE,OAAO,CAAC;YACtC,IAAI,UAAU,KAAK,IAAI,EAAE,CAAC;gBACtB,IAAI,CAAC,MAAM,CAAC,oBAAC,UAAU;oBAAC,oBAAC,GAAG,OAAG,CAAa,CAAC,CAAC;YAClD,CAAC;iBAAM,CAAC;gBACJ,IAAI,CAAC,MAAM,CAAC,oBAAC,GAAG,OAAG,CAAC,CAAC;YACzB,CAAC;QACL,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":"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"}
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;AAI/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"}
@@ -14,21 +14,22 @@ import { WebSocketMessageReader, WebSocketMessageWriter, toSocket } from 'vscode
14
14
  import { CloseAction, ErrorAction } from 'vscode-languageclient/browser.js';
15
15
  import { configureMonacoWorkers } from '../common/client/utils.js';
16
16
  import { ConsoleLogger } from 'monaco-languageclient/tools';
17
- import { updateUserConfiguration } from '@codingame/monaco-vscode-configuration-service-override';
18
17
  export const runClient = async () => {
19
18
  const logger = new ConsoleLogger(LogLevel.Debug);
20
19
  const htmlContainer = document.getElementById('monaco-editor-root');
21
20
  await initServices({
22
21
  serviceOverrides: {
23
22
  ...getConfigurationServiceOverride()
24
- }
23
+ },
24
+ userConfiguration: {
25
+ json: JSON.stringify({
26
+ 'editor.experimental.asyncTokenization': true
27
+ })
28
+ },
25
29
  }, {
26
30
  htmlContainer,
27
31
  logger
28
32
  });
29
- updateUserConfiguration(JSON.stringify({
30
- 'editor.experimental.asyncTokenization': true
31
- }));
32
33
  // register the JSON language with Monaco
33
34
  monaco.languages.register({
34
35
  id: 'json',
@@ -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":"AAAA;;;gGAGgG;AAEhG,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,YAAY,EAAE,MAAM,uCAAuC,CAAC;AACrE,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,wEAAwE;AACxE,uDAAuD;AACvD,OAAO,+BAA+B,MAAM,yDAAyD,CAAC;AACtG,OAAO,iDAAiD,CAAC;AACzD,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,EAAE,sBAAsB,EAAE,sBAAsB,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7F,OAAO,EAAE,WAAW,EAAE,WAAW,EAAqB,MAAM,kCAAkC,CAAC;AAC/F,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AACnE,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAE5D,MAAM,CAAC,MAAM,SAAS,GAAG,KAAK,IAAI,EAAE;IAChC,MAAM,MAAM,GAAG,IAAI,aAAa,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACjD,MAAM,aAAa,GAAG,QAAQ,CAAC,cAAc,CAAC,oBAAoB,CAAE,CAAC;IACrE,MAAM,YAAY,CAAC;QACf,gBAAgB,EAAE;YACd,GAAG,+BAA+B,EAAE;SACvC;QACD,iBAAiB,EAAE;YACf,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;gBACjB,uCAAuC,EAAE,IAAI;aAChD,CAAC;SACL;KACJ,EAAE;QACC,aAAa;QACb,MAAM;KACT,CAAC,CAAC;IAEH,yCAAyC;IACzC,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC;QACtB,EAAE,EAAE,MAAM;QACV,UAAU,EAAE,CAAC,OAAO,EAAE,QAAQ,CAAC;QAC/B,OAAO,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC;QACzB,SAAS,EAAE,CAAC,kBAAkB,CAAC;KAClC,CAAC,CAAC;IAEH,sBAAsB,CAAC,MAAM,CAAC,CAAC;IAE/B,uBAAuB;IACvB,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,aAAa,EAAE;QAChC,KAAK,EAAE;;;EAGb;QACM,QAAQ,EAAE,MAAM;QAChB,eAAe,EAAE,IAAI;QACrB,oBAAoB,EAAE,KAAK;KAC9B,CAAC,CAAC;IACH,2BAA2B,CAAC,mCAAmC,CAAC,CAAC;AACrE,CAAC,CAAC;AAEF,qDAAqD;AACrD,MAAM,CAAC,MAAM,2BAA2B,GAAG,CAAC,GAAW,EAAa,EAAE;IAClE,MAAM,SAAS,GAAG,IAAI,SAAS,CAAC,GAAG,CAAC,CAAC;IACrC,SAAS,CAAC,MAAM,GAAG,GAAG,EAAE;QACpB,MAAM,MAAM,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC;QACnC,MAAM,MAAM,GAAG,IAAI,sBAAsB,CAAC,MAAM,CAAC,CAAC;QAClD,MAAM,MAAM,GAAG,IAAI,sBAAsB,CAAC,MAAM,CAAC,CAAC;QAClD,MAAM,cAAc,GAAG,oBAAoB,CAAC;YACxC,MAAM;YACN,MAAM;SACT,CAAC,CAAC;QACH,cAAc,CAAC,KAAK,EAAE,CAAC;QACvB,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,cAAc,CAAC,IAAI,EAAE,CAAC,CAAC;IAChD,CAAC,CAAC;IACF,OAAO,SAAS,CAAC;AACrB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,iBAAoC,EAAwB,EAAE;IAC/F,OAAO,IAAI,oBAAoB,CAAC;QAC5B,IAAI,EAAE,wBAAwB;QAC9B,aAAa,EAAE;YACX,2CAA2C;YAC3C,gBAAgB,EAAE,CAAC,MAAM,CAAC;YAC1B,oCAAoC;YACpC,YAAY,EAAE;gBACV,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,WAAW,CAAC,QAAQ,EAAE,CAAC;gBAC/C,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,WAAW,CAAC,YAAY,EAAE,CAAC;aACvD;SACJ;QACD,6EAA6E;QAC7E,iBAAiB;KACpB,CAAC,CAAC;AACP,CAAC,CAAC"}
@@ -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,CAiGxB,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,CAkGxB,CAAC"}
@@ -14,7 +14,7 @@ import getEnvironmentServiceOverride from '@codingame/monaco-vscode-environment-
14
14
  import getSecretStorageServiceOverride from '@codingame/monaco-vscode-secret-storage-service-override';
15
15
  import { LogLevel } from 'vscode/services';
16
16
  import { configureMonacoWorkers } from '../../common/client/utils.js';
17
- import { defaultViewsInit } from 'monaco-editor-wrapper/vscode/services';
17
+ import { defaultHtmlAugmentationInstructions, defaultViewsInit } from 'monaco-editor-wrapper/vscode/services';
18
18
  export const createWrapperConfig = async (config) => {
19
19
  return {
20
20
  $type: 'extended',
@@ -60,6 +60,7 @@ export const createWrapperConfig = async (config) => {
60
60
  },
61
61
  viewsConfig: {
62
62
  viewServiceType: 'ViewsService',
63
+ htmlAugmentationInstructions: defaultHtmlAugmentationInstructions,
63
64
  viewsInitFunc: defaultViewsInit
64
65
  },
65
66
  workspaceConfig: {
@@ -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/clangd/client/main.ts"],"names":[],"mappings":"AAQA,OAAO,gDAAgD,CAAC;AAWxD,eAAO,MAAM,gBAAgB,qBA2D5B,CAAC"}
1
+ {"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../../src/clangd/client/main.ts"],"names":[],"mappings":"AAQA,OAAO,gDAAgD,CAAC;AAUxD,eAAO,MAAM,gBAAgB,qBAuD5B,CAAC"}
@@ -10,7 +10,6 @@ import { MonacoEditorLanguageClientWrapper } from 'monaco-editor-wrapper';
10
10
  import { createWrapperConfig } from './config.js';
11
11
  import { ClangdWorkerHandler } from './workerHandler.js';
12
12
  import { MainRemoteMessageChannelFs } from './mainRemoteMessageChannelFs.js';
13
- import { defaultViewsHtml } from 'monaco-editor-wrapper/vscode/services';
14
13
  import { createDefaultWorkspaceFile, disableButton } from '../../common/client/utils.js';
15
14
  import { HOME_DIR, WORKSPACE_PATH } from '../definitions.js';
16
15
  const wrapper = new MonacoEditorLanguageClientWrapper();
@@ -26,18 +25,15 @@ export const runClangdWrapper = async () => {
26
25
  await vscode.window.showTextDocument(resourceUri);
27
26
  };
28
27
  new MainRemoteMessageChannelFs(fileSystemProvider, channelFs.port1, readiness);
29
- const htmlContainer = document.createElement('div', { is: 'app' });
30
- htmlContainer.innerHTML = defaultViewsHtml;
31
- document.body.append(htmlContainer);
32
28
  const clangdWorkerHandler = new ClangdWorkerHandler();
33
- const userConfig = await createWrapperConfig({
29
+ const wrapperConfig = await createWrapperConfig({
34
30
  htmlContainer: document.body,
35
31
  workspaceUri: vscode.Uri.file(WORKSPACE_PATH),
36
32
  workspaceFileUri,
37
33
  clangdWorkerHandler,
38
34
  lsMessageLocalPort: channelLs.port1
39
35
  });
40
- await wrapper.init(userConfig);
36
+ await wrapper.init(wrapperConfig);
41
37
  const initConfig = {
42
38
  lsMessagePort: channelLs.port2,
43
39
  fsMessagePort: channelFs.port2,
@@ -1 +1 @@
1
- {"version":3,"file":"main.js","sourceRoot":"","sources":["../../../src/clangd/client/main.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"main.js","sourceRoot":"","sources":["../../../src/clangd/client/main.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AACjC,OAAO,EAAE,4BAA4B,EAAE,yBAAyB,EAAE,MAAM,iDAAiD,CAAC;AAC1H,uCAAuC;AACvC,OAAO,gDAAgD,CAAC;AACxD,OAAO,EAAE,iCAAiC,EAAE,MAAM,uBAAuB,CAAC;AAC1E,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AACzD,OAAO,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAC7E,OAAO,EAAE,0BAA0B,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AACzF,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAE7D,MAAM,OAAO,GAAG,IAAI,iCAAiC,EAAE,CAAC;AAExD,MAAM,CAAC,MAAM,gBAAgB,GAAG,KAAK,IAAI,EAAE;IACvC,MAAM,SAAS,GAAG,IAAI,cAAc,EAAE,CAAC;IACvC,MAAM,SAAS,GAAG,IAAI,cAAc,EAAE,CAAC;IAEvC,MAAM,kBAAkB,GAAG,IAAI,4BAA4B,CAAC,KAAK,CAAC,CAAC;IACnE,MAAM,gBAAgB,GAAG,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,QAAQ,2BAA2B,CAAC,CAAC;IACjF,kBAAkB,CAAC,YAAY,CAAC,0BAA0B,CAAC,gBAAgB,EAAE,cAAc,CAAC,CAAC,CAAC;IAC9F,yBAAyB,CAAC,CAAC,EAAE,kBAAkB,CAAC,CAAC;IAEjD,MAAM,SAAS,GAAG,KAAK,IAAI,EAAE;QACzB,MAAM,WAAW,GAAG,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,cAAc,WAAW,CAAC,CAAC;QAClE,MAAM,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC;IACtD,CAAC,CAAC;IACF,IAAI,0BAA0B,CAAC,kBAAkB,EAAE,SAAS,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;IAE/E,MAAM,mBAAmB,GAAG,IAAI,mBAAmB,EAAE,CAAC;IACtD,MAAM,aAAa,GAAG,MAAM,mBAAmB,CAAC;QAC5C,aAAa,EAAE,QAAQ,CAAC,IAAI;QAC5B,YAAY,EAAE,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC;QAC7C,gBAAgB;QAChB,mBAAmB;QACnB,kBAAkB,EAAE,SAAS,CAAC,KAAK;KACtC,CAAC,CAAC;IAEH,MAAM,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IAClC,MAAM,UAAU,GAAG;QACf,aAAa,EAAE,SAAS,CAAC,KAAK;QAC9B,aAAa,EAAE,SAAS,CAAC,KAAK;QAC9B,cAAc,EAAE,KAAK;QACrB,mEAAmE;QACnE,sBAAsB,EAAE,KAAK;QAC7B,sBAAsB,EAAE,IAAI,GAAG,CAAC,yCAAyC,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI;KACnG,CAAC;IAEF,MAAM,YAAY,GAAG,KAAK,IAAI,EAAE;QAC5B,MAAM,mBAAmB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAC3C,MAAM,mBAAmB,CAAC,MAAM,EAAE,CAAC;QACnC,MAAM,OAAO,CAAC,oBAAoB,EAAE,CAAC;IACzC,CAAC,CAAC;IAEF,IAAI,CAAC;QACD,QAAQ,CAAC,aAAa,CAAC,eAAe,CAAC,EAAE,gBAAgB,CAAC,OAAO,EAAE,KAAK,IAAI,EAAE;YAC1E,aAAa,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC;YACpC,aAAa,CAAC,oBAAoB,EAAE,IAAI,CAAC,CAAC;YAC1C,MAAM,YAAY,EAAE,CAAC;QACzB,CAAC,CAAC,CAAC;QACH,QAAQ,CAAC,aAAa,CAAC,qBAAqB,CAAC,EAAE,gBAAgB,CAAC,OAAO,EAAE,KAAK,IAAI,EAAE;YAChF,UAAU,CAAC,cAAc,GAAG,IAAI,CAAC;YACjC,aAAa,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC;YACpC,aAAa,CAAC,oBAAoB,EAAE,IAAI,CAAC,CAAC;YAC1C,MAAM,YAAY,EAAE,CAAC;QACzB,CAAC,CAAC,CAAC;IACP,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACT,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACrB,CAAC;AACL,CAAC,CAAC"}
@@ -17,7 +17,7 @@ export const runEclipseJdtLsClient = () => {
17
17
  const fileSystemProvider = new RegisteredFileSystemProvider(false);
18
18
  fileSystemProvider.registerFile(new RegisteredMemoryFile(helloJavaUri, helloJavaCode));
19
19
  registerFileSystemOverlay(1, fileSystemProvider);
20
- const userConfig = {
20
+ const wrapperConfig = {
21
21
  $type: 'extended',
22
22
  htmlContainer: document.getElementById('monaco-editor-root'),
23
23
  logLevel: LogLevel.Debug,
@@ -65,7 +65,7 @@ export const runEclipseJdtLsClient = () => {
65
65
  const wrapper = new MonacoEditorLanguageClientWrapper();
66
66
  try {
67
67
  document.querySelector('#button-start')?.addEventListener('click', async () => {
68
- await wrapper.init(userConfig);
68
+ await wrapper.init(wrapperConfig);
69
69
  // open files, so the LS can pick it up
70
70
  await vscode.workspace.openTextDocument(helloJavaUri);
71
71
  await wrapper.start();