@theia/scm 1.77.0-next.1 → 1.77.0-next.101
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/decorations/scm-decorations-service.d.ts +2 -2
- package/lib/browser/decorations/scm-decorations-service.d.ts.map +1 -1
- package/lib/browser/decorations/scm-decorations-service.js +22 -28
- package/lib/browser/decorations/scm-decorations-service.js.map +1 -1
- package/lib/browser/decorations/scm-navigator-decorator.js +22 -28
- package/lib/browser/decorations/scm-navigator-decorator.js.map +1 -1
- package/lib/browser/dirty-diff/content-lines.js +2 -5
- package/lib/browser/dirty-diff/content-lines.js.map +1 -1
- package/lib/browser/dirty-diff/content-lines.spec.js +15 -16
- package/lib/browser/dirty-diff/content-lines.spec.js.map +1 -1
- package/lib/browser/dirty-diff/diff-computer.d.ts +1 -1
- package/lib/browser/dirty-diff/diff-computer.d.ts.map +1 -1
- package/lib/browser/dirty-diff/diff-computer.js +11 -15
- package/lib/browser/dirty-diff/diff-computer.js.map +1 -1
- package/lib/browser/dirty-diff/diff-computer.spec.js +26 -27
- package/lib/browser/dirty-diff/diff-computer.spec.js.map +1 -1
- package/lib/browser/dirty-diff/dirty-diff-decorator.d.ts +1 -1
- package/lib/browser/dirty-diff/dirty-diff-decorator.d.ts.map +1 -1
- package/lib/browser/dirty-diff/dirty-diff-decorator.js +19 -22
- package/lib/browser/dirty-diff/dirty-diff-decorator.js.map +1 -1
- package/lib/browser/dirty-diff/dirty-diff-module.js +11 -14
- package/lib/browser/dirty-diff/dirty-diff-module.js.map +1 -1
- package/lib/browser/dirty-diff/dirty-diff-navigator.d.ts +3 -3
- package/lib/browser/dirty-diff/dirty-diff-navigator.d.ts.map +1 -1
- package/lib/browser/dirty-diff/dirty-diff-navigator.js +30 -40
- package/lib/browser/dirty-diff/dirty-diff-navigator.js.map +1 -1
- package/lib/browser/dirty-diff/dirty-diff-widget.d.ts +1 -1
- package/lib/browser/dirty-diff/dirty-diff-widget.d.ts.map +1 -1
- package/lib/browser/dirty-diff/dirty-diff-widget.js +50 -54
- package/lib/browser/dirty-diff/dirty-diff-widget.js.map +1 -1
- package/lib/browser/merge-editor/merge-editor-contribution.d.ts +2 -2
- package/lib/browser/merge-editor/merge-editor-contribution.d.ts.map +1 -1
- package/lib/browser/merge-editor/merge-editor-contribution.js +43 -49
- package/lib/browser/merge-editor/merge-editor-contribution.js.map +1 -1
- package/lib/browser/merge-editor/merge-editor-dev-contribution.d.ts +2 -2
- package/lib/browser/merge-editor/merge-editor-dev-contribution.d.ts.map +1 -1
- package/lib/browser/merge-editor/merge-editor-dev-contribution.js +35 -45
- package/lib/browser/merge-editor/merge-editor-dev-contribution.js.map +1 -1
- package/lib/browser/merge-editor/merge-editor-module.d.ts +1 -1
- package/lib/browser/merge-editor/merge-editor-module.d.ts.map +1 -1
- package/lib/browser/merge-editor/merge-editor-module.js +49 -54
- package/lib/browser/merge-editor/merge-editor-module.js.map +1 -1
- package/lib/browser/merge-editor/merge-editor.d.ts +5 -5
- package/lib/browser/merge-editor/merge-editor.d.ts.map +1 -1
- package/lib/browser/merge-editor/merge-editor.js +77 -92
- package/lib/browser/merge-editor/merge-editor.js.map +1 -1
- package/lib/browser/merge-editor/model/line-range.js +6 -10
- package/lib/browser/merge-editor/model/line-range.js.map +1 -1
- package/lib/browser/merge-editor/model/live-diff.d.ts +1 -1
- package/lib/browser/merge-editor/model/live-diff.d.ts.map +1 -1
- package/lib/browser/merge-editor/model/live-diff.js +14 -18
- package/lib/browser/merge-editor/model/live-diff.js.map +1 -1
- package/lib/browser/merge-editor/model/merge-editor-model.d.ts +4 -4
- package/lib/browser/merge-editor/model/merge-editor-model.d.ts.map +1 -1
- package/lib/browser/merge-editor/model/merge-editor-model.js +88 -98
- package/lib/browser/merge-editor/model/merge-editor-model.js.map +1 -1
- package/lib/browser/merge-editor/model/merge-range.d.ts +3 -3
- package/lib/browser/merge-editor/model/merge-range.d.ts.map +1 -1
- package/lib/browser/merge-editor/model/merge-range.js +26 -30
- package/lib/browser/merge-editor/model/merge-range.js.map +1 -1
- package/lib/browser/merge-editor/model/range-editing.d.ts +1 -1
- package/lib/browser/merge-editor/model/range-editing.d.ts.map +1 -1
- package/lib/browser/merge-editor/model/range-editing.js +8 -13
- package/lib/browser/merge-editor/model/range-editing.js.map +1 -1
- package/lib/browser/merge-editor/model/range-mapping.d.ts +2 -2
- package/lib/browser/merge-editor/model/range-mapping.d.ts.map +1 -1
- package/lib/browser/merge-editor/model/range-mapping.js +28 -37
- package/lib/browser/merge-editor/model/range-mapping.js.map +1 -1
- package/lib/browser/merge-editor/model/range-mapping.spec.js +19 -21
- package/lib/browser/merge-editor/model/range-mapping.spec.js.map +1 -1
- package/lib/browser/merge-editor/model/range-utils.js +9 -12
- package/lib/browser/merge-editor/model/range-utils.js.map +1 -1
- package/lib/browser/merge-editor/view/diff-spacers.d.ts +1 -1
- package/lib/browser/merge-editor/view/diff-spacers.d.ts.map +1 -1
- package/lib/browser/merge-editor/view/diff-spacers.js +7 -10
- package/lib/browser/merge-editor/view/diff-spacers.js.map +1 -1
- package/lib/browser/merge-editor/view/merge-editor-panes/index.d.ts +5 -5
- package/lib/browser/merge-editor/view/merge-editor-panes/index.d.ts.map +1 -1
- package/lib/browser/merge-editor/view/merge-editor-panes/index.js +5 -8
- package/lib/browser/merge-editor/view/merge-editor-panes/index.js.map +1 -1
- package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-base-pane.d.ts +3 -3
- package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-base-pane.d.ts.map +1 -1
- package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-base-pane.js +11 -15
- package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-base-pane.js.map +1 -1
- package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-pane-header.js +18 -25
- package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-pane-header.js.map +1 -1
- package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-pane.d.ts +5 -5
- package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-pane.d.ts.map +1 -1
- package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-pane.js +48 -58
- package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-pane.js.map +1 -1
- package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-result-pane.d.ts +4 -4
- package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-result-pane.d.ts.map +1 -1
- package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-result-pane.js +32 -38
- package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-result-pane.js.map +1 -1
- package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-side-pane.d.ts +4 -4
- package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-side-pane.d.ts.map +1 -1
- package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-side-pane.js +32 -41
- package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-side-pane.js.map +1 -1
- package/lib/browser/merge-editor/view/merge-editor-scroll-sync.d.ts +2 -2
- package/lib/browser/merge-editor/view/merge-editor-scroll-sync.d.ts.map +1 -1
- package/lib/browser/merge-editor/view/merge-editor-scroll-sync.js +3 -7
- package/lib/browser/merge-editor/view/merge-editor-scroll-sync.js.map +1 -1
- package/lib/browser/merge-editor/view/merge-editor-view-zones.d.ts +5 -5
- package/lib/browser/merge-editor/view/merge-editor-view-zones.d.ts.map +1 -1
- package/lib/browser/merge-editor/view/merge-editor-view-zones.js +18 -25
- package/lib/browser/merge-editor/view/merge-editor-view-zones.js.map +1 -1
- package/lib/browser/merge-editor/view/merge-range-actions.d.ts +2 -2
- package/lib/browser/merge-editor/view/merge-range-actions.d.ts.map +1 -1
- package/lib/browser/merge-editor/view/merge-range-actions.js +34 -38
- package/lib/browser/merge-editor/view/merge-range-actions.js.map +1 -1
- package/lib/browser/multi-diff-editor/multi-diff-editor-module.d.ts +4 -0
- package/lib/browser/multi-diff-editor/multi-diff-editor-module.d.ts.map +1 -0
- package/lib/browser/multi-diff-editor/multi-diff-editor-module.js +31 -0
- package/lib/browser/multi-diff-editor/multi-diff-editor-module.js.map +1 -0
- package/lib/browser/multi-diff-editor/multi-diff-editor-uri.d.ts +15 -0
- package/lib/browser/multi-diff-editor/multi-diff-editor-uri.d.ts.map +1 -0
- package/lib/browser/multi-diff-editor/multi-diff-editor-uri.js +65 -0
- package/lib/browser/multi-diff-editor/multi-diff-editor-uri.js.map +1 -0
- package/lib/browser/multi-diff-editor/multi-diff-editor-widget-factory.d.ts +18 -0
- package/lib/browser/multi-diff-editor/multi-diff-editor-widget-factory.d.ts.map +1 -0
- package/lib/browser/multi-diff-editor/multi-diff-editor-widget-factory.js +72 -0
- package/lib/browser/multi-diff-editor/multi-diff-editor-widget-factory.js.map +1 -0
- package/lib/browser/multi-diff-editor/multi-diff-editor-widget.spec.d.ts +2 -0
- package/lib/browser/multi-diff-editor/multi-diff-editor-widget.spec.d.ts.map +1 -0
- package/lib/browser/multi-diff-editor/multi-diff-editor-widget.spec.js +832 -0
- package/lib/browser/multi-diff-editor/multi-diff-editor-widget.spec.js.map +1 -0
- package/lib/browser/multi-diff-editor/multi-diff-editor.d.ts +163 -0
- package/lib/browser/multi-diff-editor/multi-diff-editor.d.ts.map +1 -0
- package/lib/browser/multi-diff-editor/multi-diff-editor.js +552 -0
- package/lib/browser/multi-diff-editor/multi-diff-editor.js.map +1 -0
- package/lib/browser/multi-diff-editor/multi-diff-editor.spec.d.ts +2 -0
- package/lib/browser/multi-diff-editor/multi-diff-editor.spec.d.ts.map +1 -0
- package/lib/browser/multi-diff-editor/multi-diff-editor.spec.js +165 -0
- package/lib/browser/multi-diff-editor/multi-diff-editor.spec.js.map +1 -0
- package/lib/browser/scm-action-button-widget.d.ts +2 -2
- package/lib/browser/scm-action-button-widget.d.ts.map +1 -1
- package/lib/browser/scm-action-button-widget.js +30 -39
- package/lib/browser/scm-action-button-widget.js.map +1 -1
- package/lib/browser/scm-amend-component.d.ts +3 -3
- package/lib/browser/scm-amend-component.d.ts.map +1 -1
- package/lib/browser/scm-amend-component.js +24 -28
- package/lib/browser/scm-amend-component.js.map +1 -1
- package/lib/browser/scm-amend-widget.d.ts +2 -2
- package/lib/browser/scm-amend-widget.d.ts.map +1 -1
- package/lib/browser/scm-amend-widget.js +26 -36
- package/lib/browser/scm-amend-widget.js.map +1 -1
- package/lib/browser/scm-avatar-service.js +7 -10
- package/lib/browser/scm-avatar-service.js.map +1 -1
- package/lib/browser/scm-colors.js +2 -5
- package/lib/browser/scm-colors.js.map +1 -1
- package/lib/browser/scm-commit-widget.d.ts +2 -2
- package/lib/browser/scm-commit-widget.d.ts.map +1 -1
- package/lib/browser/scm-commit-widget.js +25 -31
- package/lib/browser/scm-commit-widget.js.map +1 -1
- package/lib/browser/scm-context-key-service.js +10 -17
- package/lib/browser/scm-context-key-service.js.map +1 -1
- package/lib/browser/scm-context-key-service.spec.js +33 -35
- package/lib/browser/scm-context-key-service.spec.js.map +1 -1
- package/lib/browser/scm-contribution.d.ts +8 -8
- package/lib/browser/scm-contribution.d.ts.map +1 -1
- package/lib/browser/scm-contribution.js +114 -131
- package/lib/browser/scm-contribution.js.map +1 -1
- package/lib/browser/scm-frontend-module.d.ts.map +1 -1
- package/lib/browser/scm-frontend-module.js +99 -101
- package/lib/browser/scm-frontend-module.js.map +1 -1
- package/lib/browser/scm-groups-tree-model.d.ts +3 -3
- package/lib/browser/scm-groups-tree-model.d.ts.map +1 -1
- package/lib/browser/scm-groups-tree-model.js +15 -22
- package/lib/browser/scm-groups-tree-model.js.map +1 -1
- package/lib/browser/scm-history-graph-contribution.d.ts +4 -4
- package/lib/browser/scm-history-graph-contribution.d.ts.map +1 -1
- package/lib/browser/scm-history-graph-contribution.js +52 -60
- package/lib/browser/scm-history-graph-contribution.js.map +1 -1
- package/lib/browser/scm-history-graph-contribution.spec.js +35 -37
- package/lib/browser/scm-history-graph-contribution.spec.js.map +1 -1
- package/lib/browser/scm-history-graph-helpers.d.ts +1 -1
- package/lib/browser/scm-history-graph-helpers.d.ts.map +1 -1
- package/lib/browser/scm-history-graph-helpers.js +14 -30
- package/lib/browser/scm-history-graph-helpers.js.map +1 -1
- package/lib/browser/scm-history-graph-helpers.spec.js +44 -46
- package/lib/browser/scm-history-graph-helpers.spec.js.map +1 -1
- package/lib/browser/scm-history-graph-lanes.js +1 -4
- package/lib/browser/scm-history-graph-lanes.js.map +1 -1
- package/lib/browser/scm-history-graph-lanes.spec.js +135 -137
- package/lib/browser/scm-history-graph-lanes.spec.js.map +1 -1
- package/lib/browser/scm-history-graph-model.d.ts +4 -4
- package/lib/browser/scm-history-graph-model.d.ts.map +1 -1
- package/lib/browser/scm-history-graph-model.js +34 -43
- package/lib/browser/scm-history-graph-model.js.map +1 -1
- package/lib/browser/scm-history-graph-model.spec.js +74 -76
- package/lib/browser/scm-history-graph-model.spec.js.map +1 -1
- package/lib/browser/scm-history-graph-tooltip.d.ts +2 -2
- package/lib/browser/scm-history-graph-tooltip.d.ts.map +1 -1
- package/lib/browser/scm-history-graph-tooltip.js +33 -42
- package/lib/browser/scm-history-graph-tooltip.js.map +1 -1
- package/lib/browser/scm-history-graph-tooltip.spec.js +63 -65
- package/lib/browser/scm-history-graph-tooltip.spec.js.map +1 -1
- package/lib/browser/scm-history-graph-widget.d.ts +7 -7
- package/lib/browser/scm-history-graph-widget.d.ts.map +1 -1
- package/lib/browser/scm-history-graph-widget.js +116 -134
- package/lib/browser/scm-history-graph-widget.js.map +1 -1
- package/lib/browser/scm-history-graph-widget.spec.js +40 -42
- package/lib/browser/scm-history-graph-widget.spec.js.map +1 -1
- package/lib/browser/scm-input.js +10 -14
- package/lib/browser/scm-input.js.map +1 -1
- package/lib/browser/scm-layout-migrations.js +15 -18
- package/lib/browser/scm-layout-migrations.js.map +1 -1
- package/lib/browser/scm-provider.d.ts +2 -0
- package/lib/browser/scm-provider.d.ts.map +1 -1
- package/lib/browser/scm-provider.js +1 -4
- package/lib/browser/scm-provider.js.map +1 -1
- package/lib/browser/scm-quick-open-service.d.ts +1 -1
- package/lib/browser/scm-quick-open-service.d.ts.map +1 -1
- package/lib/browser/scm-quick-open-service.js +20 -27
- package/lib/browser/scm-quick-open-service.js.map +1 -1
- package/lib/browser/scm-repositories-widget.d.ts +4 -4
- package/lib/browser/scm-repositories-widget.d.ts.map +1 -1
- package/lib/browser/scm-repositories-widget.js +55 -67
- package/lib/browser/scm-repositories-widget.js.map +1 -1
- package/lib/browser/scm-repositories-widget.spec.js +86 -88
- package/lib/browser/scm-repositories-widget.spec.js.map +1 -1
- package/lib/browser/scm-repository.d.ts +2 -2
- package/lib/browser/scm-repository.d.ts.map +1 -1
- package/lib/browser/scm-repository.js +6 -10
- package/lib/browser/scm-repository.js.map +1 -1
- package/lib/browser/scm-service.d.ts +3 -3
- package/lib/browser/scm-service.d.ts.map +1 -1
- package/lib/browser/scm-service.js +18 -22
- package/lib/browser/scm-service.js.map +1 -1
- package/lib/browser/scm-service.spec.js +15 -17
- package/lib/browser/scm-service.spec.js.map +1 -1
- package/lib/browser/scm-tree-label-provider.d.ts +1 -1
- package/lib/browser/scm-tree-label-provider.d.ts.map +1 -1
- package/lib/browser/scm-tree-label-provider.js +16 -20
- package/lib/browser/scm-tree-label-provider.js.map +1 -1
- package/lib/browser/scm-tree-model.d.ts +2 -2
- package/lib/browser/scm-tree-model.d.ts.map +1 -1
- package/lib/browser/scm-tree-model.js +27 -32
- package/lib/browser/scm-tree-model.js.map +1 -1
- package/lib/browser/scm-tree-widget.d.ts +4 -4
- package/lib/browser/scm-tree-widget.d.ts.map +1 -1
- package/lib/browser/scm-tree-widget.js +98 -122
- package/lib/browser/scm-tree-widget.js.map +1 -1
- package/lib/browser/scm-widget.d.ts +6 -6
- package/lib/browser/scm-widget.d.ts.map +1 -1
- package/lib/browser/scm-widget.js +49 -64
- package/lib/browser/scm-widget.js.map +1 -1
- package/lib/common/scm-preferences.js +21 -26
- package/lib/common/scm-preferences.js.map +1 -1
- package/lib/node/scm-backend-module.js +4 -6
- package/lib/node/scm-backend-module.js.map +1 -1
- package/package.json +15 -6
- package/src/browser/decorations/scm-decorations-service.ts +5 -5
- package/src/browser/dirty-diff/content-lines.spec.ts +3 -2
- package/src/browser/dirty-diff/diff-computer.spec.ts +4 -3
- package/src/browser/dirty-diff/diff-computer.ts +1 -1
- package/src/browser/dirty-diff/dirty-diff-decorator.ts +1 -1
- package/src/browser/dirty-diff/dirty-diff-module.ts +3 -3
- package/src/browser/dirty-diff/dirty-diff-navigator.ts +4 -4
- package/src/browser/dirty-diff/dirty-diff-widget.ts +2 -2
- package/src/browser/merge-editor/merge-editor-contribution.ts +2 -2
- package/src/browser/merge-editor/merge-editor-dev-contribution.ts +1 -1
- package/src/browser/merge-editor/merge-editor-module.ts +7 -7
- package/src/browser/merge-editor/merge-editor.ts +5 -5
- package/src/browser/merge-editor/model/live-diff.ts +2 -2
- package/src/browser/merge-editor/model/merge-editor-model.ts +8 -8
- package/src/browser/merge-editor/model/merge-range.ts +4 -4
- package/src/browser/merge-editor/model/range-editing.ts +1 -1
- package/src/browser/merge-editor/model/range-mapping.spec.ts +1 -1
- package/src/browser/merge-editor/model/range-mapping.ts +3 -3
- package/src/browser/merge-editor/view/diff-spacers.ts +1 -1
- package/src/browser/merge-editor/view/merge-editor-panes/index.ts +5 -5
- package/src/browser/merge-editor/view/merge-editor-panes/merge-editor-base-pane.ts +3 -3
- package/src/browser/merge-editor/view/merge-editor-panes/merge-editor-pane.ts +7 -7
- package/src/browser/merge-editor/view/merge-editor-panes/merge-editor-result-pane.ts +4 -4
- package/src/browser/merge-editor/view/merge-editor-panes/merge-editor-side-pane.ts +4 -4
- package/src/browser/merge-editor/view/merge-editor-scroll-sync.ts +2 -2
- package/src/browser/merge-editor/view/merge-editor-view-zones.ts +5 -5
- package/src/browser/merge-editor/view/merge-range-actions.ts +2 -2
- package/src/browser/multi-diff-editor/multi-diff-editor-module.ts +35 -0
- package/src/browser/multi-diff-editor/multi-diff-editor-uri.ts +83 -0
- package/src/browser/multi-diff-editor/multi-diff-editor-widget-factory.ts +81 -0
- package/src/browser/multi-diff-editor/multi-diff-editor-widget.spec.ts +878 -0
- package/src/browser/multi-diff-editor/multi-diff-editor.spec.ts +189 -0
- package/src/browser/multi-diff-editor/multi-diff-editor.ts +628 -0
- package/src/browser/scm-action-button-widget.tsx +3 -3
- package/src/browser/scm-amend-component.tsx +3 -3
- package/src/browser/scm-amend-widget.tsx +3 -3
- package/src/browser/scm-commit-widget.tsx +2 -2
- package/src/browser/scm-context-key-service.spec.ts +3 -3
- package/src/browser/scm-contribution.ts +8 -8
- package/src/browser/scm-frontend-module.ts +25 -22
- package/src/browser/scm-groups-tree-model.ts +3 -3
- package/src/browser/scm-history-graph-contribution.spec.ts +3 -3
- package/src/browser/scm-history-graph-contribution.ts +6 -6
- package/src/browser/scm-history-graph-helpers.spec.ts +2 -2
- package/src/browser/scm-history-graph-helpers.ts +1 -1
- package/src/browser/scm-history-graph-lanes.spec.ts +1 -1
- package/src/browser/scm-history-graph-model.spec.ts +3 -3
- package/src/browser/scm-history-graph-model.ts +5 -5
- package/src/browser/scm-history-graph-tooltip.spec.ts +3 -3
- package/src/browser/scm-history-graph-tooltip.ts +3 -3
- package/src/browser/scm-history-graph-widget.spec.ts +4 -4
- package/src/browser/scm-history-graph-widget.tsx +8 -8
- package/src/browser/scm-input.ts +1 -1
- package/src/browser/scm-layout-migrations.ts +1 -1
- package/src/browser/scm-provider.ts +2 -0
- package/src/browser/scm-quick-open-service.ts +1 -1
- package/src/browser/scm-repositories-widget.spec.ts +2 -2
- package/src/browser/scm-repositories-widget.tsx +4 -4
- package/src/browser/scm-repository.ts +2 -2
- package/src/browser/scm-service.spec.ts +2 -2
- package/src/browser/scm-service.ts +3 -3
- package/src/browser/scm-tree-label-provider.ts +1 -1
- package/src/browser/scm-tree-model.ts +2 -2
- package/src/browser/scm-tree-widget.tsx +4 -4
- package/src/browser/scm-widget.tsx +6 -6
- package/src/browser/style/multi-diff-editor.css +113 -0
- package/src/node/scm-backend-module.ts +1 -1
|
@@ -22,10 +22,10 @@
|
|
|
22
22
|
import { ArrayUtils } from '@theia/core';
|
|
23
23
|
import { uinteger, Position, Range } from '@theia/core/shared/vscode-languageserver-protocol';
|
|
24
24
|
import { TextEditorDocument } from '@theia/editor/lib/browser/editor';
|
|
25
|
-
import { DetailedLineRangeMapping, MappingAlignment } from './range-mapping';
|
|
26
|
-
import { LineRange } from './line-range';
|
|
27
|
-
import { LineRangeEdit, RangeEdit } from './range-editing';
|
|
28
|
-
import { PositionUtils, RangeUtils } from './range-utils';
|
|
25
|
+
import { DetailedLineRangeMapping, MappingAlignment } from './range-mapping.js';
|
|
26
|
+
import { LineRange } from './line-range.js';
|
|
27
|
+
import { LineRangeEdit, RangeEdit } from './range-editing.js';
|
|
28
|
+
import { PositionUtils, RangeUtils } from './range-utils.js';
|
|
29
29
|
|
|
30
30
|
/**
|
|
31
31
|
* Describes modifications in side 1 and side 2 for a specific range in base.
|
|
@@ -21,7 +21,7 @@
|
|
|
21
21
|
|
|
22
22
|
import { ArrayUtils } from '@theia/core';
|
|
23
23
|
import { Range, uinteger } from '@theia/core/shared/vscode-languageserver-protocol';
|
|
24
|
-
import { LineRange } from './line-range';
|
|
24
|
+
import { LineRange } from './line-range.js';
|
|
25
25
|
import * as monaco from '@theia/monaco-editor-core';
|
|
26
26
|
|
|
27
27
|
/**
|
|
@@ -21,7 +21,7 @@
|
|
|
21
21
|
|
|
22
22
|
import { expect } from 'chai';
|
|
23
23
|
import { Range } from '@theia/core/shared/vscode-languageserver-protocol';
|
|
24
|
-
import { DocumentRangeMap, RangeMapping } from './range-mapping';
|
|
24
|
+
import { DocumentRangeMap, RangeMapping } from './range-mapping.js';
|
|
25
25
|
|
|
26
26
|
describe('document-range-map', () => {
|
|
27
27
|
|
|
@@ -21,9 +21,9 @@
|
|
|
21
21
|
|
|
22
22
|
import { ArrayUtils } from '@theia/core';
|
|
23
23
|
import { Position, Range, TextEditorDocument } from '@theia/editor/lib/browser/editor';
|
|
24
|
-
import { LineRange } from './line-range';
|
|
25
|
-
import { LineRangeEdit } from './range-editing';
|
|
26
|
-
import { PositionUtils, RangeUtils } from './range-utils';
|
|
24
|
+
import { LineRange } from './line-range.js';
|
|
25
|
+
import { LineRangeEdit } from './range-editing.js';
|
|
26
|
+
import { PositionUtils, RangeUtils } from './range-utils.js';
|
|
27
27
|
|
|
28
28
|
/**
|
|
29
29
|
* Maps a line range in the original text document to a line range in the modified text document.
|
|
@@ -16,7 +16,7 @@
|
|
|
16
16
|
|
|
17
17
|
import { injectable } from '@theia/core/shared/inversify';
|
|
18
18
|
import { ArrayUtils } from '@theia/core';
|
|
19
|
-
import { LineRangeMapping } from '../model/range-mapping';
|
|
19
|
+
import { LineRangeMapping } from '../model/range-mapping.js';
|
|
20
20
|
|
|
21
21
|
export interface DiffSpacers {
|
|
22
22
|
/**
|
|
@@ -14,8 +14,8 @@
|
|
|
14
14
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
15
15
|
// *****************************************************************************
|
|
16
16
|
|
|
17
|
-
export * from './merge-editor-pane';
|
|
18
|
-
export * from './merge-editor-pane-header';
|
|
19
|
-
export * from './merge-editor-base-pane';
|
|
20
|
-
export * from './merge-editor-side-pane';
|
|
21
|
-
export * from './merge-editor-result-pane';
|
|
17
|
+
export * from './merge-editor-pane.js';
|
|
18
|
+
export * from './merge-editor-pane-header.js';
|
|
19
|
+
export * from './merge-editor-base-pane.js';
|
|
20
|
+
export * from './merge-editor-side-pane.js';
|
|
21
|
+
export * from './merge-editor-result-pane.js';
|
|
@@ -18,9 +18,9 @@ import { injectable } from '@theia/core/shared/inversify';
|
|
|
18
18
|
import { nls } from '@theia/core';
|
|
19
19
|
import { Autorun } from '@theia/core/lib/common/observable';
|
|
20
20
|
import { EditorDecoration, Range } from '@theia/editor/lib/browser';
|
|
21
|
-
import { MergeEditorPane } from './merge-editor-pane';
|
|
22
|
-
import { MergeRange } from '../../model/merge-range';
|
|
23
|
-
import { LineRange } from '../../model/line-range';
|
|
21
|
+
import { MergeEditorPane } from './merge-editor-pane.js';
|
|
22
|
+
import { MergeRange } from '../../model/merge-range.js';
|
|
23
|
+
import { LineRange } from '../../model/line-range.js';
|
|
24
24
|
|
|
25
25
|
@injectable()
|
|
26
26
|
export class MergeEditorBasePane extends MergeEditorPane {
|
|
@@ -22,13 +22,13 @@ import { EditorDecoration, EditorWidget, MinimapPosition, OverviewRulerLane, Pos
|
|
|
22
22
|
import { MonacoEditor } from '@theia/monaco/lib/browser/monaco-editor';
|
|
23
23
|
import { MonacoToProtocolConverter } from '@theia/monaco/lib/browser/monaco-to-protocol-converter';
|
|
24
24
|
import { Selection } from '@theia/monaco-editor-core';
|
|
25
|
-
import { MergeEditorPaneHeader, MergeEditorPaneToolbarItem } from './merge-editor-pane-header';
|
|
26
|
-
import { MergeEditor } from '../../merge-editor';
|
|
27
|
-
import { MergeRange } from '../../model/merge-range';
|
|
28
|
-
import { DetailedLineRangeMapping } from '../../model/range-mapping';
|
|
29
|
-
import { LineRange } from '../../model/line-range';
|
|
30
|
-
import { RangeUtils } from '../../model/range-utils';
|
|
31
|
-
import { ScmColors } from '../../../scm-colors';
|
|
25
|
+
import { MergeEditorPaneHeader, MergeEditorPaneToolbarItem } from './merge-editor-pane-header.js';
|
|
26
|
+
import { MergeEditor } from '../../merge-editor.js';
|
|
27
|
+
import { MergeRange } from '../../model/merge-range.js';
|
|
28
|
+
import { DetailedLineRangeMapping } from '../../model/range-mapping.js';
|
|
29
|
+
import { LineRange } from '../../model/line-range.js';
|
|
30
|
+
import { RangeUtils } from '../../model/range-utils.js';
|
|
31
|
+
import { ScmColors } from '../../../scm-colors.js';
|
|
32
32
|
|
|
33
33
|
@injectable()
|
|
34
34
|
export abstract class MergeEditorPane extends BoxPanel {
|
|
@@ -21,10 +21,10 @@ import { Autorun, ObservableUtils } from '@theia/core/lib/common/observable';
|
|
|
21
21
|
import { EditorDecoration, Range } from '@theia/editor/lib/browser';
|
|
22
22
|
import { NavigationLocation } from '@theia/editor/lib/browser/navigation/navigation-location';
|
|
23
23
|
import { NavigationLocationService } from '@theia/editor/lib/browser/navigation/navigation-location-service';
|
|
24
|
-
import { MergeEditorPane } from './merge-editor-pane';
|
|
25
|
-
import { MergeEditorPaneToolbarItem } from './merge-editor-pane-header';
|
|
26
|
-
import { LineRange } from '../../model/line-range';
|
|
27
|
-
import { MergeRange } from '../../model/merge-range';
|
|
24
|
+
import { MergeEditorPane } from './merge-editor-pane.js';
|
|
25
|
+
import { MergeEditorPaneToolbarItem } from './merge-editor-pane-header.js';
|
|
26
|
+
import { LineRange } from '../../model/line-range.js';
|
|
27
|
+
import { MergeRange } from '../../model/merge-range.js';
|
|
28
28
|
|
|
29
29
|
@injectable()
|
|
30
30
|
export class MergeEditorResultPane extends MergeEditorPane {
|
|
@@ -19,10 +19,10 @@ import { nls, ILogger } from '@theia/core';
|
|
|
19
19
|
import { ObservableUtils } from '@theia/core/lib/common/observable';
|
|
20
20
|
import { codicon, DiffUris, LabelProvider, open, OpenerService } from '@theia/core/lib/browser';
|
|
21
21
|
import { EditorDecoration, EditorOpenerOptions, Range } from '@theia/editor/lib/browser';
|
|
22
|
-
import { MergeRange, MergeRangeAcceptedState, MergeSide } from '../../model/merge-range';
|
|
23
|
-
import { MergeEditorPane } from './merge-editor-pane';
|
|
24
|
-
import { MergeEditorPaneToolbarItem } from './merge-editor-pane-header';
|
|
25
|
-
import { LineRange } from '../../model/line-range';
|
|
22
|
+
import { MergeRange, MergeRangeAcceptedState, MergeSide } from '../../model/merge-range.js';
|
|
23
|
+
import { MergeEditorPane } from './merge-editor-pane.js';
|
|
24
|
+
import { MergeEditorPaneToolbarItem } from './merge-editor-pane-header.js';
|
|
25
|
+
import { LineRange } from '../../model/line-range.js';
|
|
26
26
|
|
|
27
27
|
@injectable()
|
|
28
28
|
export abstract class MergeEditorSidePane extends MergeEditorPane {
|
|
@@ -21,8 +21,8 @@
|
|
|
21
21
|
|
|
22
22
|
import { Disposable, DisposableCollection } from '@theia/core';
|
|
23
23
|
import { MonacoEditor } from '@theia/monaco/lib/browser/monaco-editor';
|
|
24
|
-
import { MergeEditor } from '../merge-editor';
|
|
25
|
-
import { DocumentLineRangeMap } from '../model/range-mapping';
|
|
24
|
+
import { MergeEditor } from '../merge-editor.js';
|
|
25
|
+
import { DocumentLineRangeMap } from '../model/range-mapping.js';
|
|
26
26
|
|
|
27
27
|
export class MergeEditorScrollSync implements Disposable {
|
|
28
28
|
|
|
@@ -19,11 +19,11 @@ import { Disposable } from '@theia/core';
|
|
|
19
19
|
import { Autorun, Observable } from '@theia/core/lib/common/observable';
|
|
20
20
|
import * as monaco from '@theia/monaco-editor-core';
|
|
21
21
|
import { MonacoEditorViewZone } from '@theia/monaco/lib/browser/monaco-editor-zone-widget';
|
|
22
|
-
import { MergeEditor } from '../merge-editor';
|
|
23
|
-
import { MergeRange } from '../model/merge-range';
|
|
24
|
-
import { MergeRangeAction, MergeRangeActions } from './merge-range-actions';
|
|
25
|
-
import { MergeEditorPane } from './merge-editor-panes';
|
|
26
|
-
import { DiffSpacers, DiffSpacerService } from './diff-spacers';
|
|
22
|
+
import { MergeEditor } from '../merge-editor.js';
|
|
23
|
+
import { MergeRange } from '../model/merge-range.js';
|
|
24
|
+
import { MergeRangeAction, MergeRangeActions } from './merge-range-actions.js';
|
|
25
|
+
import { MergeEditorPane } from './merge-editor-panes/index.js';
|
|
26
|
+
import { DiffSpacers, DiffSpacerService } from './diff-spacers.js';
|
|
27
27
|
|
|
28
28
|
export interface MergeEditorViewZone {
|
|
29
29
|
create(ctx: MergeEditorViewZone.CreationContext): void;
|
|
@@ -20,8 +20,8 @@
|
|
|
20
20
|
// copied and modified from https://github.com/microsoft/vscode/blob/1.96.3/src/vs/workbench/contrib/mergeEditor/browser/view/conflictActions.ts
|
|
21
21
|
|
|
22
22
|
import { DerivedObservable, ObservableUtils } from '@theia/core/lib/common/observable';
|
|
23
|
-
import { MergeRange, MergeRangeAcceptedState, MergeSide } from '../model/merge-range';
|
|
24
|
-
import { MergeEditor } from '../merge-editor';
|
|
23
|
+
import { MergeRange, MergeRangeAcceptedState, MergeSide } from '../model/merge-range.js';
|
|
24
|
+
import { MergeEditor } from '../merge-editor.js';
|
|
25
25
|
import { nls } from '@theia/core';
|
|
26
26
|
|
|
27
27
|
export interface MergeRangeAction {
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
// *****************************************************************************
|
|
2
|
+
// Copyright (C) 2026 EclipseSource and others.
|
|
3
|
+
//
|
|
4
|
+
// This program and the accompanying materials are made available under the
|
|
5
|
+
// terms of the Eclipse Public License v. 2.0 which is available at
|
|
6
|
+
// http://www.eclipse.org/legal/epl-2.0.
|
|
7
|
+
//
|
|
8
|
+
// This Source Code may also be made available under the following Secondary
|
|
9
|
+
// Licenses when the conditions for such availability set forth in the Eclipse
|
|
10
|
+
// Public License v. 2.0 are satisfied: GNU General Public License, version 2
|
|
11
|
+
// with the GNU Classpath Exception which is available at
|
|
12
|
+
// https://www.gnu.org/software/classpath/license.html.
|
|
13
|
+
//
|
|
14
|
+
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
15
|
+
// *****************************************************************************
|
|
16
|
+
|
|
17
|
+
import '../../../src/browser/style/multi-diff-editor.css';
|
|
18
|
+
|
|
19
|
+
import { interfaces } from '@theia/core/shared/inversify';
|
|
20
|
+
import { URI } from '@theia/core';
|
|
21
|
+
import { LabelProviderContribution, NavigatableWidgetOptions, OpenHandler, WidgetFactory } from '@theia/core/lib/browser';
|
|
22
|
+
import { MultiDiffEditorOpenHandler, MultiDiffEditorLabelProvider } from './multi-diff-editor.js';
|
|
23
|
+
import { MultiDiffEditorWidgetFactory } from './multi-diff-editor-widget-factory.js';
|
|
24
|
+
|
|
25
|
+
export function bindMultiDiffEditor(bind: interfaces.Bind): void {
|
|
26
|
+
bind(MultiDiffEditorWidgetFactory).toDynamicValue(ctx => new MultiDiffEditorWidgetFactory(ctx.container)).inSingletonScope();
|
|
27
|
+
bind(WidgetFactory).toDynamicValue(ctx => ({
|
|
28
|
+
id: MultiDiffEditorOpenHandler.ID,
|
|
29
|
+
createWidget: (options: NavigatableWidgetOptions) => ctx.container.get(MultiDiffEditorWidgetFactory).createMultiDiffEditor(new URI(options.uri))
|
|
30
|
+
})).inSingletonScope();
|
|
31
|
+
|
|
32
|
+
bind(MultiDiffEditorOpenHandler).toSelf().inSingletonScope();
|
|
33
|
+
bind(OpenHandler).toService(MultiDiffEditorOpenHandler);
|
|
34
|
+
bind(LabelProviderContribution).to(MultiDiffEditorLabelProvider).inSingletonScope();
|
|
35
|
+
}
|
|
@@ -0,0 +1,83 @@
|
|
|
1
|
+
// *****************************************************************************
|
|
2
|
+
// Copyright (C) 2026 EclipseSource and others.
|
|
3
|
+
//
|
|
4
|
+
// This program and the accompanying materials are made available under the
|
|
5
|
+
// terms of the Eclipse Public License v. 2.0 which is available at
|
|
6
|
+
// http://www.eclipse.org/legal/epl-2.0.
|
|
7
|
+
//
|
|
8
|
+
// This Source Code may also be made available under the following Secondary
|
|
9
|
+
// Licenses when the conditions for such availability set forth in the Eclipse
|
|
10
|
+
// Public License v. 2.0 are satisfied: GNU General Public License, version 2
|
|
11
|
+
// with the GNU Classpath Exception which is available at
|
|
12
|
+
// https://www.gnu.org/software/classpath/license.html.
|
|
13
|
+
//
|
|
14
|
+
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
15
|
+
// *****************************************************************************
|
|
16
|
+
|
|
17
|
+
import { isObject, URI } from '@theia/core';
|
|
18
|
+
|
|
19
|
+
export interface MultiDiffEditorResourcePair {
|
|
20
|
+
originalUri: URI;
|
|
21
|
+
modifiedUri: URI;
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
export interface MultiDiffEditorUriData {
|
|
25
|
+
title: string;
|
|
26
|
+
resources: MultiDiffEditorResourcePair[];
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
export namespace MultiDiffEditorUri {
|
|
30
|
+
|
|
31
|
+
const SCHEME = 'multi-diff-editor';
|
|
32
|
+
|
|
33
|
+
export function isMultiDiffEditorUri(uri: URI): boolean {
|
|
34
|
+
return uri.scheme === SCHEME;
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
export function encode(data: MultiDiffEditorUriData): URI {
|
|
38
|
+
const payload = JSON.stringify({
|
|
39
|
+
title: data.title,
|
|
40
|
+
resources: data.resources.map(r => [r.originalUri.toString(), r.modifiedUri.toString()])
|
|
41
|
+
});
|
|
42
|
+
return new URI().withScheme(SCHEME).withQuery(payload);
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
export function decode(uri: URI): MultiDiffEditorUriData {
|
|
46
|
+
if (uri.scheme !== SCHEME) {
|
|
47
|
+
throw new Error(`The URI must have scheme ${SCHEME}. The URI was: ${uri}`);
|
|
48
|
+
}
|
|
49
|
+
let parsed: unknown;
|
|
50
|
+
try {
|
|
51
|
+
parsed = JSON.parse(uri.query);
|
|
52
|
+
} catch {
|
|
53
|
+
throw new Error(`The URI ${uri} is not a valid URI for scheme ${SCHEME}: query is not valid JSON`);
|
|
54
|
+
}
|
|
55
|
+
if (!isValidPayload(parsed)) {
|
|
56
|
+
throw new Error(`The URI ${uri} is not a valid URI for scheme ${SCHEME}`);
|
|
57
|
+
}
|
|
58
|
+
return {
|
|
59
|
+
title: parsed.title,
|
|
60
|
+
resources: parsed.resources.map(pair => ({
|
|
61
|
+
originalUri: new URI(pair[0]),
|
|
62
|
+
modifiedUri: new URI(pair[1])
|
|
63
|
+
}))
|
|
64
|
+
};
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
interface ParsedPayload {
|
|
68
|
+
title: string;
|
|
69
|
+
resources: [string, string][];
|
|
70
|
+
}
|
|
71
|
+
|
|
72
|
+
function isValidPayload(value: unknown): value is ParsedPayload {
|
|
73
|
+
if (!isObject<ParsedPayload>(value)) {
|
|
74
|
+
return false;
|
|
75
|
+
}
|
|
76
|
+
if (typeof value.title !== 'string' || !Array.isArray(value.resources)) {
|
|
77
|
+
return false;
|
|
78
|
+
}
|
|
79
|
+
return value.resources.every(pair =>
|
|
80
|
+
Array.isArray(pair) && pair.length === 2 && pair.every(s => typeof s === 'string')
|
|
81
|
+
);
|
|
82
|
+
}
|
|
83
|
+
}
|
|
@@ -0,0 +1,81 @@
|
|
|
1
|
+
// *****************************************************************************
|
|
2
|
+
// Copyright (C) 2026 EclipseSource and others.
|
|
3
|
+
//
|
|
4
|
+
// This program and the accompanying materials are made available under the
|
|
5
|
+
// terms of the Eclipse Public License v. 2.0 which is available at
|
|
6
|
+
// http://www.eclipse.org/legal/epl-2.0.
|
|
7
|
+
//
|
|
8
|
+
// This Source Code may also be made available under the following Secondary
|
|
9
|
+
// Licenses when the conditions for such availability set forth in the Eclipse
|
|
10
|
+
// Public License v. 2.0 are satisfied: GNU General Public License, version 2
|
|
11
|
+
// with the GNU Classpath Exception which is available at
|
|
12
|
+
// https://www.gnu.org/software/classpath/license.html.
|
|
13
|
+
//
|
|
14
|
+
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
15
|
+
// *****************************************************************************
|
|
16
|
+
|
|
17
|
+
import { Container, interfaces } from '@theia/core/shared/inversify';
|
|
18
|
+
import { URI } from '@theia/core';
|
|
19
|
+
import { DiffUris, LabelProvider } from '@theia/core/lib/browser';
|
|
20
|
+
import { EditorManager, EditorWidget } from '@theia/editor/lib/browser';
|
|
21
|
+
import * as monaco from '@theia/monaco-editor-core';
|
|
22
|
+
import { MonacoEditor } from '@theia/monaco/lib/browser/monaco-editor';
|
|
23
|
+
import { MonacoDiffEditor } from '@theia/monaco/lib/browser/monaco-diff-editor';
|
|
24
|
+
import { DiffEntryHeaderWidget, MultiDiffEditor, MultiDiffEditorData, MultiDiffEditorUri } from './multi-diff-editor.js';
|
|
25
|
+
import { MultiDiffEditorResourcePair, MultiDiffEditorUriData } from './multi-diff-editor-uri.js';
|
|
26
|
+
|
|
27
|
+
/** Options shared by embedded diff and code editors. */
|
|
28
|
+
const EMBEDDED_EDITOR_OPTIONS: monaco.editor.IEditorOptions = {
|
|
29
|
+
folding: false,
|
|
30
|
+
codeLens: false,
|
|
31
|
+
scrollBeyondLastLine: false,
|
|
32
|
+
stickyScroll: { enabled: false },
|
|
33
|
+
minimap: { enabled: false }
|
|
34
|
+
};
|
|
35
|
+
|
|
36
|
+
export class MultiDiffEditorWidgetFactory {
|
|
37
|
+
|
|
38
|
+
constructor(
|
|
39
|
+
protected readonly container: interfaces.Container,
|
|
40
|
+
protected readonly editorManager = container.get(EditorManager),
|
|
41
|
+
protected readonly labelProvider = container.get(LabelProvider),
|
|
42
|
+
) { }
|
|
43
|
+
|
|
44
|
+
/** Create placeholders immediately; embedded editors load as entries approach the viewport. */
|
|
45
|
+
createMultiDiffEditor(uri: URI): MultiDiffEditor {
|
|
46
|
+
const data = MultiDiffEditorUri.decode(uri);
|
|
47
|
+
const editor = this.instantiateMultiDiffEditor(data);
|
|
48
|
+
for (const resource of data.resources) {
|
|
49
|
+
const headerWidget = new DiffEntryHeaderWidget(resource, this.labelProvider);
|
|
50
|
+
editor.addDiffEntry(resource, headerWidget, () => this.createEmbeddedEditorWidget(resource));
|
|
51
|
+
}
|
|
52
|
+
return editor;
|
|
53
|
+
}
|
|
54
|
+
|
|
55
|
+
protected instantiateMultiDiffEditor(data: MultiDiffEditorUriData): MultiDiffEditor {
|
|
56
|
+
const child = new Container({ defaultScope: 'Singleton' });
|
|
57
|
+
child.parent = this.container;
|
|
58
|
+
child.bind(MultiDiffEditorData).toConstantValue(data);
|
|
59
|
+
child.bind(MultiDiffEditor).toSelf();
|
|
60
|
+
return child.get(MultiDiffEditor);
|
|
61
|
+
}
|
|
62
|
+
|
|
63
|
+
protected async createEmbeddedEditorWidget(resource: MultiDiffEditorResourcePair): Promise<EditorWidget> {
|
|
64
|
+
const diffUri = DiffUris.encode(resource.originalUri, resource.modifiedUri);
|
|
65
|
+
const editorWidget = await this.editorManager.createByUri(diffUri);
|
|
66
|
+
this.configureEmbeddedEditor(editorWidget);
|
|
67
|
+
return editorWidget;
|
|
68
|
+
}
|
|
69
|
+
|
|
70
|
+
protected configureEmbeddedEditor(editorWidget: EditorWidget): void {
|
|
71
|
+
const monacoEditor = MonacoEditor.get(editorWidget);
|
|
72
|
+
if (monacoEditor) {
|
|
73
|
+
monacoEditor.detachModelOnHide = false;
|
|
74
|
+
}
|
|
75
|
+
if (monacoEditor instanceof MonacoDiffEditor) {
|
|
76
|
+
monacoEditor.diffEditor.updateOptions({ ...EMBEDDED_EDITOR_OPTIONS, hideUnchangedRegions: { enabled: true } });
|
|
77
|
+
} else if (monacoEditor) {
|
|
78
|
+
monacoEditor.getControl().updateOptions(EMBEDDED_EDITOR_OPTIONS);
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
}
|