@theia/monaco 1.77.0-next.99 → 1.78.0-next.0
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/lib/browser/content-hover-widget-patcher.js +6 -9
- package/lib/browser/content-hover-widget-patcher.js.map +1 -1
- package/lib/browser/default-content-hover-widget-patcher.d.ts +1 -1
- package/lib/browser/default-content-hover-widget-patcher.d.ts.map +1 -1
- package/lib/browser/default-content-hover-widget-patcher.js +7 -10
- package/lib/browser/default-content-hover-widget-patcher.js.map +1 -1
- package/lib/browser/index.d.ts +2 -2
- package/lib/browser/index.d.ts.map +1 -1
- package/lib/browser/index.js +2 -5
- package/lib/browser/index.js.map +1 -1
- package/lib/browser/markdown-renderer/monaco-markdown-renderer.d.ts +4 -4
- package/lib/browser/markdown-renderer/monaco-markdown-renderer.d.ts.map +1 -1
- package/lib/browser/markdown-renderer/monaco-markdown-renderer.js +29 -37
- package/lib/browser/markdown-renderer/monaco-markdown-renderer.js.map +1 -1
- package/lib/browser/monaco-bulk-edit-service.d.ts +4 -4
- package/lib/browser/monaco-bulk-edit-service.d.ts.map +1 -1
- package/lib/browser/monaco-bulk-edit-service.js +10 -14
- package/lib/browser/monaco-bulk-edit-service.js.map +1 -1
- package/lib/browser/monaco-code-action-save-participant.d.ts +3 -3
- package/lib/browser/monaco-code-action-save-participant.d.ts.map +1 -1
- package/lib/browser/monaco-code-action-save-participant.js +12 -16
- package/lib/browser/monaco-code-action-save-participant.js.map +1 -1
- package/lib/browser/monaco-code-action-service.d.ts +2 -2
- package/lib/browser/monaco-code-action-service.d.ts.map +1 -1
- package/lib/browser/monaco-code-action-service.js +25 -29
- package/lib/browser/monaco-code-action-service.js.map +1 -1
- package/lib/browser/monaco-color-registry.d.ts +4 -4
- package/lib/browser/monaco-color-registry.d.ts.map +1 -1
- package/lib/browser/monaco-color-registry.js +23 -26
- package/lib/browser/monaco-color-registry.js.map +1 -1
- package/lib/browser/monaco-command-registry.d.ts +2 -2
- package/lib/browser/monaco-command-registry.d.ts.map +1 -1
- package/lib/browser/monaco-command-registry.js +15 -21
- package/lib/browser/monaco-command-registry.js.map +1 -1
- package/lib/browser/monaco-command-service.d.ts +2 -2
- package/lib/browser/monaco-command-service.d.ts.map +1 -1
- package/lib/browser/monaco-command-service.js +17 -24
- package/lib/browser/monaco-command-service.js.map +1 -1
- package/lib/browser/monaco-command.d.ts +3 -3
- package/lib/browser/monaco-command.d.ts.map +1 -1
- package/lib/browser/monaco-command.js +62 -71
- package/lib/browser/monaco-command.js.map +1 -1
- package/lib/browser/monaco-context-key-service.d.ts +2 -2
- package/lib/browser/monaco-context-key-service.d.ts.map +1 -1
- package/lib/browser/monaco-context-key-service.js +17 -23
- package/lib/browser/monaco-context-key-service.js.map +1 -1
- package/lib/browser/monaco-context-menu.d.ts +5 -5
- package/lib/browser/monaco-context-menu.d.ts.map +1 -1
- package/lib/browser/monaco-context-menu.js +26 -30
- package/lib/browser/monaco-context-menu.js.map +1 -1
- package/lib/browser/monaco-diff-computer.js +10 -13
- package/lib/browser/monaco-diff-computer.js.map +1 -1
- package/lib/browser/monaco-diff-editor.d.ts +7 -7
- package/lib/browser/monaco-diff-editor.d.ts.map +1 -1
- package/lib/browser/monaco-diff-editor.js +14 -19
- package/lib/browser/monaco-diff-editor.js.map +1 -1
- package/lib/browser/monaco-diff-navigator-factory.d.ts +1 -1
- package/lib/browser/monaco-diff-navigator-factory.d.ts.map +1 -1
- package/lib/browser/monaco-diff-navigator-factory.js +5 -8
- package/lib/browser/monaco-diff-navigator-factory.js.map +1 -1
- package/lib/browser/monaco-editor-content-menu.d.ts +2 -2
- package/lib/browser/monaco-editor-content-menu.d.ts.map +1 -1
- package/lib/browser/monaco-editor-content-menu.js +36 -43
- package/lib/browser/monaco-editor-content-menu.js.map +1 -1
- package/lib/browser/monaco-editor-model.d.ts +4 -4
- package/lib/browser/monaco-editor-model.d.ts.map +1 -1
- package/lib/browser/monaco-editor-model.js +52 -52
- package/lib/browser/monaco-editor-model.js.map +1 -1
- package/lib/browser/monaco-editor-model.spec.d.ts +2 -0
- package/lib/browser/monaco-editor-model.spec.d.ts.map +1 -0
- package/lib/browser/monaco-editor-model.spec.js +129 -0
- package/lib/browser/monaco-editor-model.spec.js.map +1 -0
- package/lib/browser/monaco-editor-overlay-button.d.ts +1 -1
- package/lib/browser/monaco-editor-overlay-button.d.ts.map +1 -1
- package/lib/browser/monaco-editor-overlay-button.js +11 -16
- package/lib/browser/monaco-editor-overlay-button.js.map +1 -1
- package/lib/browser/monaco-editor-peek-view-widget.d.ts +2 -2
- package/lib/browser/monaco-editor-peek-view-widget.d.ts.map +1 -1
- package/lib/browser/monaco-editor-peek-view-widget.js +17 -25
- package/lib/browser/monaco-editor-peek-view-widget.js.map +1 -1
- package/lib/browser/monaco-editor-provider.d.ts +10 -10
- package/lib/browser/monaco-editor-provider.d.ts.map +1 -1
- package/lib/browser/monaco-editor-provider.js +92 -108
- package/lib/browser/monaco-editor-provider.js.map +1 -1
- package/lib/browser/monaco-editor-service.d.ts +6 -6
- package/lib/browser/monaco-editor-service.d.ts.map +1 -1
- package/lib/browser/monaco-editor-service.js +47 -59
- package/lib/browser/monaco-editor-service.js.map +1 -1
- package/lib/browser/monaco-editor-zone-widget.js +10 -15
- package/lib/browser/monaco-editor-zone-widget.js.map +1 -1
- package/lib/browser/monaco-editor.d.ts +7 -7
- package/lib/browser/monaco-editor.d.ts.map +1 -1
- package/lib/browser/monaco-editor.js +78 -88
- package/lib/browser/monaco-editor.js.map +1 -1
- package/lib/browser/monaco-editor.spec.js +65 -68
- package/lib/browser/monaco-editor.spec.js.map +1 -1
- package/lib/browser/monaco-formatter-service.d.ts +5 -7
- package/lib/browser/monaco-formatter-service.d.ts.map +1 -1
- package/lib/browser/monaco-formatter-service.js +33 -55
- package/lib/browser/monaco-formatter-service.js.map +1 -1
- package/lib/browser/monaco-formatting-conflicts.d.ts +2 -2
- package/lib/browser/monaco-formatting-conflicts.d.ts.map +1 -1
- package/lib/browser/monaco-formatting-conflicts.js +19 -25
- package/lib/browser/monaco-formatting-conflicts.js.map +1 -1
- package/lib/browser/monaco-frontend-application-contribution.d.ts +4 -4
- package/lib/browser/monaco-frontend-application-contribution.d.ts.map +1 -1
- package/lib/browser/monaco-frontend-application-contribution.js +43 -56
- package/lib/browser/monaco-frontend-application-contribution.js.map +1 -1
- package/lib/browser/monaco-frontend-module.d.ts.map +1 -1
- package/lib/browser/monaco-frontend-module.js +177 -198
- package/lib/browser/monaco-frontend-module.js.map +1 -1
- package/lib/browser/monaco-gotoline-quick-access.d.ts +2 -2
- package/lib/browser/monaco-gotoline-quick-access.d.ts.map +1 -1
- package/lib/browser/monaco-gotoline-quick-access.js +16 -20
- package/lib/browser/monaco-gotoline-quick-access.js.map +1 -1
- package/lib/browser/monaco-gotosymbol-quick-access.d.ts +5 -5
- package/lib/browser/monaco-gotosymbol-quick-access.d.ts.map +1 -1
- package/lib/browser/monaco-gotosymbol-quick-access.js +18 -22
- package/lib/browser/monaco-gotosymbol-quick-access.js.map +1 -1
- package/lib/browser/monaco-icon-registry.d.ts +1 -1
- package/lib/browser/monaco-icon-registry.d.ts.map +1 -1
- package/lib/browser/monaco-icon-registry.js +7 -10
- package/lib/browser/monaco-icon-registry.js.map +1 -1
- package/lib/browser/monaco-indexed-db.d.ts +1 -1
- package/lib/browser/monaco-indexed-db.d.ts.map +1 -1
- package/lib/browser/monaco-indexed-db.js +28 -35
- package/lib/browser/monaco-indexed-db.js.map +1 -1
- package/lib/browser/monaco-init.d.ts +1 -1
- package/lib/browser/monaco-init.d.ts.map +1 -1
- package/lib/browser/monaco-init.js +75 -95
- package/lib/browser/monaco-init.js.map +1 -1
- package/lib/browser/monaco-init.spec.js +18 -20
- package/lib/browser/monaco-init.spec.js.map +1 -1
- package/lib/browser/monaco-keybinding.d.ts +2 -2
- package/lib/browser/monaco-keybinding.d.ts.map +1 -1
- package/lib/browser/monaco-keybinding.js +42 -53
- package/lib/browser/monaco-keybinding.js.map +1 -1
- package/lib/browser/monaco-keybinding.spec.js +50 -50
- package/lib/browser/monaco-keybinding.spec.js.map +1 -1
- package/lib/browser/monaco-keycode-map.d.ts +1 -1
- package/lib/browser/monaco-keycode-map.d.ts.map +1 -1
- package/lib/browser/monaco-keycode-map.js +122 -126
- package/lib/browser/monaco-keycode-map.js.map +1 -1
- package/lib/browser/monaco-languages.d.ts +2 -2
- package/lib/browser/monaco-languages.d.ts.map +1 -1
- package/lib/browser/monaco-languages.js +33 -41
- package/lib/browser/monaco-languages.js.map +1 -1
- package/lib/browser/monaco-marker-collection.d.ts +1 -1
- package/lib/browser/monaco-marker-collection.d.ts.map +1 -1
- package/lib/browser/monaco-marker-collection.js +2 -7
- package/lib/browser/monaco-marker-collection.js.map +1 -1
- package/lib/browser/monaco-menu.d.ts +2 -2
- package/lib/browser/monaco-menu.d.ts.map +1 -1
- package/lib/browser/monaco-menu.js +44 -48
- package/lib/browser/monaco-menu.js.map +1 -1
- package/lib/browser/monaco-mime-service.js +16 -20
- package/lib/browser/monaco-mime-service.js.map +1 -1
- package/lib/browser/monaco-nls.d.ts +1 -1
- package/lib/browser/monaco-nls.d.ts.map +1 -1
- package/lib/browser/monaco-nls.js +9 -16
- package/lib/browser/monaco-nls.js.map +1 -1
- package/lib/browser/monaco-outline-contribution.d.ts +2 -2
- package/lib/browser/monaco-outline-contribution.d.ts.map +1 -1
- package/lib/browser/monaco-outline-contribution.js +31 -36
- package/lib/browser/monaco-outline-contribution.js.map +1 -1
- package/lib/browser/monaco-outline-decorator.d.ts +1 -1
- package/lib/browser/monaco-outline-decorator.d.ts.map +1 -1
- package/lib/browser/monaco-outline-decorator.js +11 -14
- package/lib/browser/monaco-outline-decorator.js.map +1 -1
- package/lib/browser/monaco-outline-decorator.spec.js +15 -18
- package/lib/browser/monaco-outline-decorator.spec.js.map +1 -1
- package/lib/browser/monaco-quick-access-registry.js +17 -21
- package/lib/browser/monaco-quick-access-registry.js.map +1 -1
- package/lib/browser/monaco-quick-input-service.d.ts +9 -9
- package/lib/browser/monaco-quick-input-service.d.ts.map +1 -1
- package/lib/browser/monaco-quick-input-service.js +67 -78
- package/lib/browser/monaco-quick-input-service.js.map +1 -1
- package/lib/browser/monaco-quick-input-service.spec.js +9 -11
- package/lib/browser/monaco-quick-input-service.spec.js.map +1 -1
- package/lib/browser/monaco-resolved-keybinding.d.ts +1 -1
- package/lib/browser/monaco-resolved-keybinding.d.ts.map +1 -1
- package/lib/browser/monaco-resolved-keybinding.js +32 -37
- package/lib/browser/monaco-resolved-keybinding.js.map +1 -1
- package/lib/browser/monaco-snippet-suggest-provider.js +31 -37
- package/lib/browser/monaco-snippet-suggest-provider.js.map +1 -1
- package/lib/browser/monaco-standalone-theme-service.d.ts +2 -2
- package/lib/browser/monaco-standalone-theme-service.d.ts.map +1 -1
- package/lib/browser/monaco-standalone-theme-service.js +2 -6
- package/lib/browser/monaco-standalone-theme-service.js.map +1 -1
- package/lib/browser/monaco-status-bar-contribution.js +26 -29
- package/lib/browser/monaco-status-bar-contribution.js.map +1 -1
- package/lib/browser/monaco-text-model-service.d.ts +6 -6
- package/lib/browser/monaco-text-model-service.d.ts.map +1 -1
- package/lib/browser/monaco-text-model-service.js +44 -58
- package/lib/browser/monaco-text-model-service.js.map +1 -1
- package/lib/browser/monaco-theming-service.d.ts +2 -2
- package/lib/browser/monaco-theming-service.d.ts.map +1 -1
- package/lib/browser/monaco-theming-service.js +30 -37
- package/lib/browser/monaco-theming-service.js.map +1 -1
- package/lib/browser/monaco-to-protocol-converter.js +8 -11
- package/lib/browser/monaco-to-protocol-converter.js.map +1 -1
- package/lib/browser/monaco-undo-redo-handler.d.ts +2 -2
- package/lib/browser/monaco-undo-redo-handler.d.ts.map +1 -1
- package/lib/browser/monaco-undo-redo-handler.js +15 -18
- package/lib/browser/monaco-undo-redo-handler.js.map +1 -1
- package/lib/browser/monaco-utilities.d.ts +1 -1
- package/lib/browser/monaco-utilities.d.ts.map +1 -1
- package/lib/browser/monaco-utilities.js +1 -4
- package/lib/browser/monaco-utilities.js.map +1 -1
- package/lib/browser/monaco-workspace-context-service.d.ts +7 -7
- package/lib/browser/monaco-workspace-context-service.d.ts.map +1 -1
- package/lib/browser/monaco-workspace-context-service.js +12 -15
- package/lib/browser/monaco-workspace-context-service.js.map +1 -1
- package/lib/browser/monaco-workspace.d.ts +5 -5
- package/lib/browser/monaco-workspace.d.ts.map +1 -1
- package/lib/browser/monaco-workspace.js +78 -92
- package/lib/browser/monaco-workspace.js.map +1 -1
- package/lib/browser/protocol-to-monaco-converter.js +6 -9
- package/lib/browser/protocol-to-monaco-converter.js.map +1 -1
- package/lib/browser/simple-monaco-editor.d.ts +4 -4
- package/lib/browser/simple-monaco-editor.d.ts.map +1 -1
- package/lib/browser/simple-monaco-editor.js +25 -30
- package/lib/browser/simple-monaco-editor.js.map +1 -1
- package/lib/browser/textmate/index.d.ts +4 -4
- package/lib/browser/textmate/index.d.ts.map +1 -1
- package/lib/browser/textmate/index.js +4 -7
- package/lib/browser/textmate/index.js.map +1 -1
- package/lib/browser/textmate/monaco-textmate-frontend-bindings.d.ts +2 -2
- package/lib/browser/textmate/monaco-textmate-frontend-bindings.d.ts.map +1 -1
- package/lib/browser/textmate/monaco-textmate-frontend-bindings.js +33 -37
- package/lib/browser/textmate/monaco-textmate-frontend-bindings.js.map +1 -1
- package/lib/browser/textmate/monaco-textmate-service.d.ts +5 -5
- package/lib/browser/textmate/monaco-textmate-service.d.ts.map +1 -1
- package/lib/browser/textmate/monaco-textmate-service.js +52 -63
- package/lib/browser/textmate/monaco-textmate-service.js.map +1 -1
- package/lib/browser/textmate/monaco-theme-registry.d.ts +2 -2
- package/lib/browser/textmate/monaco-theme-registry.d.ts.map +1 -1
- package/lib/browser/textmate/monaco-theme-registry.js +40 -35
- package/lib/browser/textmate/monaco-theme-registry.js.map +1 -1
- package/lib/browser/textmate/monaco-theme-types.d.ts +1 -1
- package/lib/browser/textmate/monaco-theme-types.d.ts.map +1 -1
- package/lib/browser/textmate/monaco-theme-types.js +4 -7
- package/lib/browser/textmate/monaco-theme-types.js.map +1 -1
- package/lib/browser/textmate/monaco-theme-types.spec.js +12 -14
- package/lib/browser/textmate/monaco-theme-types.spec.js.map +1 -1
- package/lib/browser/textmate/textmate-contribution.d.ts +1 -1
- package/lib/browser/textmate/textmate-contribution.d.ts.map +1 -1
- package/lib/browser/textmate/textmate-contribution.js +3 -8
- package/lib/browser/textmate/textmate-contribution.js.map +1 -1
- package/lib/browser/textmate/textmate-registry.d.ts +1 -1
- package/lib/browser/textmate/textmate-registry.d.ts.map +1 -1
- package/lib/browser/textmate/textmate-registry.js +13 -17
- package/lib/browser/textmate/textmate-registry.js.map +1 -1
- package/lib/browser/textmate/textmate-snippet-completion-provider.js +4 -9
- package/lib/browser/textmate/textmate-snippet-completion-provider.js.map +1 -1
- package/lib/browser/textmate/textmate-tokenizer.d.ts +1 -1
- package/lib/browser/textmate/textmate-tokenizer.d.ts.map +1 -1
- package/lib/browser/textmate/textmate-tokenizer.js +5 -9
- package/lib/browser/textmate/textmate-tokenizer.js.map +1 -1
- package/lib/browser/textmate/textmate-tokenizer.spec.js +10 -12
- package/lib/browser/textmate/textmate-tokenizer.spec.js.map +1 -1
- package/lib/browser/workspace-symbol-command.d.ts +1 -1
- package/lib/browser/workspace-symbol-command.d.ts.map +1 -1
- package/lib/browser/workspace-symbol-command.js +35 -44
- package/lib/browser/workspace-symbol-command.js.map +1 -1
- package/lib/package.spec.d.ts +1 -0
- package/lib/package.spec.js +1 -1
- package/lib/package.spec.js.map +1 -1
- package/package.json +19 -9
- package/src/browser/content-hover-widget-patcher.ts +2 -2
- package/src/browser/default-content-hover-widget-patcher.ts +2 -2
- package/src/browser/index.ts +2 -2
- package/src/browser/markdown-renderer/monaco-markdown-renderer.ts +5 -5
- package/src/browser/monaco-bulk-edit-service.ts +4 -4
- package/src/browser/monaco-code-action-save-participant.ts +3 -3
- package/src/browser/monaco-code-action-service.ts +9 -9
- package/src/browser/monaco-color-registry.ts +5 -5
- package/src/browser/monaco-command-registry.ts +2 -2
- package/src/browser/monaco-command-service.ts +3 -3
- package/src/browser/monaco-command.ts +9 -9
- package/src/browser/monaco-context-key-service.ts +3 -3
- package/src/browser/monaco-context-menu.ts +6 -6
- package/src/browser/monaco-diff-computer.ts +2 -2
- package/src/browser/monaco-diff-editor.ts +15 -15
- package/src/browser/monaco-diff-navigator-factory.ts +1 -1
- package/src/browser/monaco-editor-content-menu.ts +5 -5
- package/src/browser/monaco-editor-model.spec.ts +157 -0
- package/src/browser/monaco-editor-model.ts +14 -9
- package/src/browser/monaco-editor-overlay-button.ts +1 -1
- package/src/browser/monaco-editor-peek-view-widget.ts +10 -10
- package/src/browser/monaco-editor-provider.ts +20 -20
- package/src/browser/monaco-editor-service.ts +9 -9
- package/src/browser/monaco-editor.spec.ts +11 -11
- package/src/browser/monaco-editor.ts +25 -25
- package/src/browser/monaco-formatter-service.ts +14 -28
- package/src/browser/monaco-formatting-conflicts.ts +5 -5
- package/src/browser/monaco-frontend-application-contribution.ts +10 -10
- package/src/browser/monaco-frontend-module.ts +66 -80
- package/src/browser/monaco-gotoline-quick-access.ts +6 -6
- package/src/browser/monaco-gotosymbol-quick-access.ts +7 -7
- package/src/browser/monaco-icon-registry.ts +1 -1
- package/src/browser/monaco-indexed-db.ts +1 -1
- package/src/browser/monaco-init.spec.ts +4 -4
- package/src/browser/monaco-init.ts +32 -32
- package/src/browser/monaco-keybinding.spec.ts +15 -11
- package/src/browser/monaco-keybinding.ts +8 -8
- package/src/browser/monaco-keycode-map.ts +2 -2
- package/src/browser/monaco-languages.ts +4 -4
- package/src/browser/monaco-marker-collection.ts +1 -1
- package/src/browser/monaco-menu.ts +3 -3
- package/src/browser/monaco-mime-service.ts +5 -5
- package/src/browser/monaco-nls.ts +1 -1
- package/src/browser/monaco-outline-contribution.ts +6 -6
- package/src/browser/monaco-outline-decorator.spec.ts +5 -5
- package/src/browser/monaco-outline-decorator.ts +1 -1
- package/src/browser/monaco-quick-access-registry.ts +5 -5
- package/src/browser/monaco-quick-input-service.spec.ts +2 -2
- package/src/browser/monaco-quick-input-service.ts +24 -19
- package/src/browser/monaco-resolved-keybinding.ts +6 -6
- package/src/browser/monaco-snippet-suggest-provider.ts +1 -1
- package/src/browser/monaco-standalone-theme-service.ts +2 -2
- package/src/browser/monaco-status-bar-contribution.ts +1 -1
- package/src/browser/monaco-text-model-service.ts +8 -8
- package/src/browser/monaco-theming-service.ts +2 -2
- package/src/browser/monaco-undo-redo-handler.ts +3 -3
- package/src/browser/monaco-utilities.ts +1 -1
- package/src/browser/monaco-workspace-context-service.ts +3 -3
- package/src/browser/monaco-workspace.ts +10 -10
- package/src/browser/simple-monaco-editor.ts +8 -8
- package/src/browser/textmate/index.ts +4 -4
- package/src/browser/textmate/monaco-textmate-frontend-bindings.ts +17 -15
- package/src/browser/textmate/monaco-textmate-service.ts +11 -11
- package/src/browser/textmate/monaco-theme-registry.ts +25 -15
- package/src/browser/textmate/monaco-theme-types.spec.ts +1 -1
- package/src/browser/textmate/monaco-theme-types.ts +1 -1
- package/src/browser/textmate/textmate-contribution.ts +1 -1
- package/src/browser/textmate/textmate-registry.ts +1 -1
- package/src/browser/textmate/textmate-snippet-completion-provider.ts +1 -1
- package/src/browser/textmate/textmate-tokenizer.spec.ts +1 -1
- package/src/browser/textmate/textmate-tokenizer.ts +3 -2
- package/src/browser/workspace-symbol-command.ts +1 -1
- package/src/typings/wasm.d.ts +21 -0
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
// *****************************************************************************
|
|
3
2
|
// Copyright (C) 2024 1C-Soft LLC and others.
|
|
4
3
|
//
|
|
@@ -14,30 +13,24 @@
|
|
|
14
13
|
//
|
|
15
14
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
16
15
|
// *****************************************************************************
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
var peekView_2 = require("@theia/monaco-editor-core/esm/vs/editor/contrib/peekView/browser/peekView");
|
|
28
|
-
Object.defineProperty(exports, "peekViewBorder", { enumerable: true, get: function () { return peekView_2.peekViewBorder; } });
|
|
29
|
-
Object.defineProperty(exports, "peekViewTitleBackground", { enumerable: true, get: function () { return peekView_2.peekViewTitleBackground; } });
|
|
30
|
-
Object.defineProperty(exports, "peekViewTitleForeground", { enumerable: true, get: function () { return peekView_2.peekViewTitleForeground; } });
|
|
31
|
-
Object.defineProperty(exports, "peekViewTitleInfoForeground", { enumerable: true, get: function () { return peekView_2.peekViewTitleInfoForeground; } });
|
|
32
|
-
class MonacoEditorPeekViewWidget {
|
|
16
|
+
import { Range } from '@theia/core/shared/vscode-languageserver-protocol';
|
|
17
|
+
import { DisposableCollection } from '@theia/core';
|
|
18
|
+
import { PeekViewWidget } from '@theia/monaco-editor-core/esm/vs/editor/contrib/peekView/browser/peekView.js';
|
|
19
|
+
import { Action } from '@theia/monaco-editor-core/esm/vs/base/common/actions.js';
|
|
20
|
+
import { StandaloneServices } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices.js';
|
|
21
|
+
import { IInstantiationService } from '@theia/monaco-editor-core/esm/vs/platform/instantiation/common/instantiation.js';
|
|
22
|
+
import { IThemeService } from '@theia/monaco-editor-core/esm/vs/platform/theme/common/themeService.js';
|
|
23
|
+
import { Color } from '@theia/monaco-editor-core/esm/vs/base/common/color.js';
|
|
24
|
+
export { peekViewBorder, peekViewTitleBackground, peekViewTitleForeground, peekViewTitleInfoForeground } from '@theia/monaco-editor-core/esm/vs/editor/contrib/peekView/browser/peekView.js';
|
|
25
|
+
export class MonacoEditorPeekViewWidget {
|
|
33
26
|
constructor(editor, options = {}, styles = {}) {
|
|
34
27
|
this.editor = editor;
|
|
35
28
|
this.styles = styles;
|
|
36
|
-
this.toDispose = new
|
|
29
|
+
this.toDispose = new DisposableCollection();
|
|
37
30
|
this.onDidClose = this.toDispose.onDispose;
|
|
38
|
-
this.themeService =
|
|
31
|
+
this.themeService = StandaloneServices.get(IThemeService);
|
|
39
32
|
const that = this;
|
|
40
|
-
this.toDispose.push(this.delegate = new class extends
|
|
33
|
+
this.toDispose.push(this.delegate = new class extends PeekViewWidget {
|
|
41
34
|
get actionBar() {
|
|
42
35
|
return this._actionbarWidget;
|
|
43
36
|
}
|
|
@@ -99,7 +92,7 @@ class MonacoEditorPeekViewWidget {
|
|
|
99
92
|
setCssClass(className, classToReplace) {
|
|
100
93
|
super.setCssClass(className, classToReplace);
|
|
101
94
|
}
|
|
102
|
-
}(editor.getControl(), Object.assign({}, options, this.convertStyles(styles)),
|
|
95
|
+
}(editor.getControl(), Object.assign({}, options, this.convertStyles(styles)), StandaloneServices.get(IInstantiationService)));
|
|
103
96
|
this.toDispose.push(this.themeService.onDidColorThemeChange(() => this.style(this.styles)));
|
|
104
97
|
}
|
|
105
98
|
dispose() {
|
|
@@ -129,7 +122,7 @@ class MonacoEditorPeekViewWidget {
|
|
|
129
122
|
if (!actionBar) {
|
|
130
123
|
throw new Error('Action bar has not been created.');
|
|
131
124
|
}
|
|
132
|
-
const action = new
|
|
125
|
+
const action = new Action(id, label, cssClass, enabled, actionCallback);
|
|
133
126
|
actionBar.push(action, options);
|
|
134
127
|
return action;
|
|
135
128
|
}
|
|
@@ -182,12 +175,11 @@ class MonacoEditorPeekViewWidget {
|
|
|
182
175
|
if (color === undefined) {
|
|
183
176
|
return undefined;
|
|
184
177
|
}
|
|
185
|
-
return this.themeService.getColorTheme().getColor(color) ||
|
|
178
|
+
return this.themeService.getColorTheme().getColor(color) || Color.fromHex(color);
|
|
186
179
|
}
|
|
187
180
|
convertRangeOrPosition(arg) {
|
|
188
181
|
const p2m = this.editor['p2m'];
|
|
189
|
-
return
|
|
182
|
+
return Range.is(arg) ? p2m.asRange(arg) : p2m.asPosition(arg);
|
|
190
183
|
}
|
|
191
184
|
}
|
|
192
|
-
exports.MonacoEditorPeekViewWidget = MonacoEditorPeekViewWidget;
|
|
193
185
|
//# sourceMappingURL=monaco-editor-peek-view-widget.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monaco-editor-peek-view-widget.js","sourceRoot":"","sources":["../../src/browser/monaco-editor-peek-view-widget.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"monaco-editor-peek-view-widget.js","sourceRoot":"","sources":["../../src/browser/monaco-editor-peek-view-widget.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,20 +1,20 @@
|
|
|
1
1
|
import URI from '@theia/core/lib/common/uri';
|
|
2
2
|
import { TextEditor, DiffNavigator } from '@theia/editor/lib/browser';
|
|
3
3
|
import { DisposableCollection, Disposable, CancellationToken } from '@theia/core/lib/common';
|
|
4
|
-
import { MonacoDiffEditor } from './monaco-diff-editor';
|
|
5
|
-
import { MonacoDiffNavigatorFactory } from './monaco-diff-navigator-factory';
|
|
6
|
-
import { EditorServiceOverrides, MonacoEditor, MonacoEditorServices } from './monaco-editor';
|
|
7
|
-
import { MonacoEditorModel } from './monaco-editor-model';
|
|
8
|
-
import { MonacoWorkspace } from './monaco-workspace';
|
|
4
|
+
import { MonacoDiffEditor } from './monaco-diff-editor.js';
|
|
5
|
+
import { MonacoDiffNavigatorFactory } from './monaco-diff-navigator-factory.js';
|
|
6
|
+
import { EditorServiceOverrides, MonacoEditor, MonacoEditorServices } from './monaco-editor.js';
|
|
7
|
+
import { MonacoEditorModel } from './monaco-editor-model.js';
|
|
8
|
+
import { MonacoWorkspace } from './monaco-workspace.js';
|
|
9
9
|
import { ContributionProvider, ILogger } from '@theia/core';
|
|
10
10
|
import { KeybindingRegistry, OpenerService, SaveOptions } from '@theia/core/lib/browser';
|
|
11
|
-
import { MonacoToProtocolConverter } from './monaco-to-protocol-converter';
|
|
12
|
-
import { ProtocolToMonacoConverter } from './protocol-to-monaco-converter';
|
|
11
|
+
import { MonacoToProtocolConverter } from './monaco-to-protocol-converter.js';
|
|
12
|
+
import { ProtocolToMonacoConverter } from './protocol-to-monaco-converter.js';
|
|
13
13
|
import * as monaco from '@theia/monaco-editor-core';
|
|
14
|
-
import { OpenExternalOptions, OpenInternalOptions } from '@theia/monaco-editor-core/esm/vs/platform/opener/common/opener';
|
|
14
|
+
import { OpenExternalOptions, OpenInternalOptions } from '@theia/monaco-editor-core/esm/vs/platform/opener/common/opener.js';
|
|
15
15
|
import { MarkdownString } from '@theia/core/lib/common/markdown-rendering';
|
|
16
|
-
import { SimpleMonacoEditor } from './simple-monaco-editor';
|
|
17
|
-
import { ICodeEditorWidgetOptions } from '@theia/monaco-editor-core/esm/vs/editor/browser/widget/codeEditor/codeEditorWidget';
|
|
16
|
+
import { SimpleMonacoEditor } from './simple-monaco-editor.js';
|
|
17
|
+
import { ICodeEditorWidgetOptions } from '@theia/monaco-editor-core/esm/vs/editor/browser/widget/codeEditor/codeEditorWidget.js';
|
|
18
18
|
import { FileSystemPreferences } from '@theia/filesystem/lib/common';
|
|
19
19
|
import { EditorPreferenceChange, EditorPreferences } from '@theia/editor/lib/common/editor-preferences';
|
|
20
20
|
export declare const MonacoEditorFactory: unique symbol;
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"monaco-editor-provider.d.ts","sourceRoot":"","sources":["../../src/browser/monaco-editor-provider.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
// *****************************************************************************
|
|
3
2
|
// Copyright (C) 2018 TypeFox and others.
|
|
4
3
|
//
|
|
@@ -15,42 +14,40 @@
|
|
|
15
14
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
16
15
|
// *****************************************************************************
|
|
17
16
|
var MonacoEditorProvider_1;
|
|
18
|
-
|
|
19
|
-
exports.MonacoEditorProvider = exports.SAVE_PARTICIPANT_DEFAULT_ORDER = exports.SaveParticipant = exports.MonacoEditorFactory = void 0;
|
|
20
|
-
const tslib_1 = require("tslib");
|
|
17
|
+
import { __decorate, __param } from "tslib";
|
|
21
18
|
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
19
|
+
import URI from '@theia/core/lib/common/uri';
|
|
20
|
+
import { DiffUris } from '@theia/core/lib/browser/diff-uris';
|
|
21
|
+
import { inject, injectable, named, postConstruct } from '@theia/core/shared/inversify';
|
|
22
|
+
import { DisposableCollection, deepClone, Disposable } from '@theia/core/lib/common';
|
|
23
|
+
import { MonacoDiffEditor } from './monaco-diff-editor.js';
|
|
24
|
+
import { MonacoDiffNavigatorFactory } from './monaco-diff-navigator-factory.js';
|
|
25
|
+
import { MonacoEditor, MonacoEditorServices } from './monaco-editor.js';
|
|
26
|
+
import { TextDocumentSaveReason } from './monaco-editor-model.js';
|
|
27
|
+
import { MonacoWorkspace } from './monaco-workspace.js';
|
|
28
|
+
import { ContributionProvider, ILogger } from '@theia/core';
|
|
29
|
+
import { KeybindingRegistry, OpenerService, open } from '@theia/core/lib/browser';
|
|
30
|
+
import { MonacoResolvedKeybinding } from './monaco-resolved-keybinding.js';
|
|
31
|
+
import { MonacoToProtocolConverter } from './monaco-to-protocol-converter.js';
|
|
32
|
+
import { ProtocolToMonacoConverter } from './protocol-to-monaco-converter.js';
|
|
33
|
+
import * as monaco from '@theia/monaco-editor-core';
|
|
34
|
+
import { StandaloneServices } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices.js';
|
|
35
|
+
import { IOpenerService } from '@theia/monaco-editor-core/esm/vs/platform/opener/common/opener.js';
|
|
36
|
+
import { IKeybindingService } from '@theia/monaco-editor-core/esm/vs/platform/keybinding/common/keybinding.js';
|
|
37
|
+
import { IContextMenuService } from '@theia/monaco-editor-core/esm/vs/platform/contextview/browser/contextView.js';
|
|
38
|
+
import { Event } from '@theia/monaco-editor-core/esm/vs/base/common/event.js';
|
|
39
|
+
import { KeyCodeChord } from '@theia/monaco-editor-core/esm/vs/base/common/keybindings.js';
|
|
40
|
+
import { IContextKeyService } from '@theia/monaco-editor-core/esm/vs/platform/contextkey/common/contextkey.js';
|
|
41
|
+
import { ITextModelService } from '@theia/monaco-editor-core/esm/vs/editor/common/services/resolverService.js';
|
|
42
|
+
import { MarkdownString } from '@theia/core/lib/common/markdown-rendering';
|
|
43
|
+
import { SimpleMonacoEditor } from './simple-monaco-editor.js';
|
|
44
|
+
import { timeoutReject } from '@theia/core/lib/common/promise-util';
|
|
45
|
+
import { FileSystemPreferences } from '@theia/filesystem/lib/common';
|
|
46
|
+
import { insertFinalNewline } from './monaco-utilities.js';
|
|
47
|
+
import { EditorPreferences } from '@theia/editor/lib/common/editor-preferences';
|
|
48
|
+
export const MonacoEditorFactory = Symbol('MonacoEditorFactory');
|
|
49
|
+
export const SaveParticipant = Symbol('SaveParticipant');
|
|
50
|
+
export const SAVE_PARTICIPANT_DEFAULT_ORDER = 0;
|
|
54
51
|
let MonacoEditorProvider = class MonacoEditorProvider {
|
|
55
52
|
static { MonacoEditorProvider_1 = this; }
|
|
56
53
|
/**
|
|
@@ -69,7 +66,7 @@ let MonacoEditorProvider = class MonacoEditorProvider {
|
|
|
69
66
|
this.diffNavigatorFactory = diffNavigatorFactory;
|
|
70
67
|
}
|
|
71
68
|
async getModel(uri, toDispose) {
|
|
72
|
-
const reference = await
|
|
69
|
+
const reference = await StandaloneServices.get(ITextModelService).createModelReference(monaco.Uri.from(uri.toComponents()));
|
|
73
70
|
// if document is invalid makes sure that all events from underlying resource are processed before throwing invalid model
|
|
74
71
|
if (!reference.object.valid) {
|
|
75
72
|
await reference.object.sync();
|
|
@@ -87,24 +84,24 @@ let MonacoEditorProvider = class MonacoEditorProvider {
|
|
|
87
84
|
}
|
|
88
85
|
async doCreateEditor(uri, factory) {
|
|
89
86
|
const domNode = document.createElement('div');
|
|
90
|
-
const contextKeyService =
|
|
91
|
-
|
|
87
|
+
const contextKeyService = StandaloneServices.get(IContextKeyService).createScoped(domNode);
|
|
88
|
+
StandaloneServices.get(IOpenerService).registerOpener({
|
|
92
89
|
open: (u, options) => this.interceptOpen(u, options)
|
|
93
90
|
});
|
|
94
91
|
const overrides = [
|
|
95
|
-
[
|
|
92
|
+
[IContextKeyService, contextKeyService],
|
|
96
93
|
];
|
|
97
|
-
const toDispose = new
|
|
94
|
+
const toDispose = new DisposableCollection();
|
|
98
95
|
const editor = await factory(overrides, toDispose);
|
|
99
96
|
editor.onDispose(() => toDispose.dispose());
|
|
100
|
-
if (editor instanceof
|
|
97
|
+
if (editor instanceof MonacoEditor) {
|
|
101
98
|
this.injectKeybindingResolver(editor);
|
|
102
99
|
toDispose.push(editor.onFocusChanged(focused => {
|
|
103
100
|
if (focused) {
|
|
104
101
|
this._current = editor;
|
|
105
102
|
}
|
|
106
103
|
}));
|
|
107
|
-
toDispose.push(
|
|
104
|
+
toDispose.push(Disposable.create(() => {
|
|
108
105
|
if (this._current === editor) {
|
|
109
106
|
this._current = undefined;
|
|
110
107
|
}
|
|
@@ -131,9 +128,9 @@ let MonacoEditorProvider = class MonacoEditorProvider {
|
|
|
131
128
|
});
|
|
132
129
|
}
|
|
133
130
|
}
|
|
134
|
-
const uri = new
|
|
131
|
+
const uri = new URI(monacoUri.toString());
|
|
135
132
|
try {
|
|
136
|
-
await
|
|
133
|
+
await open(this.openerService, uri, options);
|
|
137
134
|
return true;
|
|
138
135
|
}
|
|
139
136
|
catch (e) {
|
|
@@ -142,15 +139,15 @@ let MonacoEditorProvider = class MonacoEditorProvider {
|
|
|
142
139
|
}
|
|
143
140
|
}
|
|
144
141
|
injectKeybindingResolver(editor) {
|
|
145
|
-
const keybindingService =
|
|
146
|
-
keybindingService.resolveKeybinding = keybinding => [new
|
|
142
|
+
const keybindingService = StandaloneServices.get(IKeybindingService);
|
|
143
|
+
keybindingService.resolveKeybinding = keybinding => [new MonacoResolvedKeybinding(MonacoResolvedKeybinding.keySequence(keybinding.chords), this.keybindingRegistry)];
|
|
147
144
|
keybindingService.resolveKeyboardEvent = keyboardEvent => {
|
|
148
|
-
const keybinding = new
|
|
149
|
-
return new
|
|
145
|
+
const keybinding = new KeyCodeChord(keyboardEvent.ctrlKey, keyboardEvent.shiftKey, keyboardEvent.altKey, keyboardEvent.metaKey, keyboardEvent.keyCode);
|
|
146
|
+
return new MonacoResolvedKeybinding(MonacoResolvedKeybinding.keySequence([keybinding]), this.keybindingRegistry);
|
|
150
147
|
};
|
|
151
148
|
}
|
|
152
149
|
createEditor(uri, override, toDispose) {
|
|
153
|
-
if (
|
|
150
|
+
if (DiffUris.isDiffUri(uri)) {
|
|
154
151
|
return this.createMonacoDiffEditor(uri, override, toDispose);
|
|
155
152
|
}
|
|
156
153
|
return this.createMonacoEditor(uri, override, toDispose);
|
|
@@ -164,7 +161,7 @@ let MonacoEditorProvider = class MonacoEditorProvider {
|
|
|
164
161
|
const factory = this.factories.getContributions().find(({ scheme }) => uri.scheme === scheme);
|
|
165
162
|
const editor = factory
|
|
166
163
|
? await factory.create(model, options, override)
|
|
167
|
-
: await
|
|
164
|
+
: await MonacoEditor.create(uri, model, document.createElement('div'), this.services, options, override);
|
|
168
165
|
toDispose.push(this.editorPreferences.onPreferenceChanged(event => {
|
|
169
166
|
if (event.affects(uri.toString(), model.languageId)) {
|
|
170
167
|
this.updateMonacoEditorOptions(editor, event);
|
|
@@ -176,7 +173,7 @@ let MonacoEditorProvider = class MonacoEditorProvider {
|
|
|
176
173
|
return editor;
|
|
177
174
|
}
|
|
178
175
|
updateReadOnlyMessage(options, readOnly) {
|
|
179
|
-
options.readOnlyMessage =
|
|
176
|
+
options.readOnlyMessage = MarkdownString.is(readOnly) ? readOnly : undefined;
|
|
180
177
|
}
|
|
181
178
|
createMonacoEditorOptions(model) {
|
|
182
179
|
const options = this.createOptions(this.preferencePrefixes, model.uri, model.languageId);
|
|
@@ -204,10 +201,10 @@ let MonacoEditorProvider = class MonacoEditorProvider {
|
|
|
204
201
|
return [...this.preferencePrefixes, 'diffEditor.'];
|
|
205
202
|
}
|
|
206
203
|
async createMonacoDiffEditor(uri, override, toDispose) {
|
|
207
|
-
const [original, modified] =
|
|
204
|
+
const [original, modified] = DiffUris.decode(uri);
|
|
208
205
|
const [originalModel, modifiedModel] = await Promise.all([this.getModel(original, toDispose), this.getModel(modified, toDispose)]);
|
|
209
206
|
const options = this.createMonacoDiffEditorOptions(originalModel, modifiedModel);
|
|
210
|
-
const editor = new
|
|
207
|
+
const editor = new MonacoDiffEditor(uri, document.createElement('div'), originalModel, modifiedModel, this.services, this.diffNavigatorFactory, options, override);
|
|
211
208
|
toDispose.push(this.editorPreferences.onPreferenceChanged(event => {
|
|
212
209
|
const originalFileUri = original.withoutQuery().withScheme('file').toString();
|
|
213
210
|
if (event.affects(originalFileUri, editor.document.languageId)) {
|
|
@@ -221,7 +218,7 @@ let MonacoEditorProvider = class MonacoEditorProvider {
|
|
|
221
218
|
const options = this.createOptions(this.diffPreferencePrefixes, modified.uri, modified.languageId);
|
|
222
219
|
options.originalEditable = !original.readOnly;
|
|
223
220
|
options.readOnly = modified.readOnly;
|
|
224
|
-
options.readOnlyMessage =
|
|
221
|
+
options.readOnlyMessage = MarkdownString.is(modified.readOnly) ? modified.readOnly : undefined;
|
|
225
222
|
return options;
|
|
226
223
|
}
|
|
227
224
|
updateMonacoDiffEditorOptions(editor, event, resourceUri) {
|
|
@@ -241,7 +238,7 @@ let MonacoEditorProvider = class MonacoEditorProvider {
|
|
|
241
238
|
for (const preferenceName of Object.keys(this.editorPreferences)) {
|
|
242
239
|
flat[preferenceName] = this.editorPreferences.get({ preferenceName, overrideIdentifier }, undefined, uri);
|
|
243
240
|
}
|
|
244
|
-
return Object.entries(flat).reduce((tree, [preferenceName, value]) => this.setOption(preferenceName,
|
|
241
|
+
return Object.entries(flat).reduce((tree, [preferenceName, value]) => this.setOption(preferenceName, deepClone(value), prefixes, tree), {});
|
|
245
242
|
}
|
|
246
243
|
setOption(preferenceName, value, prefixes, options = {}) {
|
|
247
244
|
const optionName = this.toOptionName(preferenceName, prefixes);
|
|
@@ -273,10 +270,10 @@ let MonacoEditorProvider = class MonacoEditorProvider {
|
|
|
273
270
|
obj[names[names.length - 1]] = value;
|
|
274
271
|
}
|
|
275
272
|
getDiffNavigator(editor) {
|
|
276
|
-
if (editor instanceof
|
|
273
|
+
if (editor instanceof MonacoDiffEditor) {
|
|
277
274
|
return editor.diffNavigator;
|
|
278
275
|
}
|
|
279
|
-
return
|
|
276
|
+
return MonacoDiffNavigatorFactory.nullNavigator;
|
|
280
277
|
}
|
|
281
278
|
/**
|
|
282
279
|
* Creates an instance of the standard MonacoEditor with a StandaloneCodeEditor as its Monaco delegate.
|
|
@@ -286,11 +283,11 @@ let MonacoEditorProvider = class MonacoEditorProvider {
|
|
|
286
283
|
async createInline(uri, node, options) {
|
|
287
284
|
return this.doCreateEditor(uri, async (override, toDispose) => {
|
|
288
285
|
const overrides = override ? Array.from(override) : [];
|
|
289
|
-
overrides.push([
|
|
286
|
+
overrides.push([IContextMenuService, { showContextMenu: () => { }, onDidShowContextMenu: Event.None, onDidHideContextMenu: Event.None }]);
|
|
290
287
|
const document = await this.getModel(uri, toDispose);
|
|
291
288
|
document.suppressOpenEditorWhenDirty = true;
|
|
292
289
|
const model = (await document.load()).textEditorModel;
|
|
293
|
-
return await
|
|
290
|
+
return await MonacoEditor.create(uri, document, node, this.services, Object.assign({
|
|
294
291
|
model,
|
|
295
292
|
autoSizing: false,
|
|
296
293
|
minHeight: 1,
|
|
@@ -306,7 +303,7 @@ let MonacoEditorProvider = class MonacoEditorProvider {
|
|
|
306
303
|
async createSimpleInline(uri, node, options, widgetOptions) {
|
|
307
304
|
return this.doCreateEditor(uri, async (override, toDispose) => {
|
|
308
305
|
const overrides = override ? Array.from(override) : [];
|
|
309
|
-
overrides.push([
|
|
306
|
+
overrides.push([IContextMenuService, { showContextMenu: () => { }, onDidShowContextMenu: Event.None, onDidHideContextMenu: Event.None }]);
|
|
310
307
|
const document = await this.getModel(uri, toDispose);
|
|
311
308
|
document.suppressOpenEditorWhenDirty = true;
|
|
312
309
|
const model = (await document.load()).textEditorModel;
|
|
@@ -321,7 +318,7 @@ let MonacoEditorProvider = class MonacoEditorProvider {
|
|
|
321
318
|
...MonacoEditorProvider_1.inlineOptions,
|
|
322
319
|
...options
|
|
323
320
|
};
|
|
324
|
-
return new
|
|
321
|
+
return new SimpleMonacoEditor(uri, document, node, this.services, editorOptions, overrides, { isSimpleWidget: true, ...widgetOptions });
|
|
325
322
|
});
|
|
326
323
|
}
|
|
327
324
|
static { this.inlineOptions = {
|
|
@@ -367,8 +364,8 @@ let MonacoEditorProvider = class MonacoEditorProvider {
|
|
|
367
364
|
...options?.scrollbar
|
|
368
365
|
}
|
|
369
366
|
};
|
|
370
|
-
const uri =
|
|
371
|
-
return await this.doCreateEditor(uri, async (override, toDispose) => new
|
|
367
|
+
const uri = DiffUris.encode(originalUri, modifiedUri);
|
|
368
|
+
return await this.doCreateEditor(uri, async (override, toDispose) => new MonacoDiffEditor(uri, node, await this.getModel(originalUri, toDispose), await this.getModel(modifiedUri, toDispose), this.services, this.diffNavigatorFactory, options, override, parentEditor));
|
|
372
369
|
}
|
|
373
370
|
init() {
|
|
374
371
|
this.saveParticipants = this.saveProviderContributions.getContributions().slice().sort((left, right) => left.order - right.order);
|
|
@@ -383,7 +380,7 @@ let MonacoEditorProvider = class MonacoEditorProvider {
|
|
|
383
380
|
}
|
|
384
381
|
this.saveParticipants.push(saveParticipant);
|
|
385
382
|
this.saveParticipants.sort((left, right) => left.order - right.order);
|
|
386
|
-
return
|
|
383
|
+
return Disposable.create(() => {
|
|
387
384
|
const index = this.saveParticipants.indexOf(saveParticipant);
|
|
388
385
|
if (index >= 0) {
|
|
389
386
|
this.saveParticipants.splice(index, 1);
|
|
@@ -391,7 +388,7 @@ let MonacoEditorProvider = class MonacoEditorProvider {
|
|
|
391
388
|
});
|
|
392
389
|
}
|
|
393
390
|
shouldFormat(model, options) {
|
|
394
|
-
if (options.saveReason !==
|
|
391
|
+
if (options.saveReason !== TextDocumentSaveReason.Manual) {
|
|
395
392
|
return false;
|
|
396
393
|
}
|
|
397
394
|
switch (options.formatType) {
|
|
@@ -430,7 +427,7 @@ let MonacoEditorProvider = class MonacoEditorProvider {
|
|
|
430
427
|
if (formatOnSave) {
|
|
431
428
|
const formatOnSaveTimeout = this.editorPreferences.get({ preferenceName: 'editor.formatOnSaveTimeout', overrideIdentifier }, undefined, uri);
|
|
432
429
|
await Promise.race([
|
|
433
|
-
|
|
430
|
+
timeoutReject(formatOnSaveTimeout, `Aborted format on save after ${formatOnSaveTimeout}ms`),
|
|
434
431
|
await editor.runAction('editor.action.formatDocument')
|
|
435
432
|
]);
|
|
436
433
|
}
|
|
@@ -444,56 +441,43 @@ let MonacoEditorProvider = class MonacoEditorProvider {
|
|
|
444
441
|
}
|
|
445
442
|
}
|
|
446
443
|
insertFinalNewline(editorModel) {
|
|
447
|
-
|
|
444
|
+
insertFinalNewline(editorModel);
|
|
448
445
|
}
|
|
449
446
|
};
|
|
450
|
-
|
|
451
|
-
|
|
452
|
-
(
|
|
453
|
-
(0, inversify_1.named)(exports.MonacoEditorFactory),
|
|
454
|
-
tslib_1.__metadata("design:type", Object)
|
|
447
|
+
__decorate([
|
|
448
|
+
inject(ContributionProvider),
|
|
449
|
+
named(MonacoEditorFactory)
|
|
455
450
|
], MonacoEditorProvider.prototype, "factories", void 0);
|
|
456
|
-
|
|
457
|
-
|
|
458
|
-
tslib_1.__metadata("design:type", monaco_editor_1.MonacoEditorServices)
|
|
451
|
+
__decorate([
|
|
452
|
+
inject(MonacoEditorServices)
|
|
459
453
|
], MonacoEditorProvider.prototype, "services", void 0);
|
|
460
|
-
|
|
461
|
-
|
|
462
|
-
tslib_1.__metadata("design:type", browser_1.KeybindingRegistry)
|
|
454
|
+
__decorate([
|
|
455
|
+
inject(KeybindingRegistry)
|
|
463
456
|
], MonacoEditorProvider.prototype, "keybindingRegistry", void 0);
|
|
464
|
-
|
|
465
|
-
|
|
466
|
-
tslib_1.__metadata("design:type", Object)
|
|
457
|
+
__decorate([
|
|
458
|
+
inject(OpenerService)
|
|
467
459
|
], MonacoEditorProvider.prototype, "openerService", void 0);
|
|
468
|
-
|
|
469
|
-
|
|
470
|
-
|
|
471
|
-
tslib_1.__metadata("design:type", Object)
|
|
460
|
+
__decorate([
|
|
461
|
+
inject(ContributionProvider),
|
|
462
|
+
named(SaveParticipant)
|
|
472
463
|
], MonacoEditorProvider.prototype, "saveProviderContributions", void 0);
|
|
473
|
-
|
|
474
|
-
|
|
475
|
-
tslib_1.__metadata("design:type", Object)
|
|
464
|
+
__decorate([
|
|
465
|
+
inject(FileSystemPreferences)
|
|
476
466
|
], MonacoEditorProvider.prototype, "filePreferences", void 0);
|
|
477
|
-
|
|
478
|
-
|
|
479
|
-
|
|
480
|
-
tslib_1.__metadata("design:type", Object)
|
|
467
|
+
__decorate([
|
|
468
|
+
inject(ILogger),
|
|
469
|
+
named('monaco:MonacoEditorProvider')
|
|
481
470
|
], MonacoEditorProvider.prototype, "logger", void 0);
|
|
482
|
-
|
|
483
|
-
|
|
484
|
-
tslib_1.__metadata("design:type", Function),
|
|
485
|
-
tslib_1.__metadata("design:paramtypes", []),
|
|
486
|
-
tslib_1.__metadata("design:returntype", void 0)
|
|
471
|
+
__decorate([
|
|
472
|
+
postConstruct()
|
|
487
473
|
], MonacoEditorProvider.prototype, "init", null);
|
|
488
|
-
|
|
489
|
-
|
|
490
|
-
|
|
491
|
-
|
|
492
|
-
|
|
493
|
-
|
|
494
|
-
|
|
495
|
-
tslib_1.__metadata("design:paramtypes", [monaco_to_protocol_converter_1.MonacoToProtocolConverter,
|
|
496
|
-
protocol_to_monaco_converter_1.ProtocolToMonacoConverter,
|
|
497
|
-
monaco_workspace_1.MonacoWorkspace, Object, monaco_diff_navigator_factory_1.MonacoDiffNavigatorFactory])
|
|
474
|
+
MonacoEditorProvider = MonacoEditorProvider_1 = __decorate([
|
|
475
|
+
injectable(),
|
|
476
|
+
__param(0, inject(MonacoToProtocolConverter)),
|
|
477
|
+
__param(1, inject(ProtocolToMonacoConverter)),
|
|
478
|
+
__param(2, inject(MonacoWorkspace)),
|
|
479
|
+
__param(3, inject(EditorPreferences)),
|
|
480
|
+
__param(4, inject(MonacoDiffNavigatorFactory))
|
|
498
481
|
], MonacoEditorProvider);
|
|
482
|
+
export { MonacoEditorProvider };
|
|
499
483
|
//# sourceMappingURL=monaco-editor-provider.js.map
|