monaco-languageclient 10.7.0 → 11.0.0-next.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.
- package/CHANGELOG.md +13 -4
- package/LICENSE +0 -0
- package/README.md +63 -63
- package/lib/common/commonTypes.d.ts +1 -1
- package/lib/common/commonTypes.d.ts.map +1 -1
- package/lib/common/utils.d.ts.map +1 -1
- package/lib/common/utils.js +2 -2
- package/lib/common/utils.js.map +1 -1
- package/lib/debugger/index.d.ts +1 -1
- package/lib/debugger/index.d.ts.map +1 -1
- package/lib/debugger/index.js +2 -4
- package/lib/debugger/index.js.map +1 -1
- package/lib/editorApp/config.d.ts +11 -11
- package/lib/editorApp/config.d.ts.map +1 -1
- package/lib/editorApp/config.js +0 -1
- package/lib/editorApp/config.js.map +1 -1
- package/lib/editorApp/editorApp.d.ts +5 -5
- package/lib/editorApp/editorApp.d.ts.map +1 -1
- package/lib/editorApp/editorApp.js +21 -23
- package/lib/editorApp/editorApp.js.map +1 -1
- package/lib/fs/definitions.d.ts.map +1 -1
- package/lib/fs/endpoints/defaultEndpoint.d.ts.map +1 -1
- package/lib/fs/endpoints/defaultEndpoint.js.map +1 -1
- package/lib/index.d.ts +1 -1
- package/lib/index.d.ts.map +1 -1
- package/lib/index.js +1 -1
- package/lib/index.js.map +1 -1
- package/lib/vscode/apiWrapper.d.ts +2 -2
- package/lib/vscode/apiWrapper.d.ts.map +1 -1
- package/lib/vscode/apiWrapper.js +18 -20
- package/lib/vscode/apiWrapper.js.map +1 -1
- package/lib/vscode/config.d.ts +4 -4
- package/lib/vscode/config.d.ts.map +1 -1
- package/lib/vscode/config.js +0 -1
- package/lib/vscode/config.js.map +1 -1
- package/lib/vscode/locales.d.ts +1 -1
- package/lib/vscode/locales.d.ts.map +1 -1
- package/lib/vscode/locales.js +35 -18
- package/lib/vscode/locales.js.map +1 -1
- package/lib/vscode/utils.d.ts +3 -3
- package/lib/vscode/utils.d.ts.map +1 -1
- package/lib/vscode/utils.js +3 -10
- package/lib/vscode/utils.js.map +1 -1
- package/lib/vscode/viewsService.d.ts.map +1 -1
- package/lib/vscode/viewsService.js +13 -7
- package/lib/vscode/viewsService.js.map +1 -1
- package/lib/worker/index.d.ts +5 -3
- package/lib/worker/index.d.ts.map +1 -1
- package/lib/worker/index.js.map +1 -1
- package/lib/wrapper/lcconfig.d.ts +2 -2
- package/lib/wrapper/lcconfig.d.ts.map +1 -1
- package/lib/wrapper/lcmanager.d.ts.map +1 -1
- package/lib/wrapper/lcmanager.js.map +1 -1
- package/lib/wrapper/lcwrapper.d.ts +1 -1
- package/lib/wrapper/lcwrapper.d.ts.map +1 -1
- package/lib/wrapper/lcwrapper.js +17 -16
- package/lib/wrapper/lcwrapper.js.map +1 -1
- package/package.json +71 -97
- package/src/common/commonTypes.ts +35 -30
- package/src/common/index.ts +0 -1
- package/src/common/utils.ts +45 -45
- package/src/debugger/index.ts +130 -133
- package/src/editorApp/config.ts +33 -33
- package/src/editorApp/editorApp.ts +382 -370
- package/src/fs/definitions.ts +72 -75
- package/src/fs/endpoints/defaultEndpoint.ts +50 -41
- package/src/index.ts +18 -18
- package/src/vscode/apiWrapper.ts +302 -295
- package/src/vscode/config.ts +30 -30
- package/src/vscode/locales.ts +127 -110
- package/src/vscode/utils.ts +20 -26
- package/src/vscode/viewsService.ts +44 -37
- package/src/worker/index.ts +52 -46
- package/src/wrapper/lcconfig.ts +16 -16
- package/src/wrapper/lcmanager.ts +68 -69
- package/src/wrapper/lcwrapper.ts +256 -249
package/CHANGELOG.md
CHANGED
|
@@ -2,6 +2,12 @@
|
|
|
2
2
|
|
|
3
3
|
All notable changes to this npm module are documented in this file.
|
|
4
4
|
|
|
5
|
+
## [11.0.0-next.1] - unrelease
|
|
6
|
+
|
|
7
|
+
- Updated all `@codingame/monaco-vscode` packages to `35.0.1`
|
|
8
|
+
- Updated `vscode-languageclient` and `vscode-languageserver` to `10.1.0`, `vscode-languageserver-protocol` to `3.18.2` and `vscode-jsonrpc` to `9.0.1`.
|
|
9
|
+
- Dropped eslint and rely fully on oxlint.
|
|
10
|
+
|
|
5
11
|
## [10.7.0] - 2026-02-04
|
|
6
12
|
|
|
7
13
|
- Updated all `@codingame/monaco-vscode` packages to `25.1.2`
|
|
@@ -286,7 +292,7 @@ All notable changes to this npm module are documented in this file.
|
|
|
286
292
|
|
|
287
293
|
- Updated to `monaco-editor` `0.43.0` and `monaco-vscode-api` `1.82.2`
|
|
288
294
|
- Only keep user services in`initServices`. It requires to specifically import and use services provided by [monaco-vscode-api](https://github.com/CodinGame/monaco-vscode-api#monaco-standalone-services)
|
|
289
|
-
- All
|
|
295
|
+
- All _enable..._ and _configure_ type parameters have been removed from `monaco-languagclient`
|
|
290
296
|
- languages and model services are always added by `monaco-languagclient`
|
|
291
297
|
- layout, environment, extension, files and quickAccess servies are always added by `monaco-vscode-api`
|
|
292
298
|
- Additional services need to be added to the package dependencies and imported and configured as shown in the [examples](https://github.com/TypeFox/monaco-languageclient#examples)
|
|
@@ -423,7 +429,7 @@ The npm packages exports the following:
|
|
|
423
429
|
## [2.0.2] - 2022-06-22
|
|
424
430
|
|
|
425
431
|
- Align all tsconfigs and vscode-ws-jsonrpc provides esm/cjs [#390](https://github.com/TypeFox/monaco-languageclient/pull/390)
|
|
426
|
-
- Use `typesVersions` in
|
|
432
|
+
- Use `typesVersions` in \*_package.json_- for proper TypeScript import support (used in node example)
|
|
427
433
|
- Remove AMD and CJS builds adn exports of the main library. Only `monaco-converters` and `monaco-converters/cjs` are left
|
|
428
434
|
|
|
429
435
|
## [2.0.1] - 2022-06-21
|
|
@@ -461,7 +467,7 @@ The npm packages exports the following:
|
|
|
461
467
|
- Bugfixes resulting from this:
|
|
462
468
|
- fix: Fix vscode-compatibility using webpack [#342](https://github.com/TypeFox/monaco-languageclient/pull/342)
|
|
463
469
|
- Use ts-node for example [#344](https://github.com/TypeFox/monaco-languageclient/pull/344)
|
|
464
|
-
- Update README.md
|
|
470
|
+
- Update README.md [#345](https://github.com/TypeFox/monaco-languageclient/pull/345)
|
|
465
471
|
- Integrate webpack client example as second option [#353](https://github.com/TypeFox/monaco-languageclient/pull/353)
|
|
466
472
|
- Make monaco workspace disposable [#330](https://github.com/TypeFox/monaco-languageclient/pull/330)
|
|
467
473
|
- Update the protocol to version 3.17 [#350](https://github.com/TypeFox/monaco-languageclient/pull/350)
|
|
@@ -680,7 +686,10 @@ In order to use `vscode-languageclient` directly the compatibility layer was imp
|
|
|
680
686
|
import { MonacoServices, Services } from 'monaco-languageclient';
|
|
681
687
|
|
|
682
688
|
const services: MonacoServices = {
|
|
683
|
-
|
|
689
|
+
worspace,
|
|
690
|
+
languages,
|
|
691
|
+
commands,
|
|
692
|
+
window
|
|
684
693
|
};
|
|
685
694
|
Services.install(services);
|
|
686
695
|
```
|
package/LICENSE
CHANGED
|
File without changes
|
package/README.md
CHANGED
|
@@ -17,9 +17,9 @@ This is npm package is part of the [monaco-languageclient mono repo](https://git
|
|
|
17
17
|
|
|
18
18
|
You find detailed information in the [official documentation](https://github.com/TypeFox/monaco-languageclient/blob/main/docs/index.md).
|
|
19
19
|
|
|
20
|
-
If interested, check [quick start for local development](
|
|
20
|
+
If interested, check [quick start for local development](https://github.com/TypeFox/monaco-languageclient#getting-started).
|
|
21
21
|
|
|
22
|
-
A detailed list of examples is contained in the GitHub repository, please see [this listing](
|
|
22
|
+
A detailed list of examples is contained in the GitHub repository, please see [this listing](https://github.com/TypeFox/monaco-languageclient#examples-overview).
|
|
23
23
|
|
|
24
24
|
## Version 10: A toolbox for language client applications
|
|
25
25
|
|
|
@@ -44,67 +44,67 @@ import { MonacoVscodeApiWrapper, type MonacoVscodeApiConfig } from 'monaco-langu
|
|
|
44
44
|
import { LanguageClientWrapper, type LanguageClientConfig } from 'monaco-languageclient/lcwrapper';
|
|
45
45
|
|
|
46
46
|
async function createEditorAndLanguageClient() {
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
47
|
+
const languageId = 'mylang';
|
|
48
|
+
const code = '// initial editor content';
|
|
49
|
+
const codeUri = '/workspace/hello.mylang';
|
|
50
|
+
|
|
51
|
+
// Monaco VSCode API configuration
|
|
52
|
+
const vscodeApiConfig: MonacoVscodeApiConfig = {
|
|
53
|
+
$type: 'extended',
|
|
54
|
+
viewsConfig: {
|
|
55
|
+
$type: 'EditorService'
|
|
56
|
+
},
|
|
57
|
+
userConfiguration: {
|
|
58
|
+
json: JSON.stringify({
|
|
59
|
+
'workbench.colorTheme': 'Default Dark Modern',
|
|
60
|
+
'editor.wordBasedSuggestions': 'off'
|
|
61
|
+
})
|
|
62
|
+
},
|
|
63
|
+
monacoWorkerFactory: configureDefaultWorkerFactory
|
|
64
|
+
};
|
|
65
|
+
|
|
66
|
+
// Language client configuration
|
|
67
|
+
const languageClientConfig: LanguageClientConfig = {
|
|
68
|
+
languageId: languageId,
|
|
69
|
+
connection: {
|
|
70
|
+
options: {
|
|
71
|
+
$type: 'WebSocketUrl',
|
|
72
|
+
// at this url the language server for myLang must be reachable
|
|
73
|
+
url: 'ws://localhost:30000/myLangLS'
|
|
74
|
+
}
|
|
75
|
+
},
|
|
76
|
+
clientOptions: {
|
|
77
|
+
documentSelector: [languageId],
|
|
78
|
+
orkspaceFolder: {
|
|
79
|
+
index: 0,
|
|
80
|
+
name: 'workspace',
|
|
81
|
+
uri: vscode.Uri.file('/workspace')
|
|
82
|
+
}
|
|
83
|
+
}
|
|
84
|
+
};
|
|
85
|
+
|
|
86
|
+
// editor app / monaco-editor configuration
|
|
87
|
+
const editorAppConfig: EditorAppConfig = {
|
|
88
|
+
codeResources: {
|
|
89
|
+
main: {
|
|
90
|
+
text: code,
|
|
91
|
+
uri: codeUri
|
|
92
|
+
}
|
|
93
|
+
}
|
|
94
|
+
};
|
|
95
|
+
|
|
96
|
+
// Create the monaco-vscode api Wrapper and start it before anything else
|
|
97
|
+
const apiWrapper = new MonacoVscodeApiWrapper(vscodeApiConfig);
|
|
98
|
+
await apiWrapper.start();
|
|
99
|
+
|
|
100
|
+
// Create language client wrapper
|
|
101
|
+
const lcWrapper = new LanguageClientWrapper(languageClientConfig);
|
|
102
|
+
await lcWrapper.start();
|
|
103
|
+
|
|
104
|
+
// Create and start the editor app
|
|
105
|
+
const editorApp = new EditorApp(editorAppConfig);
|
|
106
|
+
const htmlContainer = document.getElementById('monaco-editor-root')!;
|
|
107
|
+
await editorApp.start(htmlContainer);
|
|
108
108
|
}
|
|
109
109
|
|
|
110
110
|
createEditorAndLanguageClient().catch(console.error);
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { BaseLanguageClient } from 'vscode-languageclient/browser
|
|
1
|
+
import type { BaseLanguageClient } from 'vscode-languageclient/browser';
|
|
2
2
|
export type ConnectionConfigOptions = WebSocketConfigOptionsDirect | WebSocketConfigOptionsParams | WebSocketConfigOptionsUrl | WorkerConfigOptionsParams | WorkerConfigOptionsDirect;
|
|
3
3
|
export interface WebSocketCallOptions {
|
|
4
4
|
/** Adds handle on languageClient */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commonTypes.d.ts","sourceRoot":"","sources":["../../src/common/commonTypes.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"commonTypes.d.ts","sourceRoot":"","sources":["../../src/common/commonTypes.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AAExE,MAAM,MAAM,uBAAuB,GAC/B,4BAA4B,GAC5B,4BAA4B,GAC5B,yBAAyB,GACzB,yBAAyB,GACzB,yBAAyB,CAAC;AAE9B,MAAM,WAAW,oBAAoB;IACnC,oCAAoC;IACpC,MAAM,EAAE,CAAC,cAAc,CAAC,EAAE,kBAAkB,KAAK,IAAI,CAAC;IACtD,wCAAwC;IACxC,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB;AAED,MAAM,WAAW,4BAA4B;IAC3C,KAAK,EAAE,iBAAiB,CAAC;IACzB,SAAS,EAAE,SAAS,CAAC;IACrB,YAAY,CAAC,EAAE,oBAAoB,CAAC;IACpC,WAAW,CAAC,EAAE,oBAAoB,CAAC;CACpC;AAED,MAAM,WAAW,kBAAkB;IACjC,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC;CACxE;AAED,MAAM,WAAW,4BAA6B,SAAQ,kBAAkB;IACtE,KAAK,EAAE,iBAAiB,CAAC;IACzB,YAAY,CAAC,EAAE,oBAAoB,CAAC;IACpC,WAAW,CAAC,EAAE,oBAAoB,CAAC;CACpC;AAED,MAAM,WAAW,kBAAkB;IACjC,GAAG,EAAE,MAAM,CAAC;CACb;AAED,MAAM,WAAW,yBAA0B,SAAQ,kBAAkB;IACnE,KAAK,EAAE,cAAc,CAAC;IACtB,YAAY,CAAC,EAAE,oBAAoB,CAAC;IACpC,WAAW,CAAC,EAAE,oBAAoB,CAAC;CACpC;AAED,MAAM,WAAW,yBAAyB;IACxC,KAAK,EAAE,cAAc,CAAC;IACtB,GAAG,EAAE,GAAG,CAAC;IACT,IAAI,EAAE,SAAS,GAAG,QAAQ,CAAC;IAC3B,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,yBAAyB;IACxC,KAAK,EAAE,cAAc,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,WAAW,CAAC;CAC3B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/common/utils.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAE/E,eAAO,MAAM,SAAS,
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/common/utils.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAE/E,eAAO,MAAM,SAAS,WAAY,kBAAkB,GAAG,kBAAkB,WA+BxE,CAAC;AAEF,eAAO,MAAM,0BAA0B,UAAW,MAAM,GAAG,GAAG,WAS7D,CAAC;AAEF,eAAO,MAAM,cAAc,OAAQ,MAAM,qBAExC,CAAC;AAEF,qBAAa,QAAQ,CAAC,CAAC,GAAG,IAAI;IAC5B,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;IACpB,OAAO,EAAE,CAAC,KAAK,EAAE,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC;IAC7C,MAAM,EAAE,CAAC,MAAM,CAAC,EAAE,OAAO,KAAK,IAAI,CAAC;IAEnC,cAKC;CACF"}
|
package/lib/common/utils.js
CHANGED
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
* ------------------------------------------------------------------------------------------ */
|
|
5
5
|
export const createUrl = (config) => {
|
|
6
6
|
let buildUrl = '';
|
|
7
|
-
if (config
|
|
7
|
+
if (Object.hasOwn(config, 'url')) {
|
|
8
8
|
const options = config;
|
|
9
9
|
if (!options.url.startsWith('ws://') && !options.url.startsWith('wss://')) {
|
|
10
10
|
throw new Error(`This is not a proper websocket url: ${options.url}`);
|
|
@@ -23,7 +23,7 @@ export const createUrl = (config) => {
|
|
|
23
23
|
if (options.path !== undefined) {
|
|
24
24
|
buildUrl += `/${options.path}`;
|
|
25
25
|
}
|
|
26
|
-
if (options.extraParams) {
|
|
26
|
+
if (options.extraParams !== undefined) {
|
|
27
27
|
const url = new URL(buildUrl);
|
|
28
28
|
for (const [key, value] of Object.entries(options.extraParams)) {
|
|
29
29
|
url.searchParams.set(key, value instanceof Array ? value.join(',') : value.toString());
|
package/lib/common/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/common/utils.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAIhG,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,MAA+C,EAAE,EAAE
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/common/utils.ts"],"names":[],"mappings":"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"}
|
package/lib/debugger/index.d.ts
CHANGED
|
@@ -33,6 +33,6 @@ export type ConfigParams = {
|
|
|
33
33
|
debuggerExecCall: string;
|
|
34
34
|
};
|
|
35
35
|
export declare const provideDebuggerExtensionConfig: (config: ConfigParams) => ExtensionConfig;
|
|
36
|
-
export declare const configureDebugging: (api: typeof vscode, config: ConfigParams, logger?: ILogger
|
|
36
|
+
export declare const configureDebugging: (api: typeof vscode, config: ConfigParams, logger?: ILogger) => Promise<void>;
|
|
37
37
|
export declare const createDebugLaunchConfigFile: (workspacePath: string, type: string) => RegisteredMemoryFile;
|
|
38
38
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/debugger/index.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,oBAAoB,EAAE,MAAM,iDAAiD,CAAC;AACvF,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,+CAA+C,CAAC;AAC7E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAC;AAC9E,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AACjC,OAAO,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;AAM7B,MAAM,MAAM,cAAc,GAAG;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/debugger/index.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,oBAAoB,EAAE,MAAM,iDAAiD,CAAC;AACvF,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,+CAA+C,CAAC;AAC7E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAC;AAC9E,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AACjC,OAAO,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;AAM7B,MAAM,MAAM,cAAc,GAAG;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,GAAG,CAAC;CACV,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACxB,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;IACtC,WAAW,EAAE,MAAM,CAAC;IACpB,gBAAgB,EAAE,MAAM,CAAC;CAC1B,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IACzB,aAAa,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,GAAG,CAAC;IACnB,aAAa,EAAE,WAAW,CAAC;IAC3B,QAAQ,EAAE,IAAI,GAAG,KAAK,CAAC;IACvB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;IACnC,WAAW,EAAE,MAAM,CAAC;IACpB,gBAAgB,EAAE,MAAM,CAAC;IACzB,gBAAgB,EAAE,MAAM,CAAC;CAC1B,CAAC;AAEF,eAAO,MAAM,8BAA8B,WAAY,YAAY,KAAG,eAgCrE,CAAC;AAEF,eAAO,MAAM,kBAAkB,QAAe,OAAO,MAAM,UAAU,YAAY,WAAW,OAAO,kBA+DlG,CAAC;AAEF,eAAO,MAAM,2BAA2B,kBAAmB,MAAM,QAAQ,MAAM,yBAkB9E,CAAC"}
|
package/lib/debugger/index.js
CHANGED
|
@@ -32,9 +32,7 @@ export const provideDebuggerExtensionConfig = (config) => {
|
|
|
32
32
|
}
|
|
33
33
|
]
|
|
34
34
|
},
|
|
35
|
-
activationEvents: [
|
|
36
|
-
'onDebug'
|
|
37
|
-
]
|
|
35
|
+
activationEvents: ['onDebug']
|
|
38
36
|
},
|
|
39
37
|
filesOrContents
|
|
40
38
|
};
|
|
@@ -101,7 +99,7 @@ export const createDebugLaunchConfigFile = (workspacePath, type) => {
|
|
|
101
99
|
{
|
|
102
100
|
name: 'Debugger: Lauch',
|
|
103
101
|
type,
|
|
104
|
-
request: 'attach'
|
|
102
|
+
request: 'attach'
|
|
105
103
|
}
|
|
106
104
|
]
|
|
107
105
|
}, null, 2));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/debugger/index.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,OAAO,EAAE,oBAAoB,EAAE,MAAM,iDAAiD,CAAC;AAGvF,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AACjC,OAAO,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;AAsC7B,MAAM,CAAC,MAAM,8BAA8B,GAAG,CAAC,MAAoB,EAAmB,EAAE
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/debugger/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
import { LogLevel } from '@codingame/monaco-vscode-api';
|
|
2
2
|
import { type ITextFileEditorModel } from '@codingame/monaco-vscode-api/monaco';
|
|
3
|
-
import
|
|
3
|
+
import type { editor, languages, IDisposable } from '@codingame/monaco-vscode-editor-api';
|
|
4
4
|
import type { IReference } from '@codingame/monaco-vscode-editor-service-override';
|
|
5
5
|
export declare class ModelRefs {
|
|
6
6
|
modified?: IReference<ITextFileEditorModel>;
|
|
7
7
|
original?: IReference<ITextFileEditorModel>;
|
|
8
8
|
}
|
|
9
9
|
export interface TextModels {
|
|
10
|
-
modified?:
|
|
11
|
-
original?:
|
|
10
|
+
modified?: editor.ITextModel | null;
|
|
11
|
+
original?: editor.ITextModel | null;
|
|
12
12
|
}
|
|
13
13
|
export interface TextContents {
|
|
14
14
|
modified?: string;
|
|
@@ -24,8 +24,8 @@ export interface CodeResources {
|
|
|
24
24
|
original?: CodeContent;
|
|
25
25
|
}
|
|
26
26
|
export interface CallbackDisposeable {
|
|
27
|
-
modified?:
|
|
28
|
-
original?:
|
|
27
|
+
modified?: IDisposable;
|
|
28
|
+
original?: IDisposable;
|
|
29
29
|
}
|
|
30
30
|
export interface DisposableModelRefs {
|
|
31
31
|
modified?: IReference<ITextFileEditorModel>;
|
|
@@ -39,14 +39,14 @@ export interface EditorAppConfig {
|
|
|
39
39
|
domReadOnly?: boolean;
|
|
40
40
|
readOnly?: boolean;
|
|
41
41
|
overrideAutomaticLayout?: boolean;
|
|
42
|
-
editorOptions?:
|
|
43
|
-
diffEditorOptions?:
|
|
42
|
+
editorOptions?: editor.IStandaloneEditorConstructionOptions;
|
|
43
|
+
diffEditorOptions?: editor.IStandaloneDiffEditorConstructionOptions;
|
|
44
44
|
languageDef?: {
|
|
45
|
-
languageExtensionConfig:
|
|
46
|
-
monarchLanguage?:
|
|
45
|
+
languageExtensionConfig: languages.ILanguageExtensionPoint;
|
|
46
|
+
monarchLanguage?: languages.IMonarchLanguage;
|
|
47
47
|
theme?: {
|
|
48
|
-
name:
|
|
49
|
-
data:
|
|
48
|
+
name: string;
|
|
49
|
+
data: editor.IStandaloneThemeData;
|
|
50
50
|
};
|
|
51
51
|
};
|
|
52
52
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/editorApp/config.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AACxD,OAAO,EAAE,KAAK,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAChF,OAAO,KAAK,MAAM,MAAM,qCAAqC,CAAC;
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/editorApp/config.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AACxD,OAAO,EAAE,KAAK,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAChF,OAAO,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,qCAAqC,CAAC;AAC1F,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kDAAkD,CAAC;AAEnF,qBAAa,SAAS;IACpB,QAAQ,CAAC,EAAE,UAAU,CAAC,oBAAoB,CAAC,CAAC;IAC5C,QAAQ,CAAC,EAAE,UAAU,CAAC,oBAAoB,CAAC,CAAC;CAC7C;AAED,MAAM,WAAW,UAAU;IACzB,QAAQ,CAAC,EAAE,MAAM,CAAC,UAAU,GAAG,IAAI,CAAC;IACpC,QAAQ,CAAC,EAAE,MAAM,CAAC,UAAU,GAAG,IAAI,CAAC;CACrC;AAED,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,EAAE,WAAW,CAAC;IACvB,QAAQ,CAAC,EAAE,WAAW,CAAC;CACxB;AAED,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,EAAE,WAAW,CAAC;IACvB,QAAQ,CAAC,EAAE,WAAW,CAAC;CACxB;AAED,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,EAAE,UAAU,CAAC,oBAAoB,CAAC,CAAC;IAC5C,QAAQ,CAAC,EAAE,UAAU,CAAC,oBAAoB,CAAC,CAAC;CAC7C;AAED,MAAM,WAAW,eAAe;IAC9B,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,QAAQ,CAAC,EAAE,QAAQ,GAAG,MAAM,CAAC;IAC7B,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,aAAa,CAAC,EAAE,MAAM,CAAC,oCAAoC,CAAC;IAC5D,iBAAiB,CAAC,EAAE,MAAM,CAAC,wCAAwC,CAAC;IACpE,WAAW,CAAC,EAAE;QACZ,uBAAuB,EAAE,SAAS,CAAC,uBAAuB,CAAC;QAC3D,eAAe,CAAC,EAAE,SAAS,CAAC,gBAAgB,CAAC;QAC7C,KAAK,CAAC,EAAE;YACN,IAAI,EAAE,MAAM,CAAC;YACb,IAAI,EAAE,MAAM,CAAC,oBAAoB,CAAC;SACnC,CAAC;KACH,CAAC;CACH"}
|
package/lib/editorApp/config.js
CHANGED
|
@@ -4,7 +4,6 @@
|
|
|
4
4
|
* ------------------------------------------------------------------------------------------ */
|
|
5
5
|
import { LogLevel } from '@codingame/monaco-vscode-api';
|
|
6
6
|
import {} from '@codingame/monaco-vscode-api/monaco';
|
|
7
|
-
import * as monaco from '@codingame/monaco-vscode-editor-api';
|
|
8
7
|
export class ModelRefs {
|
|
9
8
|
modified;
|
|
10
9
|
original;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/editorApp/config.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AACxD,OAAO,EAA6B,MAAM,qCAAqC,CAAC;
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/editorApp/config.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AACxD,OAAO,EAA6B,MAAM,qCAAqC,CAAC;AAIhF,MAAM,OAAO,SAAS;IACpB,QAAQ,CAAoC;IAC5C,QAAQ,CAAoC;CAC7C"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { type ITextFileEditorModel } from '@codingame/monaco-vscode-api/monaco';
|
|
2
|
-
import
|
|
2
|
+
import { editor } from '@codingame/monaco-vscode-editor-api';
|
|
3
3
|
import type { IReference } from '@codingame/monaco-vscode-editor-service-override';
|
|
4
4
|
import type { ILogger } from '@codingame/monaco-vscode-log-service-override';
|
|
5
5
|
import type { CodeContent, CodeResources, EditorAppConfig, TextContents, TextModels } from './config.js';
|
|
@@ -26,8 +26,8 @@ export declare class EditorApp {
|
|
|
26
26
|
constructor(userAppConfig?: EditorAppConfig);
|
|
27
27
|
isDiffEditor(): boolean;
|
|
28
28
|
getConfig(): EditorAppConfig;
|
|
29
|
-
getEditor():
|
|
30
|
-
getDiffEditor():
|
|
29
|
+
getEditor(): editor.IStandaloneCodeEditor | undefined;
|
|
30
|
+
getDiffEditor(): editor.IStandaloneDiffEditor | undefined;
|
|
31
31
|
getTextModels(): TextModels;
|
|
32
32
|
registerOnTextChangedCallback(onTextChanged?: (textChanges: TextContents) => void): void;
|
|
33
33
|
setModelRefDisposeTimeout(modelRefDisposeTimeout: number): void;
|
|
@@ -51,8 +51,8 @@ export declare class EditorApp {
|
|
|
51
51
|
isDisposing(): boolean;
|
|
52
52
|
getDisposingAwait(): Promise<void> | undefined;
|
|
53
53
|
disposeModelRefs(): Promise<void>;
|
|
54
|
-
updateLayout(dimension?:
|
|
54
|
+
updateLayout(dimension?: editor.IDimension, postponeRendering?: boolean): void;
|
|
55
55
|
reportStatus(): string[];
|
|
56
56
|
}
|
|
57
|
-
export declare const didModelContentChange: (textModels: TextModels, onTextChanged?: (
|
|
57
|
+
export declare const didModelContentChange: (textModels: TextModels, onTextChanged?: (textChanges: TextContents) => void) => void;
|
|
58
58
|
//# sourceMappingURL=editorApp.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"editorApp.d.ts","sourceRoot":"","sources":["../../src/editorApp/editorApp.ts"],"names":[],"mappings":"AAMA,OAAO,EAAwB,KAAK,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AACtG,OAAO,
|
|
1
|
+
{"version":3,"file":"editorApp.d.ts","sourceRoot":"","sources":["../../src/editorApp/editorApp.ts"],"names":[],"mappings":"AAMA,OAAO,EAAwB,KAAK,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AACtG,OAAO,EAAE,MAAM,EAAa,MAAM,qCAAqC,CAAC;AACxE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kDAAkD,CAAC;AACnF,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,+CAA+C,CAAC;AAI7E,OAAO,KAAK,EAEV,WAAW,EACX,aAAa,EAEb,eAAe,EACf,YAAY,EACZ,UAAU,EACX,MAAM,aAAa,CAAC;AAGrB;;;;;;GAMG;AACH,qBAAa,SAAS;IACpB,OAAO,CAAC,EAAE,CAAS;IACnB,OAAO,CAAC,MAAM,CAAkB;IAEhC,SAAS,CAAC,MAAM,EAAE,OAAO,CAAuB;IAEhD,OAAO,CAAC,MAAM,CAA2C;IACzD,OAAO,CAAC,UAAU,CAA2C;IAE7D,OAAO,CAAC,SAAS,CAA8B;IAE/C,OAAO,CAAC,aAAa,CAAC,CAAsC;IAC5D,OAAO,CAAC,sBAAsB,CAA2B;IACzD,OAAO,CAAC,gBAAgB,CAA2B;IAEnD,OAAO,CAAC,sBAAsB,CAAM;IAEpC,OAAO,CAAC,aAAa,CAAC,CAAgB;IAEtC,OAAO,CAAC,cAAc,CAAC,CAAgB;IAEvC,YAAY,aAAa,CAAC,EAAE,eAAe,EAqB1C;IAED,YAAY,YAEX;IAED,SAAS,IAAI,eAAe,CAE3B;IAED,SAAS,IAAI,MAAM,CAAC,qBAAqB,GAAG,SAAS,CAEpD;IAED,aAAa,IAAI,MAAM,CAAC,qBAAqB,GAAG,SAAS,CAExD;IAED,aAAa,IAAI,UAAU,CAK1B;IAED,6BAA6B,CAAC,aAAa,CAAC,EAAE,CAAC,WAAW,EAAE,YAAY,KAAK,IAAI,QAEhF;IAEM,yBAAyB,CAAC,sBAAsB,EAAE,MAAM,QAE9D;IAED,UAAU,YAET;IAED,gBAAgB,8BAEf;IAED,SAAS,YAER;IAED;;OAEG;IACG,KAAK,CAAC,aAAa,EAAE,WAAW,sBAqErC;IAEK,aAAa,CAAC,aAAa,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAyC7D;IAED,UAAU,CAAC,IAAI,EAAE;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,QAaxD;IAEK,mBAAmB,CAAC,aAAa,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC,CAiDzE;IAEK,mBAAmB,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,UAAU,CAAC,oBAAoB,CAAC,CAAC,CAc7F;IAED,OAAO,CAAC,mBAAmB;IA4BrB,OAAO,kBA2BZ;IAED,UAAU,IAAI,OAAO,CAOpB;IAED,WAAW,YAEV;IAED,iBAAiB,8BAEhB;IAEK,gBAAgB,kBAuCrB;IAED,YAAY,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC,UAAU,EAAE,iBAAiB,CAAC,EAAE,OAAO,QAMtE;IAED,YAAY,aAMX;CACF;AAED,eAAO,MAAM,qBAAqB,eAAgB,UAAU,kBAAkB,CAAC,WAAW,EAAE,YAAY,KAAK,IAAI,SAOhH,CAAC"}
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
* ------------------------------------------------------------------------------------------ */
|
|
5
5
|
import { ConfigurationTarget, IConfigurationService, LogLevel, StandaloneServices } from '@codingame/monaco-vscode-api';
|
|
6
6
|
import { createModelReference } from '@codingame/monaco-vscode-api/monaco';
|
|
7
|
-
import
|
|
7
|
+
import { editor, languages } from '@codingame/monaco-vscode-editor-api';
|
|
8
8
|
import { ConsoleLogger } from '@codingame/monaco-vscode-log-service-override';
|
|
9
9
|
import { getEnhancedMonacoEnvironment } from 'monaco-languageclient/vscodeApiWrapper';
|
|
10
10
|
import * as vscode from 'vscode';
|
|
@@ -31,9 +31,6 @@ export class EditorApp {
|
|
|
31
31
|
disposingAwait;
|
|
32
32
|
constructor(userAppConfig) {
|
|
33
33
|
this.id = userAppConfig?.id ?? Math.floor(Math.random() * 1000001).toString();
|
|
34
|
-
if ((userAppConfig?.useDiffEditor ?? false) && !userAppConfig?.codeResources?.original) {
|
|
35
|
-
throw new Error(`Use diff editor was used without a valid config. code: ${userAppConfig?.codeResources?.modified} codeOriginal: ${userAppConfig?.codeResources?.original}`);
|
|
36
|
-
}
|
|
37
34
|
this.config = {
|
|
38
35
|
codeResources: userAppConfig?.codeResources ?? undefined,
|
|
39
36
|
useDiffEditor: userAppConfig?.useDiffEditor ?? false,
|
|
@@ -111,27 +108,27 @@ export class EditorApp {
|
|
|
111
108
|
return Promise.reject('Start was called without properly disposing the EditorApp first.');
|
|
112
109
|
}
|
|
113
110
|
const languageDef = this.config.languageDef;
|
|
114
|
-
if (languageDef) {
|
|
111
|
+
if (languageDef !== undefined) {
|
|
115
112
|
// register own language first
|
|
116
|
-
|
|
117
|
-
const languageRegistered =
|
|
113
|
+
languages.register(languageDef.languageExtensionConfig);
|
|
114
|
+
const languageRegistered = languages.getLanguages().filter((x) => x.id === languageDef.languageExtensionConfig.id);
|
|
118
115
|
if (languageRegistered.length === 0) {
|
|
119
116
|
// this is only meaningful for languages supported by monaco out of the box
|
|
120
|
-
|
|
117
|
+
languages.register({
|
|
121
118
|
id: languageDef.languageExtensionConfig.id
|
|
122
119
|
});
|
|
123
120
|
}
|
|
124
121
|
// apply monarch definitions
|
|
125
|
-
if (languageDef.monarchLanguage) {
|
|
126
|
-
|
|
122
|
+
if (languageDef.monarchLanguage !== undefined) {
|
|
123
|
+
languages.setMonarchTokensProvider(languageDef.languageExtensionConfig.id, languageDef.monarchLanguage);
|
|
127
124
|
}
|
|
128
|
-
if (languageDef.theme) {
|
|
129
|
-
|
|
130
|
-
|
|
125
|
+
if (languageDef.theme !== undefined) {
|
|
126
|
+
editor.defineTheme(languageDef.theme.name, languageDef.theme.data);
|
|
127
|
+
editor.setTheme(languageDef.theme.name);
|
|
131
128
|
}
|
|
132
129
|
}
|
|
133
130
|
if (this.config.editorOptions?.['semanticHighlighting.enabled'] !== undefined) {
|
|
134
|
-
StandaloneServices.get(IConfigurationService).updateValue('editor.semanticHighlighting.enabled', this.config.editorOptions['semanticHighlighting.enabled'], ConfigurationTarget.USER);
|
|
131
|
+
await StandaloneServices.get(IConfigurationService).updateValue('editor.semanticHighlighting.enabled', this.config.editorOptions['semanticHighlighting.enabled'], ConfigurationTarget.USER);
|
|
135
132
|
}
|
|
136
133
|
await this.createEditors(htmlContainer);
|
|
137
134
|
// everything is fine at this point
|
|
@@ -165,7 +162,7 @@ export class EditorApp {
|
|
|
165
162
|
}
|
|
166
163
|
this.logger.info(`Starting monaco-editor (${this.id})`);
|
|
167
164
|
if (this.isDiffEditor()) {
|
|
168
|
-
this.diffEditor =
|
|
165
|
+
this.diffEditor = editor.createDiffEditor(htmlContainer, this.config.diffEditorOptions);
|
|
169
166
|
const modified = this.modelRefs.modified.object.textEditorModel ?? undefined;
|
|
170
167
|
const original = this.modelRefs.original?.object.textEditorModel ?? undefined;
|
|
171
168
|
if (modified !== undefined && original !== undefined) {
|
|
@@ -181,7 +178,7 @@ export class EditorApp {
|
|
|
181
178
|
const model = {
|
|
182
179
|
modified: this.modelRefs.modified.object.textEditorModel
|
|
183
180
|
};
|
|
184
|
-
this.editor =
|
|
181
|
+
this.editor = editor.create(htmlContainer, {
|
|
185
182
|
...this.config.editorOptions,
|
|
186
183
|
model: model.modified
|
|
187
184
|
});
|
|
@@ -268,7 +265,6 @@ export class EditorApp {
|
|
|
268
265
|
}
|
|
269
266
|
return modelRef;
|
|
270
267
|
}
|
|
271
|
-
;
|
|
272
268
|
announceModelUpdate(textModels) {
|
|
273
269
|
if (this.onTextChanged !== undefined) {
|
|
274
270
|
let changed = false;
|
|
@@ -302,11 +298,11 @@ export class EditorApp {
|
|
|
302
298
|
this.disposingAwait = new Promise((resolve) => {
|
|
303
299
|
disposingResolve = resolve;
|
|
304
300
|
});
|
|
305
|
-
if (this.editor) {
|
|
301
|
+
if (this.editor !== undefined) {
|
|
306
302
|
this.editor.dispose();
|
|
307
303
|
this.editor = undefined;
|
|
308
304
|
}
|
|
309
|
-
if (this.diffEditor) {
|
|
305
|
+
if (this.diffEditor !== undefined) {
|
|
310
306
|
this.diffEditor.dispose();
|
|
311
307
|
this.diffEditor = undefined;
|
|
312
308
|
}
|
|
@@ -319,8 +315,10 @@ export class EditorApp {
|
|
|
319
315
|
this.disposingAwait = undefined;
|
|
320
316
|
}
|
|
321
317
|
isDisposed() {
|
|
322
|
-
return this.editor === undefined &&
|
|
323
|
-
this.
|
|
318
|
+
return (this.editor === undefined &&
|
|
319
|
+
this.diffEditor === undefined &&
|
|
320
|
+
this.modelDisposables.original === undefined &&
|
|
321
|
+
this.modelDisposables.modified === undefined);
|
|
324
322
|
}
|
|
325
323
|
isDisposing() {
|
|
326
324
|
return this.disposingAwait !== undefined;
|
|
@@ -331,7 +329,7 @@ export class EditorApp {
|
|
|
331
329
|
async disposeModelRefs() {
|
|
332
330
|
const disposeRefs = () => {
|
|
333
331
|
if (this.logger.getLevel() === LogLevel.Debug) {
|
|
334
|
-
const models =
|
|
332
|
+
const models = editor.getModels();
|
|
335
333
|
this.logger.debug('Current model URIs:');
|
|
336
334
|
models.forEach((model, _index) => {
|
|
337
335
|
this.logger.debug(`${model.uri.toString()}`);
|
|
@@ -356,7 +354,7 @@ export class EditorApp {
|
|
|
356
354
|
};
|
|
357
355
|
if (this.modelRefDisposeTimeout > 0) {
|
|
358
356
|
this.logger.debug('Using async dispose of model references');
|
|
359
|
-
await new Promise(resolve => setTimeout(() => {
|
|
357
|
+
await new Promise((resolve) => setTimeout(() => {
|
|
360
358
|
disposeRefs();
|
|
361
359
|
resolve();
|
|
362
360
|
}, this.modelRefDisposeTimeout));
|