@theia/monaco 1.70.0-next.7 → 1.70.0-next.81
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/README.md +14 -15
- package/lib/browser/markdown-renderer/monaco-markdown-renderer.d.ts +4 -5
- package/lib/browser/markdown-renderer/monaco-markdown-renderer.d.ts.map +1 -1
- package/lib/browser/markdown-renderer/monaco-markdown-renderer.js +13 -22
- package/lib/browser/markdown-renderer/monaco-markdown-renderer.js.map +1 -1
- package/lib/browser/monaco-command.d.ts +6 -0
- package/lib/browser/monaco-command.d.ts.map +1 -1
- package/lib/browser/monaco-command.js +29 -3
- package/lib/browser/monaco-command.js.map +1 -1
- package/lib/browser/monaco-context-menu.d.ts +2 -2
- package/lib/browser/monaco-context-menu.d.ts.map +1 -1
- package/lib/browser/monaco-context-menu.js +2 -8
- package/lib/browser/monaco-context-menu.js.map +1 -1
- package/lib/browser/monaco-diff-editor.d.ts +1 -0
- package/lib/browser/monaco-diff-editor.d.ts.map +1 -1
- package/lib/browser/monaco-diff-editor.js +9 -2
- package/lib/browser/monaco-diff-editor.js.map +1 -1
- package/lib/browser/monaco-editor-provider.d.ts.map +1 -1
- package/lib/browser/monaco-editor-provider.js +3 -2
- package/lib/browser/monaco-editor-provider.js.map +1 -1
- package/lib/browser/monaco-editor.d.ts +11 -1
- package/lib/browser/monaco-editor.d.ts.map +1 -1
- package/lib/browser/monaco-editor.js +34 -22
- package/lib/browser/monaco-editor.js.map +1 -1
- package/lib/browser/monaco-gotoline-quick-access.d.ts.map +1 -1
- package/lib/browser/monaco-gotoline-quick-access.js +5 -3
- package/lib/browser/monaco-gotoline-quick-access.js.map +1 -1
- package/lib/browser/monaco-init.d.ts.map +1 -1
- package/lib/browser/monaco-init.js +98 -31
- package/lib/browser/monaco-init.js.map +1 -1
- package/lib/browser/monaco-nls.d.ts +25 -0
- package/lib/browser/monaco-nls.d.ts.map +1 -0
- package/lib/browser/monaco-nls.js +61 -0
- package/lib/browser/monaco-nls.js.map +1 -0
- package/lib/browser/monaco-quick-input-service.d.ts +7 -1
- package/lib/browser/monaco-quick-input-service.d.ts.map +1 -1
- package/lib/browser/monaco-quick-input-service.js +14 -1
- package/lib/browser/monaco-quick-input-service.js.map +1 -1
- package/package.json +9 -9
- package/src/browser/markdown-renderer/monaco-markdown-renderer.ts +16 -22
- package/src/browser/monaco-command.ts +30 -3
- package/src/browser/monaco-context-menu.ts +2 -6
- package/src/browser/monaco-diff-editor.ts +11 -2
- package/src/browser/monaco-editor-provider.ts +3 -2
- package/src/browser/monaco-editor.ts +37 -22
- package/src/browser/monaco-gotoline-quick-access.ts +6 -2
- package/src/browser/monaco-init.ts +113 -33
- package/src/browser/monaco-nls.ts +71 -0
- package/src/browser/monaco-quick-input-service.ts +20 -2
- package/src/browser/style/index.css +4 -4
package/README.md
CHANGED
|
@@ -31,11 +31,11 @@ process, the steps for undertaking a Monaco uplift are outlined here.
|
|
|
31
31
|
1. Clone the VSCode repo and make sure you have the following remotes:
|
|
32
32
|
|
|
33
33
|
- <https://github.com/microsoft/vscode.git> - the official VSCode repo.
|
|
34
|
-
- <https://github.com/
|
|
34
|
+
- <https://github.com/eclipsesource/ms-vscode.git> - the fork used for building `@theia/monaco-editor-core`.
|
|
35
35
|
|
|
36
|
-
2. Find the latest release tag in the official VSCode repo, and the most recent uplift branch in the
|
|
36
|
+
2. Find the latest release tag in the official VSCode repo, and the most recent uplift branch in the fork.
|
|
37
37
|
|
|
38
|
-
> At the time of this writing the latest release tag is `1.
|
|
38
|
+
> At the time of this writing the latest release tag is `1.108.2`, and the uplift branch is `monaco_uplift_1.108.2` (<https://github.com/eclipsesource/ms-vscode/tree/monaco_uplift_1.108.2>)
|
|
39
39
|
|
|
40
40
|
3. Check out the release tag, cherry pick the tip of the uplift branch, and resolve any conflicts.
|
|
41
41
|
|
|
@@ -47,19 +47,21 @@ process, the steps for undertaking a Monaco uplift are outlined here.
|
|
|
47
47
|
|
|
48
48
|
#### Current State
|
|
49
49
|
|
|
50
|
-
- build/gulpfile.editor.js: various changes to modify the treeshaking and output destinations.
|
|
51
|
-
- build/lib/standalone.js/ts: changes to output sourcemaps
|
|
52
|
-
- src/vs/base/browser/dompurify/dompurify.js changes for CommonJS rather than ESM
|
|
53
|
-
- src/vs/base/common/marked/marked.js changes for CommonJS rather than ESM
|
|
50
|
+
- build/gulpfile.editor.js: various changes to modify the treeshaking and output destinations (shakeLevel 0 — file-level only, no class-member shaking).
|
|
51
|
+
- build/lib/standalone.js/ts: changes to output sourcemaps and declarations (`declaration: true`, `sourceMap: true`, `moduleResolution: Classic`).
|
|
52
|
+
- src/vs/base/browser/dompurify/dompurify.js: changes for CommonJS rather than ESM (`module.exports` added).
|
|
53
|
+
- src/vs/base/common/marked/marked.js: changes for CommonJS rather than ESM (`module.exports` added).
|
|
54
|
+
- src/vs/base/common/platform.ts: guards `setTimeout0` with `$globalThis.addEventListener` check for non-browser environments.
|
|
55
|
+
- build/monaco/esm.core.js: added `embeddedDiffEditorWidget` import to `editor.all.ts`.
|
|
54
56
|
|
|
55
57
|
### Setting up the Theia side
|
|
56
58
|
|
|
57
59
|
For initial testing, it's easier to point dependencies to your local VSCode.
|
|
58
60
|
|
|
59
61
|
1. Having built `monaco-editor-core` using the steps [above](#setting-up-the-vscode-side).
|
|
60
|
-
2. Find all references to `@theia/monaco-editor-core` in `package.json`s and replace their version with `"
|
|
62
|
+
2. Find all references to `@theia/monaco-editor-core` in `package.json`s and replace their version with `"file:/<your-path-to>/vscode/out-monaco-editor-core"`.
|
|
61
63
|
|
|
62
|
-
> Using `
|
|
64
|
+
> Using `file:` means that if you subsequently make changes on the VSCode side, you only need to rebuild VSCode and then rebuild Theia to see the effects.
|
|
63
65
|
|
|
64
66
|
3. Delete your `node_modules` and `npm install` and build Theia.
|
|
65
67
|
4. Fix any build errors.
|
|
@@ -73,19 +75,16 @@ private API and public API. Often public API fails to satisfy private declaratio
|
|
|
73
75
|
|
|
74
76
|
> It may also be necessary to update our various `vscode` dependencies to match the current state of VSCode. It may not be necessary to upgrade all (or any) of these to successfully adopt a new Monaco version, but if something is misbehaving inexplicably, checking dependencies is a reasonable place to start. Check on:
|
|
75
77
|
>
|
|
76
|
-
> - `vscode-debugprotocol`
|
|
77
78
|
> - `vscode-languageserver-protocol`
|
|
78
79
|
> - `vscode-oniguruma`
|
|
79
|
-
> - `vscode-proxy-agent`
|
|
80
|
-
> - `vscode-ripgrep`
|
|
81
80
|
> - `vscode-textmate`
|
|
82
81
|
> - `vscode-uri`
|
|
83
82
|
|
|
84
83
|
### Publishing for testing
|
|
85
84
|
|
|
86
|
-
Once you believe that everything is in working order, you'll need to publish the new `@theia/monaco-editor-core` for testing.
|
|
87
|
-
|
|
88
|
-
sure everything still works, then make a PR.
|
|
85
|
+
Once you believe that everything is in working order, you'll need to publish the new `@theia/monaco-editor-core` for testing.
|
|
86
|
+
You can use `npm pack` in the `out-monaco-editor-core/` directory of the VSCode fork to create a tarball, then publish it.
|
|
87
|
+
Once the package is published, point your `package.json`s at the testing version and make sure everything still works, then make a PR.
|
|
89
88
|
|
|
90
89
|
## Additional Information
|
|
91
90
|
|
|
@@ -1,18 +1,17 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { MarkdownRendererService as CodeMarkdownRenderer } from '@theia/monaco-editor-core/esm/vs/platform/markdown/browser/markdownRenderer';
|
|
2
2
|
import * as monaco from '@theia/monaco-editor-core';
|
|
3
3
|
import { OpenerService } from '@theia/core/lib/browser';
|
|
4
4
|
import { OpenExternalOptions, OpenInternalOptions } from '@theia/monaco-editor-core/esm/vs/platform/opener/common/opener';
|
|
5
5
|
import { MarkdownRenderer, MarkdownRenderOptions, MarkdownRenderResult } from '@theia/core/lib/browser/markdown-rendering/markdown-renderer';
|
|
6
|
-
import {
|
|
6
|
+
import { MarkdownRenderOptions as MonacoMarkdownRenderOptions } from '@theia/monaco-editor-core/esm/vs/base/browser/markdownRenderer';
|
|
7
7
|
import { MarkdownString } from '@theia/core/lib/common/markdown-rendering';
|
|
8
8
|
import { DisposableStore } from '@theia/monaco-editor-core/esm/vs/base/common/lifecycle';
|
|
9
|
-
import { DisposableGroup
|
|
9
|
+
import { DisposableGroup } from '@theia/core';
|
|
10
10
|
export declare class MonacoMarkdownRenderer implements MarkdownRenderer {
|
|
11
11
|
protected readonly openerService: OpenerService;
|
|
12
|
-
protected readonly preferences: PreferenceService;
|
|
13
12
|
protected delegate: CodeMarkdownRenderer;
|
|
14
13
|
protected _openerService: OpenerService | undefined;
|
|
15
|
-
render(markdown: MarkdownString
|
|
14
|
+
render(markdown: MarkdownString, options?: MarkdownRenderOptions): MarkdownRenderResult;
|
|
16
15
|
protected transformOptions(options?: MarkdownRenderOptions): MonacoMarkdownRenderOptions | undefined;
|
|
17
16
|
protected toDisposableStore(current: DisposableGroup): DisposableStore;
|
|
18
17
|
protected init(): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monaco-markdown-renderer.d.ts","sourceRoot":"","sources":["../../../src/browser/markdown-renderer/monaco-markdown-renderer.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"monaco-markdown-renderer.d.ts","sourceRoot":"","sources":["../../../src/browser/markdown-renderer/monaco-markdown-renderer.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,uBAAuB,IAAI,oBAAoB,EAAE,MACjD,6EAA6E,CAAC;AAEvF,OAAO,KAAK,MAAM,MAAM,2BAA2B,CAAC;AACpD,OAAO,EAAE,aAAa,EAA6B,MAAM,yBAAyB,CAAC;AACnF,OAAO,EAAkB,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,gEAAgE,CAAC;AAG1I,OAAO,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,oBAAoB,EAAE,MAAM,8DAA8D,CAAC;AAC7I,OAAO,EAAE,qBAAqB,IAAI,2BAA2B,EAAE,MAAM,gEAAgE,CAAC;AACtI,OAAO,EAAE,cAAc,EAAE,MAAM,2CAA2C,CAAC;AAC3E,OAAO,EAAE,eAAe,EAAE,MAAM,wDAAwD,CAAC;AACzF,OAAO,EAAwB,eAAe,EAAE,MAAM,aAAa,CAAC;AAEpE,qBACa,sBAAuB,YAAW,gBAAgB;IACpC,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;IAEvE,SAAS,CAAC,QAAQ,EAAE,oBAAoB,CAAC;IACzC,SAAS,CAAC,cAAc,EAAE,aAAa,GAAG,SAAS,CAAC;IAEpD,MAAM,CAAC,QAAQ,EAAE,cAAc,EAAE,OAAO,CAAC,EAAE,qBAAqB,GAAG,oBAAoB;IAIvF,SAAS,CAAC,gBAAgB,CAAC,OAAO,CAAC,EAAE,qBAAqB,GAAG,2BAA2B,GAAG,SAAS;IAcpG,SAAS,CAAC,iBAAiB,CAAC,OAAO,EAAE,eAAe,GAAG,eAAe;IAatE,SAAS,CAAC,IAAI,IAAI,IAAI;cASN,aAAa,CAAC,SAAS,EAAE,MAAM,CAAC,GAAG,GAAG,MAAM,EAAE,aAAa,CAAC,EAAE,mBAAmB,GAAG,mBAAmB,GAAG,OAAO,CAAC,OAAO,CAAC;CAyB7I"}
|
|
@@ -18,8 +18,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
18
18
|
exports.MonacoMarkdownRenderer = void 0;
|
|
19
19
|
const tslib_1 = require("tslib");
|
|
20
20
|
const inversify_1 = require("@theia/core/shared/inversify");
|
|
21
|
-
const
|
|
22
|
-
const markdownRenderer_1 = require("@theia/monaco-editor-core/esm/vs/editor/browser/widget/markdownRenderer/browser/markdownRenderer");
|
|
21
|
+
const markdownRenderer_1 = require("@theia/monaco-editor-core/esm/vs/platform/markdown/browser/markdownRenderer");
|
|
23
22
|
const standaloneServices_1 = require("@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices");
|
|
24
23
|
const browser_1 = require("@theia/core/lib/browser");
|
|
25
24
|
const opener_1 = require("@theia/monaco-editor-core/esm/vs/platform/opener/common/opener");
|
|
@@ -27,18 +26,21 @@ const uri_1 = require("@theia/core/lib/common/uri");
|
|
|
27
26
|
const lifecycle_1 = require("@theia/monaco-editor-core/esm/vs/base/common/lifecycle");
|
|
28
27
|
const core_1 = require("@theia/core");
|
|
29
28
|
let MonacoMarkdownRenderer = class MonacoMarkdownRenderer {
|
|
30
|
-
render(markdown, options
|
|
31
|
-
return this.delegate.render(markdown, this.transformOptions(options)
|
|
29
|
+
render(markdown, options) {
|
|
30
|
+
return this.delegate.render(markdown, this.transformOptions(options));
|
|
32
31
|
}
|
|
33
32
|
transformOptions(options) {
|
|
34
|
-
if (!options
|
|
35
|
-
return
|
|
33
|
+
if (!options) {
|
|
34
|
+
return undefined;
|
|
36
35
|
}
|
|
37
|
-
const
|
|
38
|
-
|
|
39
|
-
|
|
36
|
+
const { actionHandler, ...opts } = options;
|
|
37
|
+
if (!actionHandler) {
|
|
38
|
+
return opts;
|
|
39
|
+
}
|
|
40
|
+
return {
|
|
41
|
+
...opts,
|
|
42
|
+
actionHandler: (content) => actionHandler.callback(content)
|
|
40
43
|
};
|
|
41
|
-
return { ...options, actionHandler: monacoActionHandler };
|
|
42
44
|
}
|
|
43
45
|
toDisposableStore(current) {
|
|
44
46
|
if (current instanceof lifecycle_1.DisposableStore) {
|
|
@@ -54,18 +56,11 @@ let MonacoMarkdownRenderer = class MonacoMarkdownRenderer {
|
|
|
54
56
|
}
|
|
55
57
|
}
|
|
56
58
|
init() {
|
|
57
|
-
const languages = standaloneServices_1.StandaloneServices.get(language_1.ILanguageService);
|
|
58
59
|
const openerService = standaloneServices_1.StandaloneServices.get(opener_1.IOpenerService);
|
|
59
60
|
openerService.registerOpener({
|
|
60
61
|
open: (u, options) => this.interceptOpen(u, options)
|
|
61
62
|
});
|
|
62
|
-
|
|
63
|
-
const prefs = new class {
|
|
64
|
-
get codeBlockFontFamily() {
|
|
65
|
-
return that.preferences.get('editor.fontFamily');
|
|
66
|
-
}
|
|
67
|
-
};
|
|
68
|
-
this.delegate = new markdownRenderer_1.MarkdownRenderer(prefs, languages, openerService);
|
|
63
|
+
this.delegate = new markdownRenderer_1.MarkdownRendererService(openerService);
|
|
69
64
|
}
|
|
70
65
|
async interceptOpen(monacoUri, monacoOptions) {
|
|
71
66
|
let options = undefined;
|
|
@@ -99,10 +94,6 @@ tslib_1.__decorate([
|
|
|
99
94
|
(0, inversify_1.inject)(browser_1.OpenerService),
|
|
100
95
|
tslib_1.__metadata("design:type", Object)
|
|
101
96
|
], MonacoMarkdownRenderer.prototype, "openerService", void 0);
|
|
102
|
-
tslib_1.__decorate([
|
|
103
|
-
(0, inversify_1.inject)(core_1.PreferenceService),
|
|
104
|
-
tslib_1.__metadata("design:type", Object)
|
|
105
|
-
], MonacoMarkdownRenderer.prototype, "preferences", void 0);
|
|
106
97
|
tslib_1.__decorate([
|
|
107
98
|
(0, inversify_1.postConstruct)(),
|
|
108
99
|
tslib_1.__metadata("design:type", Function),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monaco-markdown-renderer.js","sourceRoot":"","sources":["../../../src/browser/markdown-renderer/monaco-markdown-renderer.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,0CAA0C;AAC1C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;;AAEhF,4DAAiF;AACjF,
|
|
1
|
+
{"version":3,"file":"monaco-markdown-renderer.js","sourceRoot":"","sources":["../../../src/browser/markdown-renderer/monaco-markdown-renderer.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,12 @@ import { MonacoCommandRegistry, MonacoEditorCommandHandler } from './monaco-comm
|
|
|
6
6
|
import { ProtocolToMonacoConverter } from './protocol-to-monaco-converter';
|
|
7
7
|
export declare namespace MonacoCommands {
|
|
8
8
|
const COMMON_ACTIONS: Map<string, string>;
|
|
9
|
+
/**
|
|
10
|
+
* Actions that directly manipulate input content (clipboard, select all).
|
|
11
|
+
* These should only be handled when the editor's text area has focus,
|
|
12
|
+
* not when an overlay widget (e.g. find/replace) or an unrelated input has focus.
|
|
13
|
+
*/
|
|
14
|
+
const INPUT_ACTIONS: Set<string>;
|
|
9
15
|
const GO_TO_DEFINITION = "editor.action.revealDefinition";
|
|
10
16
|
const EXCLUDE_ACTIONS: Set<string>;
|
|
11
17
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monaco-command.d.ts","sourceRoot":"","sources":["../../src/browser/monaco-command.ts"],"names":[],"mappings":"AAoBA,OAAO,EAAE,mBAAmB,EAAE,eAAe,EAAkB,MAAM,gCAAgC,CAAC;AACtG,OAAO,EAAkB,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC9F,OAAO,EAAkB,aAAa,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACxF,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,qBAAqB,EAAE,0BAA0B,EAAE,MAAM,2BAA2B,CAAC;AAC9F,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAU3E,yBAAiB,cAAc,CAAC;IAErB,MAAM,cAAc,qBAOzB,CAAC;IAEI,MAAM,gBAAgB,mCAAmC,CAAC;IAE1D,MAAM,eAAe,aAM1B,CAAC;CACN;AAED,qBACa,2BAA4B,YAAW,mBAAmB;IAGnE,SAAS,CAAC,QAAQ,CAAC,qBAAqB,EAAE,qBAAqB,CAAC;IAGhE,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAC;IAGpD,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,yBAAyB,CAAC;IAGlD,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAGxD,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,gBAAgB,CAAC;IAG3C,SAAS,CAAC,aAAa,EAAE,aAAa,CAAC;IAEvC,gBAAgB,IAAI,IAAI;IAKxB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA8CG;IACH,SAAS,CAAC,sBAAsB,IAAI,IAAI;
|
|
1
|
+
{"version":3,"file":"monaco-command.d.ts","sourceRoot":"","sources":["../../src/browser/monaco-command.ts"],"names":[],"mappings":"AAoBA,OAAO,EAAE,mBAAmB,EAAE,eAAe,EAAkB,MAAM,gCAAgC,CAAC;AACtG,OAAO,EAAkB,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC9F,OAAO,EAAkB,aAAa,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACxF,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,qBAAqB,EAAE,0BAA0B,EAAE,MAAM,2BAA2B,CAAC;AAC9F,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAU3E,yBAAiB,cAAc,CAAC;IAErB,MAAM,cAAc,qBAOzB,CAAC;IAEH;;;;OAIG;IACI,MAAM,aAAa,aAKxB,CAAC;IAEI,MAAM,gBAAgB,mCAAmC,CAAC;IAE1D,MAAM,eAAe,aAM1B,CAAC;CACN;AAED,qBACa,2BAA4B,YAAW,mBAAmB;IAGnE,SAAS,CAAC,QAAQ,CAAC,qBAAqB,EAAE,qBAAqB,CAAC;IAGhE,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAC;IAGpD,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,yBAAyB,CAAC;IAGlD,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAGxD,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,gBAAgB,CAAC;IAG3C,SAAS,CAAC,aAAa,EAAE,aAAa,CAAC;IAEvC,gBAAgB,IAAI,IAAI;IAKxB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA8CG;IACH,SAAS,CAAC,sBAAsB,IAAI,IAAI;IAsFxC,SAAS,CAAC,6BAA6B,IAAI,IAAI;IAU/C,SAAS,CAAC,uBAAuB,IAAI,0BAA0B;IAa/D,SAAS,CAAC,2BAA2B,IAAI,0BAA0B;IAKnE,SAAS,CAAC,oBAAoB,CAAC,MAAM,EAAE,YAAY,GAAG,IAAI;IAQ1D,SAAS,CAAC,mBAAmB,IAAI,0BAA0B;IAM3D,SAAS,CAAC,YAAY,CAAC,MAAM,EAAE,YAAY,GAAG,IAAI;IAUlD,SAAS,CAAC,MAAM,CAAC,MAAM,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI;IAWhE,SAAS,CAAC,uBAAuB,CAAC,SAAS,EAAE,OAAO,GAAG,0BAA0B;IAKjF,SAAS,CAAC,gBAAgB,CAAC,MAAM,EAAE,YAAY,EAAE,SAAS,EAAE,OAAO,GAAG,IAAI;IAqB1E,SAAS,CAAC,4BAA4B,IAAI,0BAA0B;IAMpE,SAAS,CAAC,oCAAoC,IAAI,0BAA0B;IAM5E,SAAS,CAAC,eAAe,IAAI;QAAE,MAAM,CAAC,EAAE,YAAY,CAAC;QAAC,MAAM,CAAC,EAAE,YAAY,CAAA;KAAE;cAK7D,YAAY,CAAC,MAAM,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;cAMlD,0BAA0B,CAAC,OAAO,EAAE;QAAE,MAAM,CAAC,EAAE,YAAY,CAAC;QAAC,MAAM,CAAC,EAAE,YAAY,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CAUvH"}
|
|
@@ -43,6 +43,17 @@ var MonacoCommands;
|
|
|
43
43
|
['editor.action.clipboardCopyAction', browser_1.CommonCommands.COPY.id],
|
|
44
44
|
['editor.action.clipboardPasteAction', browser_1.CommonCommands.PASTE.id]
|
|
45
45
|
]);
|
|
46
|
+
/**
|
|
47
|
+
* Actions that directly manipulate input content (clipboard, select all).
|
|
48
|
+
* These should only be handled when the editor's text area has focus,
|
|
49
|
+
* not when an overlay widget (e.g. find/replace) or an unrelated input has focus.
|
|
50
|
+
*/
|
|
51
|
+
MonacoCommands.INPUT_ACTIONS = new Set([
|
|
52
|
+
'editor.action.selectAll',
|
|
53
|
+
'editor.action.clipboardCutAction',
|
|
54
|
+
'editor.action.clipboardCopyAction',
|
|
55
|
+
'editor.action.clipboardPasteAction'
|
|
56
|
+
]);
|
|
46
57
|
MonacoCommands.GO_TO_DEFINITION = 'editor.action.revealDefinition';
|
|
47
58
|
MonacoCommands.EXCLUDE_ACTIONS = new Set([
|
|
48
59
|
'editor.action.quickCommand',
|
|
@@ -113,13 +124,21 @@ let MonacoEditorCommandHandlers = class MonacoEditorCommandHandlers {
|
|
|
113
124
|
if (MonacoCommands.EXCLUDE_ACTIONS.has(id)) {
|
|
114
125
|
continue;
|
|
115
126
|
}
|
|
127
|
+
const isCommonAction = MonacoCommands.COMMON_ACTIONS.has(id);
|
|
128
|
+
const isInputAction = MonacoCommands.INPUT_ACTIONS.has(id);
|
|
116
129
|
const handler = {
|
|
117
130
|
execute: (...args) => {
|
|
118
131
|
/*
|
|
119
132
|
* We check monaco focused code editor first since they can contain inline like the debug console and embedded editors like in the peek reference.
|
|
120
133
|
* If there is not such then we check last focused editor tracked by us.
|
|
134
|
+
* For input actions (clipboard, select all), we require the editor to have text focus
|
|
135
|
+
* (not just widget focus). This avoids intercepting operations meant for native input
|
|
136
|
+
* fields, including inputs inside Monaco's own overlay widgets like find/replace.
|
|
121
137
|
*/
|
|
122
|
-
const
|
|
138
|
+
const focusedEditor = codeEditorService.getFocusedCodeEditor();
|
|
139
|
+
const editor = isInputAction
|
|
140
|
+
? (focusedEditor?.hasTextFocus() ? focusedEditor : undefined)
|
|
141
|
+
: focusedEditor || codeEditorService.getActiveCodeEditor();
|
|
123
142
|
if (editorActions.has(id)) {
|
|
124
143
|
const action = editor && editor.getAction(id);
|
|
125
144
|
if (!action) {
|
|
@@ -133,12 +152,19 @@ let MonacoEditorCommandHandlers = class MonacoEditorCommandHandlers {
|
|
|
133
152
|
return globalInstantiationService.invokeFunction(monacoCommands.get(id).handler, ...args);
|
|
134
153
|
},
|
|
135
154
|
isEnabled: () => {
|
|
136
|
-
|
|
155
|
+
// For input actions (clipboard, select all), only claim enabled when the editor
|
|
156
|
+
// has text focus (not just widget focus). This allows fallback handlers to handle
|
|
157
|
+
// these actions in native inputs, including inputs inside Monaco's own overlay
|
|
158
|
+
// widgets like the find/replace widget.
|
|
159
|
+
const focusedEditor = codeEditorService.getFocusedCodeEditor();
|
|
160
|
+
const editor = isInputAction
|
|
161
|
+
? (focusedEditor?.hasTextFocus() ? focusedEditor : undefined)
|
|
162
|
+
: focusedEditor || codeEditorService.getActiveCodeEditor();
|
|
137
163
|
if (editorActions.has(id)) {
|
|
138
164
|
const action = editor && editor.getAction(id);
|
|
139
165
|
return !!action && action.isSupported();
|
|
140
166
|
}
|
|
141
|
-
if (!!editorExtensions_1.EditorExtensionsRegistry.getEditorCommand(id) ||
|
|
167
|
+
if (!!editorExtensions_1.EditorExtensionsRegistry.getEditorCommand(id) || isCommonAction) {
|
|
142
168
|
return !!editor;
|
|
143
169
|
}
|
|
144
170
|
return true;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monaco-command.js","sourceRoot":"","sources":["../../src/browser/monaco-command.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;;AAEhF,4DAA4E;AAE5E,8DAA+D;AAC/D,sCAAkD;AAClD,4DAAsG;AACtG,qDAA8F;AAC9F,uDAAwF;AACxF,mDAA+C;AAC/C,uEAA8F;AAC9F,iFAA2E;AAC3E,oDAAiD;AACjD,uGAA4G;AAC5G,iGAAuH;AACvH,oDAAoD;AAEpD,sHAAmH;AACnH,gHAAqH;AACrH,kHAAgH;AAEhH,IAAiB,cAAc,
|
|
1
|
+
{"version":3,"file":"monaco-command.js","sourceRoot":"","sources":["../../src/browser/monaco-command.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;;AAEhF,4DAA4E;AAE5E,8DAA+D;AAC/D,sCAAkD;AAClD,4DAAsG;AACtG,qDAA8F;AAC9F,uDAAwF;AACxF,mDAA+C;AAC/C,uEAA8F;AAC9F,iFAA2E;AAC3E,oDAAiD;AACjD,uGAA4G;AAC5G,iGAAuH;AACvH,oDAAoD;AAEpD,sHAAmH;AACnH,gHAAqH;AACrH,kHAAgH;AAEhH,IAAiB,cAAc,CAgC9B;AAhCD,WAAiB,cAAc;IAEd,6BAAc,GAAG,IAAI,GAAG,CAAiB;QAClD,CAAC,yBAAyB,EAAE,wBAAc,CAAC,UAAU,CAAC,EAAE,CAAC;QACzD,CAAC,cAAc,EAAE,wBAAc,CAAC,IAAI,CAAC,EAAE,CAAC;QACxC,CAAC,sCAAsC,EAAE,wBAAc,CAAC,OAAO,CAAC,EAAE,CAAC;QACnE,CAAC,kCAAkC,EAAE,wBAAc,CAAC,GAAG,CAAC,EAAE,CAAC;QAC3D,CAAC,mCAAmC,EAAE,wBAAc,CAAC,IAAI,CAAC,EAAE,CAAC;QAC7D,CAAC,oCAAoC,EAAE,wBAAc,CAAC,KAAK,CAAC,EAAE,CAAC;KAClE,CAAC,CAAC;IAEH;;;;OAIG;IACU,4BAAa,GAAG,IAAI,GAAG,CAAC;QACjC,yBAAyB;QACzB,kCAAkC;QAClC,mCAAmC;QACnC,oCAAoC;KACvC,CAAC,CAAC;IAEU,+BAAgB,GAAG,gCAAgC,CAAC;IAEpD,8BAAe,GAAG,IAAI,GAAG,CAAC;QACnC,4BAA4B;QAC5B,kCAAkC,EAAE,+BAA+B;QACnE,MAAM;QACN,MAAM;QACN,aAAa;KAChB,CAAC,CAAC;AACP,CAAC,EAhCgB,cAAc,8BAAd,cAAc,QAgC9B;AAGM,IAAM,2BAA2B,GAAjC,MAAM,2BAA2B;IAoBpC,gBAAgB;QACZ,IAAI,CAAC,sBAAsB,EAAE,CAAC;QAC9B,IAAI,CAAC,6BAA6B,EAAE,CAAC;IACzC,CAAC;IAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA8CG;IACO,sBAAsB;QAC5B,MAAM,aAAa,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,2CAAwB,CAAC,gBAAgB,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC;QAEtI,MAAM,iBAAiB,GAAG,uCAAkB,CAAC,GAAG,CAAC,sCAAkB,CAAC,CAAC;QACrE,MAAM,0BAA0B,GAAG,uCAAkB,CAAC,GAAG,CAAC,qCAAqB,CAAC,CAAC;QACjF,MAAM,cAAc,GAAG,2BAAgB,CAAC,WAAW,EAAE,CAAC;QACtD,KAAK,MAAM,EAAE,IAAI,cAAc,CAAC,IAAI,EAAE,EAAE,CAAC;YACrC,IAAI,cAAc,CAAC,eAAe,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC;gBACzC,SAAS;YACb,CAAC;YACD,MAAM,cAAc,GAAG,cAAc,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAC7D,MAAM,aAAa,GAAG,cAAc,CAAC,aAAa,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAC3D,MAAM,OAAO,GAAmB;gBAC5B,OAAO,EAAE,CAAC,GAAG,IAAI,EAAE,EAAE;oBACjB;;;;;;uBAMG;oBACH,MAAM,aAAa,GAAG,iBAAiB,CAAC,oBAAoB,EAAE,CAAC;oBAC/D,MAAM,MAAM,GAAG,aAAa;wBACxB,CAAC,CAAC,CAAC,aAAa,EAAE,YAAY,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,SAAS,CAAC;wBAC7D,CAAC,CAAC,aAAa,IAAI,iBAAiB,CAAC,mBAAmB,EAAE,CAAC;oBAC/D,IAAI,aAAa,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC;wBACxB,MAAM,MAAM,GAAG,MAAM,IAAI,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;wBAC9C,IAAI,CAAC,MAAM,EAAE,CAAC;4BACV,OAAO;wBACX,CAAC;wBACD,OAAO,MAAM,CAAC,GAAG,EAAE,CAAC;oBACxB,CAAC;oBACD,IAAI,CAAC,0BAA0B,EAAE,CAAC;wBAC9B,OAAO;oBACX,CAAC;oBACD,OAAO,0BAA0B,CAAC,cAAc,CAC5C,cAAc,CAAC,GAAG,CAAC,EAAE,CAAE,CAAC,OAAO,EAC/B,GAAG,IAAI,CACV,CAAC;gBACN,CAAC;gBACD,SAAS,EAAE,GAAG,EAAE;oBACZ,gFAAgF;oBAChF,kFAAkF;oBAClF,+EAA+E;oBAC/E,wCAAwC;oBACxC,MAAM,aAAa,GAAG,iBAAiB,CAAC,oBAAoB,EAAE,CAAC;oBAC/D,MAAM,MAAM,GAAG,aAAa;wBACxB,CAAC,CAAC,CAAC,aAAa,EAAE,YAAY,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,SAAS,CAAC;wBAC7D,CAAC,CAAC,aAAa,IAAI,iBAAiB,CAAC,mBAAmB,EAAE,CAAC;oBAE/D,IAAI,aAAa,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC;wBACxB,MAAM,MAAM,GAAG,MAAM,IAAI,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;wBAC9C,OAAO,CAAC,CAAC,MAAM,IAAI,MAAM,CAAC,WAAW,EAAE,CAAC;oBAC5C,CAAC;oBACD,IAAI,CAAC,CAAC,2CAAwB,CAAC,gBAAgB,CAAC,EAAE,CAAC,IAAI,cAAc,EAAE,CAAC;wBACpE,OAAO,CAAC,CAAC,MAAM,CAAC;oBACpB,CAAC;oBACD,OAAO,IAAI,CAAC;gBAChB,CAAC;aACJ,CAAC;YACF,MAAM,aAAa,GAAG,aAAa,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAC5C,IAAI,CAAC,eAAe,CAAC,eAAe,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,aAAa,EAAE,KAAK,EAAE,aAAa,EAAE,aAAa,EAAE,KAAK,EAAE,EAAE,OAAO,CAAC,CAAC;YACxH,MAAM,WAAW,GAAG,cAAc,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAC1D,IAAI,WAAW,EAAE,CAAC;gBACd,IAAI,CAAC,eAAe,CAAC,eAAe,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;YAC/D,CAAC;QACL,CAAC;QAED,0HAA0H;QAC1H,MAAM,UAAU,GAAG,cAAc,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;QACrD,IAAI,UAAU,EAAE,CAAC;YACb,IAAI,CAAC,eAAe,CAAC,eAAe,CAAC,EAAE,EAAE,EAAE,UAAU,CAAC,EAAE,EAAE,EAAE;gBACxD,OAAO,EAAE,CAAC,UAAU,EAAE,YAAY,EAAE,GAAG,IAAI,EAAE,EAAE,CAAC,0BAA0B,CAAC,cAAc,CAAC,UAAU,CAAC,OAAO,EACxG,UAAU,EACV,IAAA,qBAAc,EAAC,YAAY,EAAE,IAAI,CAAC,EAAE;oBAChC,IAAI,IAAI,YAAY,UAAG,IAAI,gBAAO,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;wBAC7C,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;oBAC3B,CAAC;oBACD,OAAO,SAAS,CAAC;gBACrB,CAAC,CAAC,EACF,GAAG,IAAI,CACV;aACJ,CAAC,CAAC;QACP,CAAC;IACL,CAAC;IAES,6BAA6B;QACnC,IAAI,CAAC,qBAAqB,CAAC,eAAe,CAAC,wBAAc,CAAC,eAAe,CAAC,EAAE,EAAE,IAAI,CAAC,uBAAuB,EAAE,CAAC,CAAC;QAC9G,IAAI,CAAC,qBAAqB,CAAC,eAAe,CAAC,wBAAc,CAAC,kBAAkB,CAAC,EAAE,EAAE,IAAI,CAAC,2BAA2B,EAAE,CAAC,CAAC;QACrH,IAAI,CAAC,qBAAqB,CAAC,eAAe,CAAC,wBAAc,CAAC,UAAU,CAAC,EAAE,EAAE,IAAI,CAAC,mBAAmB,EAAE,CAAC,CAAC;QACrG,IAAI,CAAC,qBAAqB,CAAC,eAAe,CAAC,wBAAc,CAAC,mBAAmB,CAAC,EAAE,EAAE,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,CAAC,CAAC;QACtH,IAAI,CAAC,qBAAqB,CAAC,eAAe,CAAC,wBAAc,CAAC,iBAAiB,CAAC,EAAE,EAAE,IAAI,CAAC,uBAAuB,CAAC,KAAK,CAAC,CAAC,CAAC;QACrH,IAAI,CAAC,qBAAqB,CAAC,eAAe,CAAC,wBAAc,CAAC,aAAa,CAAC,EAAE,EAAE,IAAI,CAAC,4BAA4B,EAAE,CAAC,CAAC;QACjH,IAAI,CAAC,qBAAqB,CAAC,eAAe,CAAC,wBAAc,CAAC,gBAAgB,CAAC,EAAE,EAAE,IAAI,CAAC,oCAAoC,EAAE,CAAC,CAAC;IAChI,CAAC;IAES,uBAAuB;QAC7B,OAAO;YACH,OAAO,EAAE,CAAC,MAAoB,EAAE,GAAW,EAAE,QAAkB,EAAE,SAAqB,EAAE,EAAE;gBACtF,uCAAkB,CAAC,GAAG,CAAC,0BAAe,CAAC,CAAC,cAAc,CAClD,8BAA8B,EAC9B,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,EACrB,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC,EAC7B,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAC7C,CAAC;YACN,CAAC;SACJ,CAAC;IACN,CAAC;IAES,2BAA2B;QACjC,OAAO;YACH,OAAO,EAAE,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC;SACvD,CAAC;IACN,CAAC;IACS,oBAAoB,CAAC,MAAoB;QAC/C,MAAM,KAAK,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;YAC1C,KAAK,EAAE,SAAG,CAAC,iBAAiB,CAAC,gBAAgB,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;YAC7E,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE,SAAS,CAAC;SAC1D,CAAC,CAAC,CAAC;QACJ,IAAI,CAAC,iBAAiB,EAAE,aAAa,CAAC,KAAK,EAAE,EAAE,WAAW,EAAE,SAAG,CAAC,iBAAiB,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC;IAC1G,CAAC;IAES,mBAAmB;QACzB,OAAO;YACH,OAAO,EAAE,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC;SAC/C,CAAC;IACN,CAAC;IAES,YAAY,CAAC,MAAoB;QACvC,MAAM,KAAK,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAC9C,CAAC;YACG,KAAK,EAAE,UAAU;YACjB,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC;SACjD,CAAC,CACD,CAAC;QACF,IAAI,CAAC,iBAAiB,EAAE,aAAa,CAAC,KAAK,EAAE,EAAE,WAAW,EAAE,SAAG,CAAC,iBAAiB,CAAC,6BAA6B,CAAC,EAAE,CAAC,CAAC;IACxH,CAAC;IAES,MAAM,CAAC,MAAoB,EAAE,UAAkB;QACrD,MAAM,KAAK,GAAG,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,eAAe,CAAC;QACjE,IAAI,KAAK,EAAE,CAAC;YACR,IAAI,UAAU,KAAK,MAAM,IAAI,UAAU,KAAK,MAAM,EAAE,CAAC;gBACjD,KAAK,CAAC,OAAO,gCAAwB,CAAC;YAC1C,CAAC;iBAAM,CAAC;gBACJ,KAAK,CAAC,OAAO,8BAAsB,CAAC;YACxC,CAAC;QACL,CAAC;IACL,CAAC;IAES,uBAAuB,CAAC,SAAkB;QAChD,OAAO;YACH,OAAO,EAAE,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE,SAAS,CAAC;SAC9D,CAAC;IACN,CAAC;IACS,gBAAgB,CAAC,MAAoB,EAAE,SAAkB;QAC/D,MAAM,KAAK,GAAG,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,eAAe,CAAC;QACjE,IAAI,KAAK,EAAE,CAAC;YACR,MAAM,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC,UAAU,EAAE,CAAC;YACvC,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;YACpD,MAAM,cAAc,GAAG,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CACxC,CAAC;gBACG,KAAK,EAAE,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,IAAI,GAAG,KAAK,GAAG,SAAG,CAAC,iBAAiB,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE;gBACvG,8DAA8D;gBAC9D,OAAO,EAAE,GAAG,EAAE,CACV,KAAK,CAAC,aAAa,CAAC;oBAChB,OAAO,EAAE,IAAI,IAAI,OAAO;oBACxB,UAAU,EAAE,IAAI,IAAI,OAAO;oBAC3B,YAAY,EAAE,SAAS;iBAC1B,CAAC;aACT,CAAC,CACD,CAAC;YACF,IAAI,CAAC,iBAAiB,EAAE,aAAa,CAAC,cAAc,EAAE,EAAE,WAAW,EAAE,SAAG,CAAC,iBAAiB,CAAC,kCAAkC,CAAC,EAAE,CAAC,CAAC;QACtI,CAAC;IACL,CAAC;IAES,4BAA4B;QAClC,OAAO;YACH,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,eAAe,EAAE,CAAC,MAAM,CAAC;SAClE,CAAC;IACN,CAAC;IAES,oCAAoC;QAC1C,OAAO;YACH,OAAO,EAAE,KAAK,IAAI,EAAE,CAAC,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,eAAe,EAAE,CAAC;SAC/E,CAAC;IACN,CAAC;IAES,eAAe;QACrB,MAAM,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC;QAChD,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,IAAI,4BAAY,CAAC,UAAU,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC;IACrF,CAAC;IAES,KAAK,CAAC,YAAY,CAAC,MAAqB;QAC9C,IAAI,MAAM,EAAE,CAAC;YACT,OAAO,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;QACpC,CAAC;IACL,CAAC;IAES,KAAK,CAAC,0BAA0B,CAAC,OAAyD;QAChG,IAAI,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;YACnC,IAAI,CAAC;gBACD,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;gBACxC,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;YAC3B,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACb,MAAM,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;YACrE,CAAC;QACL,CAAC;IACL,CAAC;CACJ,CAAA;AAxRY,kEAA2B;AAGjB;IADlB,IAAA,kBAAM,EAAC,+CAAqB,CAAC;sCACY,+CAAqB;0EAAC;AAG7C;IADlB,IAAA,kBAAM,EAAC,yBAAe,CAAC;sCACY,yBAAe;oEAAC;AAGjC;IADlB,IAAA,kBAAM,EAAC,wDAAyB,CAAC;sCACV,wDAAyB;wDAAC;AAG/B;IADlB,IAAA,kBAAM,EAAC,2BAAiB,CAAC;IAAE,IAAA,oBAAQ,GAAE;;sEACkB;AAGrC;IADlB,IAAA,kBAAM,EAAC,0BAAgB,CAAC;sCACC,0BAAgB;0DAAC;AAGjC;IADT,IAAA,kBAAM,EAAC,uBAAa,CAAC;sCACG,uBAAa;kEAAC;sCAlB9B,2BAA2B;IADvC,IAAA,sBAAU,GAAE;GACA,2BAA2B,CAwRvC"}
|
|
@@ -9,9 +9,9 @@ import { StandardMouseEvent } from '@theia/monaco-editor-core/esm/vs/base/browse
|
|
|
9
9
|
export declare class MonacoContextMenuService implements IContextMenuService {
|
|
10
10
|
readonly _serviceBrand: undefined;
|
|
11
11
|
protected readonly onDidShowContextMenuEmitter: Emitter<void>;
|
|
12
|
-
|
|
12
|
+
readonly onDidShowContextMenu: Event<void>;
|
|
13
13
|
protected readonly onDidHideContextMenuEmitter: Emitter<void>;
|
|
14
|
-
|
|
14
|
+
readonly onDidHideContextMenu: Event<void>;
|
|
15
15
|
protected readonly contextMenuRenderer: ContextMenuRenderer;
|
|
16
16
|
toAnchor(anchor: HTMLElement | Coordinate | StandardMouseEvent): Anchor;
|
|
17
17
|
private getContext;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monaco-context-menu.d.ts","sourceRoot":"","sources":["../../src/browser/monaco-context-menu.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAEvD,OAAO,EAAE,MAAM,EAAqB,mBAAmB,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACrG,OAAO,EAAE,IAAI,EAAE,MAAM,oCAAoC,CAAC;AAE1D,OAAO,EAAE,mBAAmB,EAAE,MAAM,2EAA2E,CAAC;AAChH,OAAO,EAAE,oBAAoB,EAAE,MAAM,2DAA2D,CAAC;AACjG,OAAO,EAAE,OAAO,EAA4B,MAAM,sDAAsD,CAAC;AAEzG,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,oDAAoD,CAAC;AACpF,OAAO,EAAE,kBAAkB,EAAE,MAAM,0DAA0D,CAAC;AAE9F,qBACa,wBAAyB,YAAW,mBAAmB;IAChE,SAAiB,aAAa,EAAE,SAAS,CAAC;IAE1C,SAAS,CAAC,QAAQ,CAAC,2BAA2B,gBAAuB;IACrE,
|
|
1
|
+
{"version":3,"file":"monaco-context-menu.d.ts","sourceRoot":"","sources":["../../src/browser/monaco-context-menu.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAEvD,OAAO,EAAE,MAAM,EAAqB,mBAAmB,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACrG,OAAO,EAAE,IAAI,EAAE,MAAM,oCAAoC,CAAC;AAE1D,OAAO,EAAE,mBAAmB,EAAE,MAAM,2EAA2E,CAAC;AAChH,OAAO,EAAE,oBAAoB,EAAE,MAAM,2DAA2D,CAAC;AACjG,OAAO,EAAE,OAAO,EAA4B,MAAM,sDAAsD,CAAC;AAEzG,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,oDAAoD,CAAC;AACpF,OAAO,EAAE,kBAAkB,EAAE,MAAM,0DAA0D,CAAC;AAE9F,qBACa,wBAAyB,YAAW,mBAAmB;IAChE,SAAiB,aAAa,EAAE,SAAS,CAAC;IAE1C,SAAS,CAAC,QAAQ,CAAC,2BAA2B,gBAAuB;IACrE,QAAQ,CAAC,oBAAoB,EAAE,KAAK,CAAC,IAAI,CAAC,CAA0C;IACpF,SAAS,CAAC,QAAQ,CAAC,2BAA2B,gBAAuB;IACrE,QAAQ,CAAC,oBAAoB,EAAE,KAAK,CAAC,IAAI,CAAC,CAA0C;IAEvD,SAAS,CAAC,QAAQ,CAAC,mBAAmB,EAAE,mBAAmB,CAAC;IAEzF,QAAQ,CAAC,MAAM,EAAE,WAAW,GAAG,UAAU,GAAG,kBAAkB,GAAG,MAAM;IAUvE,OAAO,CAAC,UAAU;IAWlB,eAAe,CAAC,QAAQ,EAAE,oBAAoB,GAAG,IAAI;IA4BrD,SAAS,CAAC,YAAY,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,SAAS,OAAO,EAAE,GAAG,IAAI;IAkCrE,SAAS,CAAC,QAAQ,IAAI,QAAQ;CAIjC"}
|
|
@@ -29,16 +29,10 @@ const mouseEvent_1 = require("@theia/monaco-editor-core/esm/vs/base/browser/mous
|
|
|
29
29
|
let MonacoContextMenuService = class MonacoContextMenuService {
|
|
30
30
|
constructor() {
|
|
31
31
|
this.onDidShowContextMenuEmitter = new event_1.Emitter();
|
|
32
|
+
this.onDidShowContextMenu = this.onDidShowContextMenuEmitter.event;
|
|
32
33
|
this.onDidHideContextMenuEmitter = new event_1.Emitter();
|
|
34
|
+
this.onDidHideContextMenu = this.onDidHideContextMenuEmitter.event;
|
|
33
35
|
}
|
|
34
|
-
get onDidShowContextMenu() {
|
|
35
|
-
return this.onDidShowContextMenuEmitter.event;
|
|
36
|
-
}
|
|
37
|
-
;
|
|
38
|
-
get onDidHideContextMenu() {
|
|
39
|
-
return this.onDidShowContextMenuEmitter.event;
|
|
40
|
-
}
|
|
41
|
-
;
|
|
42
36
|
toAnchor(anchor) {
|
|
43
37
|
if (anchor instanceof HTMLElement) {
|
|
44
38
|
return { x: anchor.offsetLeft, y: anchor.offsetTop };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monaco-context-menu.js","sourceRoot":"","sources":["../../src/browser/monaco-context-menu.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;;AAEhF,4DAAkE;AAElE,uDAAgE;AAChE,qDAAqG;AACrG,gEAA0D;AAC1D,kEAAsE;AAGtE,kFAAyG;AACzG,8FAAkG;AAClG,8EAAoF;AACpF,yFAA8F;AAGvF,IAAM,wBAAwB,GAA9B,MAAM,wBAAwB;IAA9B;QAGgB,gCAA2B,GAAG,IAAI,eAAO,EAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"monaco-context-menu.js","sourceRoot":"","sources":["../../src/browser/monaco-context-menu.ts"],"names":[],"mappings":"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"}
|
|
@@ -32,6 +32,7 @@ export declare class MonacoDiffEditor extends MonacoEditor {
|
|
|
32
32
|
deltaDecorations(params: DeltaDecorationParams): string[];
|
|
33
33
|
getResourceUri(): URI;
|
|
34
34
|
createMoveToUri(resourceUri: URI): URI;
|
|
35
|
+
handleVisibilityChanged(nowVisible: boolean): void;
|
|
35
36
|
readonly onShouldDisplayDirtyDiffChanged: undefined;
|
|
36
37
|
shouldDisplayDirtyDiff(): boolean;
|
|
37
38
|
setShouldDisplayDirtyDiff(value: boolean): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monaco-diff-editor.d.ts","sourceRoot":"","sources":["../../src/browser/monaco-diff-editor.ts"],"names":[],"mappings":"AAgBA,OAAO,GAAG,MAAM,4BAA4B,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAC5F,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,sBAAsB,EAAE,YAAY,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAC7F,OAAO,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAE7E,OAAO,KAAK,MAAM,MAAM,2BAA2B,CAAC;AACpD,OAAO,EAAe,8BAA8B,EAAE,MAAM,+DAA+D,CAAC;AAC5H,OAAO,EAA4C,qBAAqB,EAA+C,MAC9G,iFAAiF,CAAC;
|
|
1
|
+
{"version":3,"file":"monaco-diff-editor.d.ts","sourceRoot":"","sources":["../../src/browser/monaco-diff-editor.ts"],"names":[],"mappings":"AAgBA,OAAO,GAAG,MAAM,4BAA4B,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAC5F,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,sBAAsB,EAAE,YAAY,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAC7F,OAAO,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAE7E,OAAO,KAAK,MAAM,MAAM,2BAA2B,CAAC;AACpD,OAAO,EAAe,8BAA8B,EAAE,MAAM,+DAA+D,CAAC;AAC5H,OAAO,EAA4C,qBAAqB,EAA+C,MAC9G,iFAAiF,CAAC;AAS3F,OAAO,EAAE,cAAc,EAAE,MAAM,qEAAqE,CAAC;AACrG,OAAO,EAAE,WAAW,EAAE,MAAM,6EAA6E,CAAC;AAE1G,yBAAiB,gBAAgB,CAAC;IAC9B,UAAiB,QAAS,SAAQ,YAAY,CAAC,cAAc,EAAE,8BAA8B;KAC5F;CACJ;AAED,qBAAa,gBAAiB,SAAQ,YAAY;IAQ1C,QAAQ,CAAC,aAAa,EAAE,iBAAiB;IACzC,QAAQ,CAAC,aAAa,EAAE,iBAAiB;IAEzC,SAAS,CAAC,QAAQ,CAAC,oBAAoB,EAAE,0BAA0B;IAVvE,SAAS,CAAC,WAAW,EAAE,qBAAqB,CAAC;IAC7C,SAAS,CAAC,cAAc,EAAE,aAAa,CAAC;IACxC,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC;gBAG/D,GAAG,EAAE,GAAG,EACR,IAAI,EAAE,WAAW,EACR,aAAa,EAAE,iBAAiB,EAChC,aAAa,EAAE,iBAAiB,EACzC,QAAQ,EAAE,oBAAoB,EACX,oBAAoB,EAAE,0BAA0B,EACnE,OAAO,CAAC,EAAE,gBAAgB,CAAC,QAAQ,EACnC,QAAQ,CAAC,EAAE,sBAAsB,EACjC,YAAY,CAAC,EAAE,YAAY;IAS/B,IAAI,UAAU,IAAI,MAAM,CAAC,MAAM,CAAC,qBAAqB,CAEpD;IAED,IAAI,aAAa,IAAI,aAAa,CAEjC;IAED,IAAI,eAAe,IAAI,WAAW,EAAE,CAEnC;cAEkB,MAAM,CAAC,OAAO,CAAC,EAAE,8BAA8B,EAAE,QAAQ,CAAC,EAAE,sBAAsB,GAAG,UAAU;IAclH,SAAS,CAAC,gBAAgB,EAAE,cAAc,CAAC,mBAAmB,CAAC,CAAC;IAChE,SAAS,CAAC,+BAA+B,UAAQ;cAC9B,MAAM,CAAC,SAAS,EAAE,SAAS,GAAG,IAAI,GAAG,IAAI;IAenD,iBAAiB,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO;IAKtC,gBAAgB,CAAC,MAAM,EAAE,qBAAqB,GAAG,MAAM,EAAE;IAKzD,cAAc,IAAI,GAAG;IAGrB,eAAe,CAAC,WAAW,EAAE,GAAG,GAAG,GAAG;IAKtC,uBAAuB,CAAC,UAAU,EAAE,OAAO,GAAG,IAAI;IAQ3D,SAAkB,+BAA+B,YAAa;IACrD,sBAAsB,IAAI,OAAO;IAGjC,yBAAyB,CAAC,KAAK,EAAE,OAAO,GAAG,IAAI;IAIxD,cAAuB,UAAU,IAAI,MAAM,CAAC,MAAM,CAAC,OAAO,CAEzD;IAED,cAAuB,SAAS,IAAI,MAAM,CAAC,MAAM,CAAC,YAAY,CAE7D;CACJ"}
|
|
@@ -80,12 +80,19 @@ class MonacoDiffEditor extends monaco_editor_1.MonacoEditor {
|
|
|
80
80
|
return [];
|
|
81
81
|
}
|
|
82
82
|
getResourceUri() {
|
|
83
|
-
return new uri_1.default(this.
|
|
83
|
+
return new uri_1.default(this.modifiedModel.uri);
|
|
84
84
|
}
|
|
85
85
|
createMoveToUri(resourceUri) {
|
|
86
86
|
const [left, right] = diff_uris_1.DiffUris.decode(this.uri);
|
|
87
87
|
return diff_uris_1.DiffUris.encode(left.withPath(resourceUri.path), right.withPath(resourceUri.path));
|
|
88
88
|
}
|
|
89
|
+
handleVisibilityChanged(nowVisible) {
|
|
90
|
+
const isFirstShow = nowVisible && !this.savedViewState;
|
|
91
|
+
super.handleVisibilityChanged(nowVisible);
|
|
92
|
+
if (isFirstShow) {
|
|
93
|
+
this._diffEditor.revealFirstDiff();
|
|
94
|
+
}
|
|
95
|
+
}
|
|
89
96
|
shouldDisplayDirtyDiff() {
|
|
90
97
|
return false;
|
|
91
98
|
}
|
|
@@ -101,7 +108,7 @@ class MonacoDiffEditor extends monaco_editor_1.MonacoEditor {
|
|
|
101
108
|
}
|
|
102
109
|
exports.MonacoDiffEditor = MonacoDiffEditor;
|
|
103
110
|
class EmbeddedDiffEditor extends embeddedDiffEditorWidget_1.EmbeddedDiffEditorWidget {
|
|
104
|
-
_createInnerEditor(instantiationService, container, options) {
|
|
111
|
+
_createInnerEditor(instantiationService, container, options, _editorWidgetOptions) {
|
|
105
112
|
return instantiationService.createInstance(standaloneCodeEditor_1.StandaloneCodeEditor, container, options);
|
|
106
113
|
}
|
|
107
114
|
getOriginalEditor() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monaco-diff-editor.js","sourceRoot":"","sources":["../../src/browser/monaco-diff-editor.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;AAEhF,oDAA6C;AAI7C,mDAA6F;AAE7F,iEAA6D;AAG7D,0HAC2F;
|
|
1
|
+
{"version":3,"file":"monaco-diff-editor.js","sourceRoot":"","sources":["../../src/browser/monaco-diff-editor.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monaco-editor-provider.d.ts","sourceRoot":"","sources":["../../src/browser/monaco-editor-provider.ts"],"names":[],"mappings":"AAiBA,OAAO,GAAG,MAAM,4BAA4B,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAGtE,OAAO,EAAE,oBAAoB,EAAa,UAAU,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AACxG,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAC7E,OAAO,EAAE,sBAAsB,EAAE,YAAY,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAC7F,OAAO,EAAE,iBAAiB,EAA0B,MAAM,uBAAuB,CAAC;AAClF,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,EAAE,kBAAkB,EAAE,aAAa,EAA6B,WAAW,EAAc,MAAM,yBAAyB,CAAC;AAGhI,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAC3E,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAC3E,OAAO,KAAK,MAAM,MAAM,2BAA2B,CAAC;AAEpD,OAAO,EAAkB,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,gEAAgE,CAAC;
|
|
1
|
+
{"version":3,"file":"monaco-editor-provider.d.ts","sourceRoot":"","sources":["../../src/browser/monaco-editor-provider.ts"],"names":[],"mappings":"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"}
|
|
@@ -38,6 +38,7 @@ const standaloneServices_1 = require("@theia/monaco-editor-core/esm/vs/editor/st
|
|
|
38
38
|
const opener_1 = require("@theia/monaco-editor-core/esm/vs/platform/opener/common/opener");
|
|
39
39
|
const keybinding_1 = require("@theia/monaco-editor-core/esm/vs/platform/keybinding/common/keybinding");
|
|
40
40
|
const contextView_1 = require("@theia/monaco-editor-core/esm/vs/platform/contextview/browser/contextView");
|
|
41
|
+
const event_1 = require("@theia/monaco-editor-core/esm/vs/base/common/event");
|
|
41
42
|
const keybindings_1 = require("@theia/monaco-editor-core/esm/vs/base/common/keybindings");
|
|
42
43
|
const contextkey_1 = require("@theia/monaco-editor-core/esm/vs/platform/contextkey/common/contextkey");
|
|
43
44
|
const resolverService_1 = require("@theia/monaco-editor-core/esm/vs/editor/common/services/resolverService");
|
|
@@ -285,7 +286,7 @@ let MonacoEditorProvider = class MonacoEditorProvider {
|
|
|
285
286
|
async createInline(uri, node, options) {
|
|
286
287
|
return this.doCreateEditor(uri, async (override, toDispose) => {
|
|
287
288
|
const overrides = override ? Array.from(override) : [];
|
|
288
|
-
overrides.push([contextView_1.IContextMenuService, { showContextMenu: () => { } }]);
|
|
289
|
+
overrides.push([contextView_1.IContextMenuService, { showContextMenu: () => { }, onDidShowContextMenu: event_1.Event.None, onDidHideContextMenu: event_1.Event.None }]);
|
|
289
290
|
const document = await this.getModel(uri, toDispose);
|
|
290
291
|
document.suppressOpenEditorWhenDirty = true;
|
|
291
292
|
const model = (await document.load()).textEditorModel;
|
|
@@ -305,7 +306,7 @@ let MonacoEditorProvider = class MonacoEditorProvider {
|
|
|
305
306
|
async createSimpleInline(uri, node, options, widgetOptions) {
|
|
306
307
|
return this.doCreateEditor(uri, async (override, toDispose) => {
|
|
307
308
|
const overrides = override ? Array.from(override) : [];
|
|
308
|
-
overrides.push([contextView_1.IContextMenuService, { showContextMenu: () => { } }]);
|
|
309
|
+
overrides.push([contextView_1.IContextMenuService, { showContextMenu: () => { }, onDidShowContextMenu: event_1.Event.None, onDidHideContextMenu: event_1.Event.None }]);
|
|
309
310
|
const document = await this.getModel(uri, toDispose);
|
|
310
311
|
document.suppressOpenEditorWhenDirty = true;
|
|
311
312
|
const model = (await document.load()).textEditorModel;
|