@theia/monaco 1.77.0-next.99 → 1.77.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) 2023 STMicroelectronics and others.
|
|
4
3
|
//
|
|
@@ -14,59 +13,41 @@
|
|
|
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
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
const
|
|
52
|
-
const monaco_command_service_1 = require("./monaco-command-service");
|
|
53
|
-
const bulkEditService_1 = require("@theia/monaco-editor-core/esm/vs/editor/browser/services/bulkEditService");
|
|
54
|
-
const commands_1 = require("@theia/monaco-editor-core/esm/vs/platform/commands/common/commands");
|
|
55
|
-
const monaco_quick_input_service_1 = require("./monaco-quick-input-service");
|
|
56
|
-
const quickInput_1 = require("@theia/monaco-editor-core/esm/vs/platform/quickinput/common/quickInput");
|
|
57
|
-
const standaloneTheme_1 = require("@theia/monaco-editor-core/esm/vs/editor/standalone/common/standaloneTheme");
|
|
58
|
-
const monaco_standalone_theme_service_1 = require("./monaco-standalone-theme-service");
|
|
59
|
-
const content_hover_widget_patcher_1 = require("./content-hover-widget-patcher");
|
|
60
|
-
const hover_1 = require("@theia/monaco-editor-core/esm/vs/platform/hover/browser/hover");
|
|
61
|
-
const hoverDelegate2_1 = require("@theia/monaco-editor-core/esm/vs/base/browser/ui/hover/hoverDelegate2");
|
|
62
|
-
const workspace_1 = require("@theia/monaco-editor-core/esm/vs/platform/workspace/common/workspace");
|
|
63
|
-
const monaco_workspace_context_service_1 = require("./monaco-workspace-context-service");
|
|
64
|
-
const layoutService_1 = require("@theia/monaco-editor-core/esm/vs/platform/layout/browser/layoutService");
|
|
65
|
-
const event_1 = require("@theia/monaco-editor-core/esm/vs/base/common/event");
|
|
66
|
-
const dom = tslib_1.__importStar(require("@theia/monaco-editor-core/esm/vs/base/browser/dom"));
|
|
67
|
-
const window_1 = require("@theia/monaco-editor-core/esm/vs/base/browser/window");
|
|
68
|
-
const core_1 = require("@theia/core");
|
|
69
|
-
exports.contentHoverWidgetPatcher = (0, content_hover_widget_patcher_1.createContentHoverWidgetPatcher)();
|
|
16
|
+
import { __decorate, __param } from "tslib";
|
|
17
|
+
import { ICodeEditorService } from '@theia/monaco-editor-core/esm/vs/editor/browser/services/codeEditorService.js';
|
|
18
|
+
import { StandaloneServices } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices.js';
|
|
19
|
+
import { SyncDescriptor } from '@theia/monaco-editor-core/esm/vs/platform/instantiation/common/descriptors.js';
|
|
20
|
+
import { IInstantiationService, createDecorator } from '@theia/monaco-editor-core/esm/vs/platform/instantiation/common/instantiation.js';
|
|
21
|
+
import { InstantiationService } from '@theia/monaco-editor-core/esm/vs/platform/instantiation/common/instantiationService.js';
|
|
22
|
+
import { ServiceCollection } from '@theia/monaco-editor-core/esm/vs/platform/instantiation/common/serviceCollection.js';
|
|
23
|
+
import { MonacoEditorServiceFactory } from './monaco-editor-service.js';
|
|
24
|
+
import { IConfigurationService } from '@theia/monaco-editor-core/esm/vs/platform/configuration/common/configuration.js';
|
|
25
|
+
import { ITextModelService } from '@theia/monaco-editor-core/esm/vs/editor/common/services/resolverService.js';
|
|
26
|
+
import { MonacoConfigurationService } from './monaco-frontend-module.js';
|
|
27
|
+
import { MonacoTextModelService } from './monaco-text-model-service.js';
|
|
28
|
+
import { MonacoContextMenuService } from './monaco-context-menu.js';
|
|
29
|
+
import { IContextMenuService } from '@theia/monaco-editor-core/esm/vs/platform/contextview/browser/contextView.js';
|
|
30
|
+
import { IContextKeyService } from '@theia/monaco-editor-core/esm/vs/platform/contextkey/common/contextkey.js';
|
|
31
|
+
import { IThemeService } from '@theia/monaco-editor-core/esm/vs/platform/theme/common/themeService.js';
|
|
32
|
+
import { MonacoBulkEditService } from './monaco-bulk-edit-service.js';
|
|
33
|
+
import { MonacoCommandService } from './monaco-command-service.js';
|
|
34
|
+
import { IBulkEditService } from '@theia/monaco-editor-core/esm/vs/editor/browser/services/bulkEditService.js';
|
|
35
|
+
import { ICommandService } from '@theia/monaco-editor-core/esm/vs/platform/commands/common/commands.js';
|
|
36
|
+
import { MonacoQuickInputImplementation } from './monaco-quick-input-service.js';
|
|
37
|
+
import { IQuickInputService } from '@theia/monaco-editor-core/esm/vs/platform/quickinput/common/quickInput.js';
|
|
38
|
+
import { IStandaloneThemeService } from '@theia/monaco-editor-core/esm/vs/editor/standalone/common/standaloneTheme.js';
|
|
39
|
+
import { MonacoStandaloneThemeService } from './monaco-standalone-theme-service.js';
|
|
40
|
+
import { createContentHoverWidgetPatcher } from './content-hover-widget-patcher.js';
|
|
41
|
+
import { IHoverService } from '@theia/monaco-editor-core/esm/vs/platform/hover/browser/hover.js';
|
|
42
|
+
import { setBaseLayerHoverDelegate } from '@theia/monaco-editor-core/esm/vs/base/browser/ui/hover/hoverDelegate2.js';
|
|
43
|
+
import { IWorkspaceContextService } from '@theia/monaco-editor-core/esm/vs/platform/workspace/common/workspace.js';
|
|
44
|
+
import { MonacoWorkspaceContextService } from './monaco-workspace-context-service.js';
|
|
45
|
+
import { ILayoutService } from '@theia/monaco-editor-core/esm/vs/platform/layout/browser/layoutService.js';
|
|
46
|
+
import { Event } from '@theia/monaco-editor-core/esm/vs/base/common/event.js';
|
|
47
|
+
import * as dom from '@theia/monaco-editor-core/esm/vs/base/browser/dom.js';
|
|
48
|
+
import { mainWindow } from '@theia/monaco-editor-core/esm/vs/base/browser/window.js';
|
|
49
|
+
import { Disposable } from '@theia/core';
|
|
50
|
+
export const contentHoverWidgetPatcher = createContentHoverWidgetPatcher();
|
|
70
51
|
let MonacoEditorServiceConstructor = class MonacoEditorServiceConstructor {
|
|
71
52
|
/**
|
|
72
53
|
* MonacoEditorService needs other Monaco services as constructor parameters, so we need to do use a factory for constructing the service. If we want the singleton instance,
|
|
@@ -76,53 +57,52 @@ let MonacoEditorServiceConstructor = class MonacoEditorServiceConstructor {
|
|
|
76
57
|
* @param themeService
|
|
77
58
|
*/
|
|
78
59
|
constructor(container, contextKeyService, themeService) {
|
|
79
|
-
return container.get(
|
|
60
|
+
return container.get(MonacoEditorServiceFactory)(contextKeyService, themeService);
|
|
80
61
|
}
|
|
81
62
|
;
|
|
82
63
|
};
|
|
83
|
-
MonacoEditorServiceConstructor =
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
tslib_1.__metadata("design:paramtypes", [inversify_1.Container, Object, Object])
|
|
64
|
+
MonacoEditorServiceConstructor = __decorate([
|
|
65
|
+
__param(1, IContextKeyService),
|
|
66
|
+
__param(2, IThemeService)
|
|
87
67
|
], MonacoEditorServiceConstructor);
|
|
88
68
|
class MonacoConfigurationServiceConstructor {
|
|
89
69
|
constructor(container) {
|
|
90
|
-
return container.get(
|
|
70
|
+
return container.get(MonacoConfigurationService);
|
|
91
71
|
}
|
|
92
72
|
}
|
|
93
73
|
class MonacoTextModelServiceConstructor {
|
|
94
74
|
constructor(container) {
|
|
95
|
-
return container.get(
|
|
75
|
+
return container.get(MonacoTextModelService);
|
|
96
76
|
}
|
|
97
77
|
}
|
|
98
78
|
class MonacoContextMenuServiceConstructor {
|
|
99
79
|
constructor(container) {
|
|
100
|
-
return container.get(
|
|
80
|
+
return container.get(MonacoContextMenuService);
|
|
101
81
|
}
|
|
102
82
|
}
|
|
103
83
|
class MonacoBulkEditServiceConstructor {
|
|
104
84
|
constructor(container) {
|
|
105
|
-
return container.get(
|
|
85
|
+
return container.get(MonacoBulkEditService);
|
|
106
86
|
}
|
|
107
87
|
}
|
|
108
88
|
class MonacoCommandServiceConstructor {
|
|
109
89
|
constructor(container) {
|
|
110
|
-
return container.get(
|
|
90
|
+
return container.get(MonacoCommandService);
|
|
111
91
|
}
|
|
112
92
|
}
|
|
113
93
|
class MonacoQuickInputImplementationConstructor {
|
|
114
94
|
constructor(container) {
|
|
115
|
-
return container.get(
|
|
95
|
+
return container.get(MonacoQuickInputImplementation);
|
|
116
96
|
}
|
|
117
97
|
}
|
|
118
98
|
class MonacoStandaloneThemeServiceConstructor {
|
|
119
99
|
constructor(container) {
|
|
120
|
-
return new
|
|
100
|
+
return new MonacoStandaloneThemeService();
|
|
121
101
|
}
|
|
122
102
|
}
|
|
123
103
|
class MonacoWorkspaceContextServiceConstructor {
|
|
124
104
|
constructor(container) {
|
|
125
|
-
return container.get(
|
|
105
|
+
return container.get(MonacoWorkspaceContextService);
|
|
126
106
|
}
|
|
127
107
|
}
|
|
128
108
|
/**
|
|
@@ -133,16 +113,16 @@ class MonacoWorkspaceContextServiceConstructor {
|
|
|
133
113
|
*/
|
|
134
114
|
class MonacoLayoutService {
|
|
135
115
|
constructor() {
|
|
136
|
-
this.onDidLayoutMainContainer =
|
|
137
|
-
this.onDidLayoutActiveContainer =
|
|
138
|
-
this.onDidLayoutContainer =
|
|
139
|
-
this.onDidChangeActiveContainer =
|
|
140
|
-
this.onDidAddContainer =
|
|
116
|
+
this.onDidLayoutMainContainer = Event.None;
|
|
117
|
+
this.onDidLayoutActiveContainer = Event.None;
|
|
118
|
+
this.onDidLayoutContainer = Event.None;
|
|
119
|
+
this.onDidChangeActiveContainer = Event.None;
|
|
120
|
+
this.onDidAddContainer = Event.None;
|
|
141
121
|
this.mainContainerOffset = { top: 0, quickPickTop: 0 };
|
|
142
122
|
this.activeContainerOffset = { top: 0, quickPickTop: 0 };
|
|
143
123
|
}
|
|
144
124
|
get mainContainer() {
|
|
145
|
-
return
|
|
125
|
+
return mainWindow.document.getElementById('theia-app-shell') ?? mainWindow.document.body;
|
|
146
126
|
}
|
|
147
127
|
get activeContainer() {
|
|
148
128
|
return this.mainContainer;
|
|
@@ -171,20 +151,20 @@ class MonacoLayoutServiceConstructor {
|
|
|
171
151
|
return new MonacoLayoutService();
|
|
172
152
|
}
|
|
173
153
|
}
|
|
174
|
-
var MonacoInit;
|
|
154
|
+
export var MonacoInit;
|
|
175
155
|
(function (MonacoInit) {
|
|
176
156
|
function init(container) {
|
|
177
157
|
const overrides = {
|
|
178
|
-
[
|
|
179
|
-
[
|
|
180
|
-
[
|
|
181
|
-
[
|
|
182
|
-
[
|
|
183
|
-
[
|
|
184
|
-
[
|
|
185
|
-
[
|
|
186
|
-
[
|
|
187
|
-
[
|
|
158
|
+
[ICodeEditorService.toString()]: new SyncDescriptor(MonacoEditorServiceConstructor, [container]),
|
|
159
|
+
[IConfigurationService.toString()]: new SyncDescriptor(MonacoConfigurationServiceConstructor, [container]),
|
|
160
|
+
[ITextModelService.toString()]: new SyncDescriptor(MonacoTextModelServiceConstructor, [container]),
|
|
161
|
+
[IContextMenuService.toString()]: new SyncDescriptor(MonacoContextMenuServiceConstructor, [container]),
|
|
162
|
+
[IBulkEditService.toString()]: new SyncDescriptor(MonacoBulkEditServiceConstructor, [container]),
|
|
163
|
+
[ICommandService.toString()]: new SyncDescriptor(MonacoCommandServiceConstructor, [container]),
|
|
164
|
+
[IQuickInputService.toString()]: new SyncDescriptor(MonacoQuickInputImplementationConstructor, [container]),
|
|
165
|
+
[IStandaloneThemeService.toString()]: new SyncDescriptor(MonacoStandaloneThemeServiceConstructor, []),
|
|
166
|
+
[IWorkspaceContextService.toString()]: new SyncDescriptor(MonacoWorkspaceContextServiceConstructor, [container]),
|
|
167
|
+
[ILayoutService.toString()]: new SyncDescriptor(MonacoLayoutServiceConstructor, [])
|
|
188
168
|
};
|
|
189
169
|
// Detect whether StandaloneServices was already initialized before we get a chance to
|
|
190
170
|
// apply our overrides. `withServices` calls the callback synchronously when `initialized`
|
|
@@ -194,13 +174,13 @@ var MonacoInit;
|
|
|
194
174
|
// @monaco-uplift: verify that `withServices` still calls the callback synchronously when
|
|
195
175
|
// already initialized — if this changes, the premature-initialization detection will break.
|
|
196
176
|
let isInitialized = false;
|
|
197
|
-
|
|
177
|
+
StandaloneServices.withServices(() => {
|
|
198
178
|
isInitialized = true;
|
|
199
|
-
return
|
|
179
|
+
return Disposable.NULL;
|
|
200
180
|
});
|
|
201
181
|
const servicesInitializedBeforeOverrides = isInitialized;
|
|
202
182
|
// Try the standard initialization path first.
|
|
203
|
-
|
|
183
|
+
StandaloneServices.initialize(overrides);
|
|
204
184
|
// If StandaloneServices was already initialized (e.g., by a premature StandaloneServices.get() call
|
|
205
185
|
// triggered as a side-effect during module loading), the call above is a no-op and our overrides are
|
|
206
186
|
// silently dropped. Detect this situation, warn about it, and inject our service descriptors directly
|
|
@@ -215,23 +195,23 @@ var MonacoInit;
|
|
|
215
195
|
}
|
|
216
196
|
// Make sure the global base hover delegate is initialized as otherwise the quick input will throw an error and not update correctly
|
|
217
197
|
// in case no Monaco editor was constructed before and items with keybindings are shown. See #15042.
|
|
218
|
-
|
|
198
|
+
setBaseLayerHoverDelegate(StandaloneServices.get(IHoverService));
|
|
219
199
|
}
|
|
220
200
|
MonacoInit.init = init;
|
|
221
|
-
})(MonacoInit || (
|
|
201
|
+
})(MonacoInit || (MonacoInit = {}));
|
|
222
202
|
// @monaco-uplift: verify that the concrete InstantiationService class still exposes a
|
|
223
203
|
// private `_services: ServiceCollection` property. See monaco-init.spec.ts for a CI
|
|
224
204
|
// guard that will flag a mismatch after a Monaco version bump.
|
|
225
205
|
function patchServices(overrides) {
|
|
226
|
-
const instantiationService =
|
|
227
|
-
if (!(instantiationService instanceof
|
|
206
|
+
const instantiationService = StandaloneServices.get(IInstantiationService);
|
|
207
|
+
if (!(instantiationService instanceof InstantiationService)) {
|
|
228
208
|
console.error('StandaloneServices returned an IInstantiationService that is not an instance of InstantiationService. '
|
|
229
209
|
+ 'Theia service overrides cannot be patched in after premature initialization. '
|
|
230
210
|
+ 'Investigate whether Monaco\'s internal InstantiationService class has been refactored.');
|
|
231
211
|
return;
|
|
232
212
|
}
|
|
233
213
|
const serviceCollection = instantiationService['_services'];
|
|
234
|
-
if (!(serviceCollection instanceof
|
|
214
|
+
if (!(serviceCollection instanceof ServiceCollection)) {
|
|
235
215
|
console.error('InstantiationService._services is not a ServiceCollection (got '
|
|
236
216
|
+ (serviceCollection === undefined ? 'undefined' : typeof serviceCollection)
|
|
237
217
|
+ '). Theia service overrides cannot be patched in after premature initialization. '
|
|
@@ -241,14 +221,14 @@ function patchServices(overrides) {
|
|
|
241
221
|
const patchedServices = [];
|
|
242
222
|
const alreadyInstantiatedServices = [];
|
|
243
223
|
for (const serviceId of Object.keys(overrides)) {
|
|
244
|
-
const serviceIdentifier =
|
|
224
|
+
const serviceIdentifier = createDecorator(serviceId);
|
|
245
225
|
const existing = serviceCollection.get(serviceIdentifier);
|
|
246
|
-
if (existing instanceof
|
|
226
|
+
if (existing instanceof SyncDescriptor && existing !== overrides[serviceId]) {
|
|
247
227
|
// The override was not applied by initialize() – patch it in manually.
|
|
248
228
|
serviceCollection.set(serviceIdentifier, overrides[serviceId]);
|
|
249
229
|
patchedServices.push(serviceId);
|
|
250
230
|
}
|
|
251
|
-
else if (existing !== undefined && !(existing instanceof
|
|
231
|
+
else if (existing !== undefined && !(existing instanceof SyncDescriptor)) {
|
|
252
232
|
// The service was already instantiated from the default Monaco
|
|
253
233
|
// implementation – we cannot override it anymore.
|
|
254
234
|
alreadyInstantiatedServices.push(serviceId);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monaco-init.js","sourceRoot":"","sources":["../../src/browser/monaco-init.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"monaco-init.js","sourceRoot":"","sources":["../../src/browser/monaco-init.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
// *****************************************************************************
|
|
3
2
|
// Copyright (C) 2026 EclipseSource and others.
|
|
4
3
|
//
|
|
@@ -14,9 +13,8 @@
|
|
|
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
|
-
let disableJSDOM = (0, jsdom_1.enableJSDOM)();
|
|
16
|
+
import { enableJSDOM } from '@theia/core/lib/browser/test/jsdom';
|
|
17
|
+
let disableJSDOM = enableJSDOM();
|
|
20
18
|
if (typeof CSS === 'undefined') {
|
|
21
19
|
Object.assign(globalThis, { CSS: { escape: (value) => value } });
|
|
22
20
|
}
|
|
@@ -31,12 +29,12 @@ window.matchMedia = () => ({
|
|
|
31
29
|
removeEventListener: () => undefined,
|
|
32
30
|
dispatchEvent: () => false
|
|
33
31
|
});
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
32
|
+
import { expect } from 'chai';
|
|
33
|
+
import { Disposable } from '@theia/core';
|
|
34
|
+
import { StandaloneServices } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices.js';
|
|
35
|
+
import { IInstantiationService } from '@theia/monaco-editor-core/esm/vs/platform/instantiation/common/instantiation.js';
|
|
36
|
+
import { InstantiationService } from '@theia/monaco-editor-core/esm/vs/platform/instantiation/common/instantiationService.js';
|
|
37
|
+
import { ServiceCollection } from '@theia/monaco-editor-core/esm/vs/platform/instantiation/common/serviceCollection.js';
|
|
40
38
|
disableJSDOM();
|
|
41
39
|
/**
|
|
42
40
|
* @monaco-uplift
|
|
@@ -56,7 +54,7 @@ disableJSDOM();
|
|
|
56
54
|
*/
|
|
57
55
|
describe('Monaco InstantiationService internals', () => {
|
|
58
56
|
before(() => {
|
|
59
|
-
disableJSDOM =
|
|
57
|
+
disableJSDOM = enableJSDOM();
|
|
60
58
|
window.matchMedia = () => ({
|
|
61
59
|
matches: false,
|
|
62
60
|
media: '',
|
|
@@ -71,15 +69,15 @@ describe('Monaco InstantiationService internals', () => {
|
|
|
71
69
|
});
|
|
72
70
|
after(() => disableJSDOM());
|
|
73
71
|
it('StandaloneServices.get(IInstantiationService) should be an instance of InstantiationService', () => {
|
|
74
|
-
const instantiationService =
|
|
75
|
-
|
|
72
|
+
const instantiationService = StandaloneServices.get(IInstantiationService);
|
|
73
|
+
expect(instantiationService).to.be.an.instanceOf(InstantiationService);
|
|
76
74
|
});
|
|
77
75
|
it('StandaloneServices.get(IInstantiationService) should have a _services property that is a ServiceCollection', () => {
|
|
78
|
-
const instantiationService =
|
|
76
|
+
const instantiationService = StandaloneServices.get(IInstantiationService);
|
|
79
77
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
80
78
|
const services = instantiationService['_services'];
|
|
81
|
-
|
|
82
|
-
|
|
79
|
+
expect(services).to.not.be.undefined;
|
|
80
|
+
expect(services).to.be.an.instanceOf(ServiceCollection);
|
|
83
81
|
});
|
|
84
82
|
// MonacoInit.init() uses withServices to detect whether StandaloneServices
|
|
85
83
|
// was already initialized: it passes a callback that sets a flag, then reads
|
|
@@ -87,13 +85,13 @@ describe('Monaco InstantiationService internals', () => {
|
|
|
87
85
|
// the callback synchronously when services are already initialized.
|
|
88
86
|
it('StandaloneServices.withServices should call the callback synchronously when already initialized', () => {
|
|
89
87
|
// Ensure services are initialized (get triggers initialization if needed).
|
|
90
|
-
|
|
88
|
+
StandaloneServices.get(IInstantiationService);
|
|
91
89
|
let called = false;
|
|
92
|
-
|
|
90
|
+
StandaloneServices.withServices(() => {
|
|
93
91
|
called = true;
|
|
94
|
-
return
|
|
92
|
+
return Disposable.NULL;
|
|
95
93
|
});
|
|
96
|
-
|
|
94
|
+
expect(called).to.be.true;
|
|
97
95
|
});
|
|
98
96
|
});
|
|
99
97
|
//# sourceMappingURL=monaco-init.spec.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monaco-init.spec.js","sourceRoot":"","sources":["../../src/browser/monaco-init.spec.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"monaco-init.spec.js","sourceRoot":"","sources":["../../src/browser/monaco-init.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { KeybindingContribution, KeybindingRegistry, KeyCode } from '@theia/core/lib/browser';
|
|
2
|
-
import { MonacoCommandRegistry } from './monaco-command-registry';
|
|
2
|
+
import { MonacoCommandRegistry } from './monaco-command-registry.js';
|
|
3
3
|
import { CommandRegistry, DisposableCollection, ILogger } from '@theia/core';
|
|
4
|
-
import { MonacoContextKeyService } from './monaco-context-key-service';
|
|
4
|
+
import { MonacoContextKeyService } from './monaco-context-key-service.js';
|
|
5
5
|
export declare class MonacoKeybindingContribution implements KeybindingContribution {
|
|
6
6
|
protected toDisposeOnKeybindingChange: DisposableCollection;
|
|
7
7
|
protected readonly commands: MonacoCommandRegistry;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monaco-keybinding.d.ts","sourceRoot":"","sources":["../../src/browser/monaco-keybinding.ts"],"names":[],"mappings":"AAiBA,OAAO,EACH,sBAAsB,EAAE,kBAAkB,EAAmB,OAAO,EACvE,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EAAE,qBAAqB,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"monaco-keybinding.d.ts","sourceRoot":"","sources":["../../src/browser/monaco-keybinding.ts"],"names":[],"mappings":"AAiBA,OAAO,EACH,sBAAsB,EAAE,kBAAkB,EAAmB,OAAO,EACvE,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AACrE,OAAO,EAAE,eAAe,EAAE,oBAAoB,EAAsB,OAAO,EAAE,MAAM,aAAa,CAAC;AAKjG,OAAO,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAC;AAI1E,qBACa,4BAA6B,YAAW,sBAAsB;IAEvE,SAAS,CAAC,2BAA2B,uBAA8B;IAEpC,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,qBAAqB,CAAC;IACtD,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,kBAAkB,CAAC;IACtD,SAAS,CAAC,QAAQ,CAAC,oBAAoB,EAAE,eAAe,CAAC;IACjD,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,uBAAuB,CAAC;IAG/F,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IAGnC,SAAS,CAAC,IAAI,IAAI,IAAI;IAItB,mBAAmB,CAAC,QAAQ,EAAE,kBAAkB,GAAG,IAAI;IAiBvD,SAAS,CAAC,uBAAuB,IAAI,IAAI;IAyBzC,SAAS,CAAC,qBAAqB,CAAC,KAAK,EAAE,OAAO,EAAE,GAAG,OAAO;IAK1D,SAAS,CAAC,wBAAwB,CAAC,KAAK,EAAE,OAAO,EAAE,GAAG,MAAM;IAU5D,SAAS,CAAC,8BAA8B,CAAC,IAAI,EAAE,OAAO,GAAG,MAAM;CAiBlE"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
// *****************************************************************************
|
|
3
2
|
// Copyright (C) 2017 TypeFox and others.
|
|
4
3
|
//
|
|
@@ -14,50 +13,48 @@
|
|
|
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
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
const monaco_keycode_map_1 = require("./monaco-keycode-map");
|
|
31
|
-
const monaco = tslib_1.__importStar(require("@theia/monaco-editor-core"));
|
|
16
|
+
import { __decorate } from "tslib";
|
|
17
|
+
import { injectable, inject, postConstruct, named } from '@theia/core/shared/inversify';
|
|
18
|
+
import { KeybindingRegistry, KeybindingScope, layoutModifiersIncludeAltGraph, layoutModifiersIncludeShift } from '@theia/core/lib/browser';
|
|
19
|
+
import { MonacoCommands } from './monaco-command.js';
|
|
20
|
+
import { MonacoCommandRegistry } from './monaco-command-registry.js';
|
|
21
|
+
import { CommandRegistry, DisposableCollection, environment, isOSX, ILogger } from '@theia/core';
|
|
22
|
+
import { MonacoResolvedKeybinding } from './monaco-resolved-keybinding.js';
|
|
23
|
+
import { KeybindingsRegistry } from '@theia/monaco-editor-core/esm/vs/platform/keybinding/common/keybindingsRegistry.js';
|
|
24
|
+
import { StandaloneKeybindingService, StandaloneServices } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices.js';
|
|
25
|
+
import { IKeybindingService } from '@theia/monaco-editor-core/esm/vs/platform/keybinding/common/keybinding.js';
|
|
26
|
+
import { MonacoContextKeyService } from './monaco-context-key-service.js';
|
|
27
|
+
import { KEY_CODE_MAP } from './monaco-keycode-map.js';
|
|
28
|
+
import * as monaco from '@theia/monaco-editor-core';
|
|
32
29
|
let MonacoKeybindingContribution = class MonacoKeybindingContribution {
|
|
33
30
|
constructor() {
|
|
34
|
-
this.toDisposeOnKeybindingChange = new
|
|
31
|
+
this.toDisposeOnKeybindingChange = new DisposableCollection();
|
|
35
32
|
}
|
|
36
33
|
init() {
|
|
37
34
|
this.keybindings.onKeybindingsChanged(() => this.updateMonacoKeybindings());
|
|
38
35
|
}
|
|
39
36
|
registerKeybindings(registry) {
|
|
40
|
-
const defaultKeybindings =
|
|
37
|
+
const defaultKeybindings = KeybindingsRegistry.getDefaultKeybindings();
|
|
41
38
|
for (const item of defaultKeybindings) {
|
|
42
39
|
const command = this.commands.validate(item.command || undefined);
|
|
43
40
|
if (command && item.keybinding) {
|
|
44
41
|
const when = (item.when && item.when.serialize()) ?? undefined;
|
|
45
42
|
let keybinding;
|
|
46
|
-
if (item.command ===
|
|
43
|
+
if (item.command === MonacoCommands.GO_TO_DEFINITION && !environment.electron.is()) {
|
|
47
44
|
keybinding = 'ctrlcmd+f11';
|
|
48
45
|
}
|
|
49
46
|
else {
|
|
50
|
-
keybinding =
|
|
47
|
+
keybinding = MonacoResolvedKeybinding.toKeybinding(item.keybinding.chords);
|
|
51
48
|
}
|
|
52
49
|
registry.registerKeybinding({ command, keybinding, when });
|
|
53
50
|
}
|
|
54
51
|
}
|
|
55
52
|
}
|
|
56
53
|
updateMonacoKeybindings() {
|
|
57
|
-
const monacoKeybindingRegistry =
|
|
58
|
-
if (monacoKeybindingRegistry instanceof
|
|
54
|
+
const monacoKeybindingRegistry = StandaloneServices.get(IKeybindingService);
|
|
55
|
+
if (monacoKeybindingRegistry instanceof StandaloneKeybindingService) {
|
|
59
56
|
this.toDisposeOnKeybindingChange.dispose();
|
|
60
|
-
for (const binding of this.keybindings.getKeybindingsByScope(
|
|
57
|
+
for (const binding of this.keybindings.getKeybindingsByScope(KeybindingScope.USER).concat(this.keybindings.getKeybindingsByScope(KeybindingScope.WORKSPACE))) {
|
|
61
58
|
const resolved = this.keybindings.resolveKeybinding(binding);
|
|
62
59
|
if (this.keybindings.isKeybindingInactive(binding) || !this.isMonacoRepresentable(resolved)) {
|
|
63
60
|
continue;
|
|
@@ -73,8 +70,8 @@ let MonacoKeybindingContribution = class MonacoKeybindingContribution {
|
|
|
73
70
|
}
|
|
74
71
|
}
|
|
75
72
|
isMonacoRepresentable(codes) {
|
|
76
|
-
return codes.length <= 2 && codes.every(code => code.key &&
|
|
77
|
-
&& !
|
|
73
|
+
return codes.length <= 2 && codes.every(code => code.key && KEY_CODE_MAP[code.key.keyCode] !== undefined
|
|
74
|
+
&& !layoutModifiersIncludeAltGraph(code.layoutModifiers));
|
|
78
75
|
}
|
|
79
76
|
toMonacoKeybindingNumber(codes) {
|
|
80
77
|
const [firstPart, secondPart] = codes;
|
|
@@ -86,52 +83,44 @@ let MonacoKeybindingContribution = class MonacoKeybindingContribution {
|
|
|
86
83
|
return monaco.KeyMod.chord(encodedFirstPart, encodedSecondPart);
|
|
87
84
|
}
|
|
88
85
|
toSingleMonacoKeybindingNumber(code) {
|
|
89
|
-
const keyCode = code.key?.keyCode !== undefined ?
|
|
86
|
+
const keyCode = code.key?.keyCode !== undefined ? KEY_CODE_MAP[code.key.keyCode] : 0;
|
|
90
87
|
let encoded = (keyCode >>> 0) & 0x000000FF;
|
|
91
88
|
if (code.alt) {
|
|
92
89
|
encoded |= monaco.KeyMod.Alt;
|
|
93
90
|
}
|
|
94
|
-
if (code.shift ||
|
|
91
|
+
if (code.shift || layoutModifiersIncludeShift(code.layoutModifiers)) {
|
|
95
92
|
encoded |= monaco.KeyMod.Shift;
|
|
96
93
|
}
|
|
97
94
|
if (code.ctrl) {
|
|
98
|
-
encoded |=
|
|
95
|
+
encoded |= isOSX ? monaco.KeyMod.WinCtrl : monaco.KeyMod.CtrlCmd;
|
|
99
96
|
}
|
|
100
|
-
if (code.meta &&
|
|
97
|
+
if (code.meta && isOSX) {
|
|
101
98
|
encoded |= monaco.KeyMod.CtrlCmd;
|
|
102
99
|
}
|
|
103
100
|
return encoded;
|
|
104
101
|
}
|
|
105
102
|
};
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
(0, inversify_1.inject)(monaco_command_registry_1.MonacoCommandRegistry),
|
|
109
|
-
tslib_1.__metadata("design:type", monaco_command_registry_1.MonacoCommandRegistry)
|
|
103
|
+
__decorate([
|
|
104
|
+
inject(MonacoCommandRegistry)
|
|
110
105
|
], MonacoKeybindingContribution.prototype, "commands", void 0);
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
tslib_1.__metadata("design:type", browser_1.KeybindingRegistry)
|
|
106
|
+
__decorate([
|
|
107
|
+
inject(KeybindingRegistry)
|
|
114
108
|
], MonacoKeybindingContribution.prototype, "keybindings", void 0);
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
tslib_1.__metadata("design:type", core_1.CommandRegistry)
|
|
109
|
+
__decorate([
|
|
110
|
+
inject(CommandRegistry)
|
|
118
111
|
], MonacoKeybindingContribution.prototype, "theiaCommandRegistry", void 0);
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
tslib_1.__metadata("design:type", monaco_context_key_service_1.MonacoContextKeyService)
|
|
112
|
+
__decorate([
|
|
113
|
+
inject(MonacoContextKeyService)
|
|
122
114
|
], MonacoKeybindingContribution.prototype, "contextKeyService", void 0);
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
tslib_1.__metadata("design:type", Object)
|
|
115
|
+
__decorate([
|
|
116
|
+
inject(ILogger),
|
|
117
|
+
named('monaco:MonacoKeybindingContribution')
|
|
127
118
|
], MonacoKeybindingContribution.prototype, "logger", void 0);
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
tslib_1.__metadata("design:type", Function),
|
|
131
|
-
tslib_1.__metadata("design:paramtypes", []),
|
|
132
|
-
tslib_1.__metadata("design:returntype", void 0)
|
|
119
|
+
__decorate([
|
|
120
|
+
postConstruct()
|
|
133
121
|
], MonacoKeybindingContribution.prototype, "init", null);
|
|
134
|
-
|
|
135
|
-
|
|
122
|
+
MonacoKeybindingContribution = __decorate([
|
|
123
|
+
injectable()
|
|
136
124
|
], MonacoKeybindingContribution);
|
|
125
|
+
export { MonacoKeybindingContribution };
|
|
137
126
|
//# sourceMappingURL=monaco-keybinding.js.map
|