@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
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"merge-editor-contribution.js","sourceRoot":"","sources":["../../../src/browser/merge-editor/merge-editor-contribution.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"merge-editor-contribution.js","sourceRoot":"","sources":["../../../src/browser/merge-editor/merge-editor-contribution.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@ import { Command, CommandContribution, CommandRegistry, InMemoryResources, Messa
|
|
|
2
2
|
import { ApplicationShell, OpenerService } from '@theia/core/lib/browser';
|
|
3
3
|
import { ClipboardService } from '@theia/core/lib/browser/clipboard-service';
|
|
4
4
|
import { LanguageService } from '@theia/core/lib/browser/language-service';
|
|
5
|
-
import { MergeEditor } from './merge-editor';
|
|
5
|
+
import { MergeEditor } from './merge-editor.js';
|
|
6
6
|
export declare namespace MergeEditorDevCommands {
|
|
7
7
|
const MERGE_EDITOR_DEV_CATEGORY = "Merge Editor (Dev)";
|
|
8
8
|
const COPY_CONTENTS_TO_JSON: Command;
|
|
@@ -16,7 +16,7 @@ export declare class MergeEditorDevContribution implements CommandContribution {
|
|
|
16
16
|
protected readonly languageService: LanguageService;
|
|
17
17
|
protected readonly inMemoryResources: InMemoryResources;
|
|
18
18
|
protected readonly openerService: OpenerService;
|
|
19
|
-
protected getMergeEditor(widget?: import("@lumino/widgets/types/widget").Widget | undefined): MergeEditor | undefined;
|
|
19
|
+
protected getMergeEditor(widget?: import("@lumino/widgets/types/widget.js").Widget | undefined): MergeEditor | undefined;
|
|
20
20
|
registerCommands(commands: CommandRegistry): void;
|
|
21
21
|
protected copyContentsToJSON(editor: MergeEditor): void;
|
|
22
22
|
protected openContentsFromJSON(): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"merge-editor-dev-contribution.d.ts","sourceRoot":"","sources":["../../../src/browser/merge-editor/merge-editor-dev-contribution.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,OAAO,EAAE,mBAAmB,EAAE,eAAe,EAAsC,iBAAiB,EAAE,cAAc,EAAO,iBAAiB,EAAO,MAAM,aAAa,CAAC;AAChL,OAAO,EAAE,gBAAgB,EAAQ,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAChF,OAAO,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAC;AAC7E,OAAO,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAC3E,OAAO,EAAE,WAAW,EAA4C,MAAM,
|
|
1
|
+
{"version":3,"file":"merge-editor-dev-contribution.d.ts","sourceRoot":"","sources":["../../../src/browser/merge-editor/merge-editor-dev-contribution.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,OAAO,EAAE,mBAAmB,EAAE,eAAe,EAAsC,iBAAiB,EAAE,cAAc,EAAO,iBAAiB,EAAO,MAAM,aAAa,CAAC;AAChL,OAAO,EAAE,gBAAgB,EAAQ,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAChF,OAAO,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAC;AAC7E,OAAO,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAC3E,OAAO,EAAE,WAAW,EAA4C,MAAM,mBAAmB,CAAC;AAE1F,yBAAiB,sBAAsB,CAAC;IAC7B,MAAM,yBAAyB,uBAAuB,CAAC;IACvD,MAAM,qBAAqB,SAIhC,CAAC;IACI,MAAM,uBAAuB,SAIlC,CAAC;CACN;AAED,qBACa,0BAA2B,YAAW,mBAAmB;IAGlE,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,gBAAgB,CAAC;IAG3C,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAGtD,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAC;IAGlD,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAGxD,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAC;IAGpD,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAGxD,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;IAEhD,SAAS,CAAC,cAAc,CAAC,MAAM,+DAA2B,GAAG,WAAW,GAAG,SAAS;IAIpF,gBAAgB,CAAC,QAAQ,EAAE,eAAe,GAAG,IAAI;IAgBjD,SAAS,CAAC,kBAAkB,CAAC,MAAM,EAAE,WAAW,GAAG,IAAI;cAavC,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC;CAmDxD;AAED,MAAM,WAAW,mBAAmB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,CAAC;CACvB"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
// *****************************************************************************
|
|
3
2
|
// Copyright (C) 2025 1C-Soft LLC and others.
|
|
4
3
|
//
|
|
@@ -14,32 +13,30 @@
|
|
|
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
|
-
const merge_editor_1 = require("./merge-editor");
|
|
26
|
-
var MergeEditorDevCommands;
|
|
16
|
+
import { __decorate } from "tslib";
|
|
17
|
+
import { inject, injectable } from '@theia/core/shared/inversify';
|
|
18
|
+
import { Command, DisposableCollection, generateUuid, InMemoryResources, MessageService, nls, QuickInputService, URI } from '@theia/core';
|
|
19
|
+
import { ApplicationShell, open, OpenerService } from '@theia/core/lib/browser';
|
|
20
|
+
import { ClipboardService } from '@theia/core/lib/browser/clipboard-service';
|
|
21
|
+
import { LanguageService } from '@theia/core/lib/browser/language-service';
|
|
22
|
+
import { MergeEditor, MergeEditorUri } from './merge-editor.js';
|
|
23
|
+
export var MergeEditorDevCommands;
|
|
27
24
|
(function (MergeEditorDevCommands) {
|
|
28
25
|
MergeEditorDevCommands.MERGE_EDITOR_DEV_CATEGORY = 'Merge Editor (Dev)';
|
|
29
|
-
MergeEditorDevCommands.COPY_CONTENTS_TO_JSON =
|
|
26
|
+
MergeEditorDevCommands.COPY_CONTENTS_TO_JSON = Command.toDefaultLocalizedCommand({
|
|
30
27
|
id: 'mergeEditor.dev.copyContentsToJSON',
|
|
31
28
|
label: 'Copy Merge Editor State as JSON',
|
|
32
29
|
category: MergeEditorDevCommands.MERGE_EDITOR_DEV_CATEGORY
|
|
33
30
|
});
|
|
34
|
-
MergeEditorDevCommands.OPEN_CONTENTS_FROM_JSON =
|
|
31
|
+
MergeEditorDevCommands.OPEN_CONTENTS_FROM_JSON = Command.toDefaultLocalizedCommand({
|
|
35
32
|
id: 'mergeEditor.dev.openContentsFromJSON',
|
|
36
33
|
label: 'Open Merge Editor State from JSON',
|
|
37
34
|
category: MergeEditorDevCommands.MERGE_EDITOR_DEV_CATEGORY
|
|
38
35
|
});
|
|
39
|
-
})(MergeEditorDevCommands || (
|
|
36
|
+
})(MergeEditorDevCommands || (MergeEditorDevCommands = {}));
|
|
40
37
|
let MergeEditorDevContribution = class MergeEditorDevContribution {
|
|
41
38
|
getMergeEditor(widget = this.shell.currentWidget) {
|
|
42
|
-
return widget instanceof
|
|
39
|
+
return widget instanceof MergeEditor ? widget : (widget?.parent ? this.getMergeEditor(widget.parent) : undefined);
|
|
43
40
|
}
|
|
44
41
|
registerCommands(commands) {
|
|
45
42
|
commands.registerCommand(MergeEditorDevCommands.COPY_CONTENTS_TO_JSON, {
|
|
@@ -66,11 +63,11 @@ let MergeEditorDevContribution = class MergeEditorDevContribution {
|
|
|
66
63
|
languageId: model.resultDocument.getLanguageId()
|
|
67
64
|
};
|
|
68
65
|
this.clipboardService.writeText(JSON.stringify(editorContents, undefined, 2));
|
|
69
|
-
this.messageService.info(
|
|
66
|
+
this.messageService.info(nls.localizeByDefault('Successfully copied merge editor state'));
|
|
70
67
|
}
|
|
71
68
|
async openContentsFromJSON() {
|
|
72
69
|
const inputText = await this.quickInputService.input({
|
|
73
|
-
prompt:
|
|
70
|
+
prompt: nls.localizeByDefault('Enter JSON'),
|
|
74
71
|
value: await this.clipboardService.readText()
|
|
75
72
|
});
|
|
76
73
|
if (!inputText) {
|
|
@@ -84,18 +81,18 @@ let MergeEditorDevContribution = class MergeEditorDevContribution {
|
|
|
84
81
|
languageId: 'plaintext'
|
|
85
82
|
}, JSON.parse(inputText));
|
|
86
83
|
const extension = Array.from(this.languageService.getLanguage(languageId)?.extensions ?? [''])[0];
|
|
87
|
-
const parentUri = new
|
|
84
|
+
const parentUri = new URI('merge-editor-dev://' + generateUuid());
|
|
88
85
|
const baseUri = parentUri.resolve('base' + extension);
|
|
89
86
|
const side1Uri = parentUri.resolve('side1' + extension);
|
|
90
87
|
const side2Uri = parentUri.resolve('side2' + extension);
|
|
91
88
|
const resultUri = parentUri.resolve('result' + extension);
|
|
92
|
-
const toDispose = new
|
|
89
|
+
const toDispose = new DisposableCollection();
|
|
93
90
|
try {
|
|
94
91
|
toDispose.push(this.inMemoryResources.add(baseUri, base));
|
|
95
92
|
toDispose.push(this.inMemoryResources.add(side1Uri, input1));
|
|
96
93
|
toDispose.push(this.inMemoryResources.add(side2Uri, input2));
|
|
97
94
|
toDispose.push(this.inMemoryResources.add(resultUri, result));
|
|
98
|
-
const uri =
|
|
95
|
+
const uri = MergeEditorUri.encode({ baseUri, side1Uri, side2Uri, resultUri });
|
|
99
96
|
const options = {
|
|
100
97
|
widgetState: {
|
|
101
98
|
side1State: {
|
|
@@ -108,43 +105,36 @@ let MergeEditorDevContribution = class MergeEditorDevContribution {
|
|
|
108
105
|
}
|
|
109
106
|
}
|
|
110
107
|
};
|
|
111
|
-
await
|
|
108
|
+
await open(this.openerService, uri, options);
|
|
112
109
|
}
|
|
113
110
|
finally {
|
|
114
111
|
toDispose.dispose();
|
|
115
112
|
}
|
|
116
113
|
}
|
|
117
114
|
};
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
(0, inversify_1.inject)(browser_1.ApplicationShell),
|
|
121
|
-
tslib_1.__metadata("design:type", browser_1.ApplicationShell)
|
|
115
|
+
__decorate([
|
|
116
|
+
inject(ApplicationShell)
|
|
122
117
|
], MergeEditorDevContribution.prototype, "shell", void 0);
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
tslib_1.__metadata("design:type", Object)
|
|
118
|
+
__decorate([
|
|
119
|
+
inject(ClipboardService)
|
|
126
120
|
], MergeEditorDevContribution.prototype, "clipboardService", void 0);
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
tslib_1.__metadata("design:type", core_1.MessageService)
|
|
121
|
+
__decorate([
|
|
122
|
+
inject(MessageService)
|
|
130
123
|
], MergeEditorDevContribution.prototype, "messageService", void 0);
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
tslib_1.__metadata("design:type", Object)
|
|
124
|
+
__decorate([
|
|
125
|
+
inject(QuickInputService)
|
|
134
126
|
], MergeEditorDevContribution.prototype, "quickInputService", void 0);
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
tslib_1.__metadata("design:type", language_service_1.LanguageService)
|
|
127
|
+
__decorate([
|
|
128
|
+
inject(LanguageService)
|
|
138
129
|
], MergeEditorDevContribution.prototype, "languageService", void 0);
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
tslib_1.__metadata("design:type", core_1.InMemoryResources)
|
|
130
|
+
__decorate([
|
|
131
|
+
inject(InMemoryResources)
|
|
142
132
|
], MergeEditorDevContribution.prototype, "inMemoryResources", void 0);
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
tslib_1.__metadata("design:type", Object)
|
|
133
|
+
__decorate([
|
|
134
|
+
inject(OpenerService)
|
|
146
135
|
], MergeEditorDevContribution.prototype, "openerService", void 0);
|
|
147
|
-
|
|
148
|
-
|
|
136
|
+
MergeEditorDevContribution = __decorate([
|
|
137
|
+
injectable()
|
|
149
138
|
], MergeEditorDevContribution);
|
|
139
|
+
export { MergeEditorDevContribution };
|
|
150
140
|
//# sourceMappingURL=merge-editor-dev-contribution.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"merge-editor-dev-contribution.js","sourceRoot":"","sources":["../../../src/browser/merge-editor/merge-editor-dev-contribution.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"merge-editor-dev-contribution.js","sourceRoot":"","sources":["../../../src/browser/merge-editor/merge-editor-dev-contribution.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@ import '../../../src/browser/style/merge-editor.css';
|
|
|
2
2
|
import { interfaces } from '@theia/core/shared/inversify';
|
|
3
3
|
import { DisposableCollection, URI } from '@theia/core';
|
|
4
4
|
import { EditorManager, EditorWidget } from '@theia/editor/lib/browser';
|
|
5
|
-
import { MergeEditor, MergeUris } from './merge-editor';
|
|
5
|
+
import { MergeEditor, MergeUris } from './merge-editor.js';
|
|
6
6
|
export declare function bindMergeEditor(bind: interfaces.Bind): void;
|
|
7
7
|
export declare class MergeEditorFactory {
|
|
8
8
|
protected readonly container: interfaces.Container;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"merge-editor-module.d.ts","sourceRoot":"","sources":["../../../src/browser/merge-editor/merge-editor-module.ts"],"names":[],"mappings":"AAgBA,OAAO,6CAA6C,CAAC;AAErD,OAAO,EAAa,UAAU,EAAE,MAAM,8BAA8B,CAAC;AACrE,OAAO,EAAuB,oBAAoB,EAAwD,GAAG,EAAE,MAAM,aAAa,CAAC;AAInI,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAMxE,OAAO,EAAE,WAAW,EAA+D,SAAS,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"merge-editor-module.d.ts","sourceRoot":"","sources":["../../../src/browser/merge-editor/merge-editor-module.ts"],"names":[],"mappings":"AAgBA,OAAO,6CAA6C,CAAC;AAErD,OAAO,EAAa,UAAU,EAAE,MAAM,8BAA8B,CAAC;AACrE,OAAO,EAAuB,oBAAoB,EAAwD,GAAG,EAAE,MAAM,aAAa,CAAC;AAInI,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAMxE,OAAO,EAAE,WAAW,EAA+D,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAIxH,wBAAgB,eAAe,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,GAAG,IAAI,CAmB3D;AAED,qBAAa,kBAAkB;IAGvB,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,UAAU,CAAC,SAAS;IAClD,SAAS,CAAC,QAAQ,CAAC,aAAa;gBADb,SAAS,EAAE,UAAU,CAAC,SAAS,EAC/B,aAAa,gBAA+B;IAG7D,iBAAiB,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE,SAAS,GAAG,OAAO,CAAC,WAAW,CAAC;IA+BpG;;;;OAIG;cACa,+BAA+B,CAAC,WAAW,EAAE,GAAG,EAAE,WAAW,EAAE,oBAAoB,GAAG,OAAO,CAAC,YAAY,CAAC;cAK3G,kBAAkB,CAAC,GAAG,EAAE,GAAG,EAAE,WAAW,EAAE,oBAAoB,GAAG,OAAO,CAAC,YAAY,CAAC;IAetG,SAAS,CAAC,0BAA0B,CAAC,EACjC,gBAAgB,EAChB,iBAAiB,EACjB,iBAAiB,EACjB,kBAAkB,EAClB,OAAO,EACV,EAAE,yBAAyB,GAAG,UAAU,CAAC,SAAS;CAoBtD;AAED,MAAM,WAAW,yBAAyB;IACtC,gBAAgB,EAAE,YAAY,CAAC;IAC/B,iBAAiB,EAAE,YAAY,CAAC;IAChC,iBAAiB,EAAE,YAAY,CAAC;IAChC,kBAAkB,EAAE,YAAY,CAAC;IACjC,OAAO,CAAC,EAAE;QACN,WAAW,CAAC,EAAE,OAAO,CAAC;KACzB,CAAA;CACJ"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
// *****************************************************************************
|
|
3
2
|
// Copyright (C) 2025 1C-Soft LLC and others.
|
|
4
3
|
//
|
|
@@ -14,47 +13,44 @@
|
|
|
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
|
-
bind(merge_editor_1.MergeEditorSettings).toSelf().inSingletonScope();
|
|
37
|
-
bind(diff_spacers_1.DiffSpacerService).toSelf().inSingletonScope();
|
|
38
|
-
bind(merge_editor_view_zones_1.MergeEditorViewZoneComputer).toSelf().inSingletonScope();
|
|
16
|
+
import '../../../src/browser/style/merge-editor.css';
|
|
17
|
+
import { Container } from '@theia/core/shared/inversify';
|
|
18
|
+
import { CommandContribution, DisposableCollection, MEMORY_TEXT_READONLY, MenuContribution, generateUuid, URI } from '@theia/core';
|
|
19
|
+
import { TabBarToolbarContribution } from '@theia/core/lib/browser/shell/tab-bar-toolbar';
|
|
20
|
+
import { FrontendApplicationContribution, KeybindingContribution, OpenHandler, WidgetFactory } from '@theia/core/lib/browser';
|
|
21
|
+
import { ColorContribution } from '@theia/core/lib/browser/color-application-contribution';
|
|
22
|
+
import { EditorManager, EditorWidget } from '@theia/editor/lib/browser';
|
|
23
|
+
import { MonacoEditor } from '@theia/monaco/lib/browser/monaco-editor';
|
|
24
|
+
import { MergeEditorModel, MergeEditorModelProps } from './model/merge-editor-model.js';
|
|
25
|
+
import { MergeEditorBasePane, MergeEditorPaneHeader, MergeEditorResultPane, MergeEditorSide1Pane, MergeEditorSide2Pane } from './view/merge-editor-panes/index.js';
|
|
26
|
+
import { DiffSpacerService } from './view/diff-spacers.js';
|
|
27
|
+
import { MergeEditorViewZoneComputer } from './view/merge-editor-view-zones.js';
|
|
28
|
+
import { MergeEditor, MergeEditorOpenHandler, MergeEditorSettings, MergeEditorUri } from './merge-editor.js';
|
|
29
|
+
import { MergeEditorContribution } from './merge-editor-contribution.js';
|
|
30
|
+
import { MergeEditorDevContribution } from './merge-editor-dev-contribution.js';
|
|
31
|
+
export function bindMergeEditor(bind) {
|
|
32
|
+
bind(MergeEditorSettings).toSelf().inSingletonScope();
|
|
33
|
+
bind(DiffSpacerService).toSelf().inSingletonScope();
|
|
34
|
+
bind(MergeEditorViewZoneComputer).toSelf().inSingletonScope();
|
|
39
35
|
bind(MergeEditorFactory).toDynamicValue(ctx => new MergeEditorFactory(ctx.container)).inSingletonScope();
|
|
40
|
-
bind(
|
|
41
|
-
id:
|
|
42
|
-
createWidget: (options) => ctx.container.get(MergeEditorFactory).createMergeEditor(
|
|
36
|
+
bind(WidgetFactory).toDynamicValue(ctx => ({
|
|
37
|
+
id: MergeEditorOpenHandler.ID,
|
|
38
|
+
createWidget: (options) => ctx.container.get(MergeEditorFactory).createMergeEditor(MergeEditorUri.decode(new URI(options.uri)))
|
|
43
39
|
})).inSingletonScope();
|
|
44
|
-
bind(
|
|
45
|
-
bind(
|
|
46
|
-
bind(
|
|
47
|
-
[
|
|
48
|
-
bind(
|
|
49
|
-
bind(
|
|
40
|
+
bind(MergeEditorOpenHandler).toSelf().inSingletonScope();
|
|
41
|
+
bind(OpenHandler).toService(MergeEditorOpenHandler);
|
|
42
|
+
bind(MergeEditorContribution).toSelf().inSingletonScope();
|
|
43
|
+
[FrontendApplicationContribution, CommandContribution, MenuContribution, TabBarToolbarContribution, KeybindingContribution, ColorContribution].forEach(serviceIdentifier => bind(serviceIdentifier).toService(MergeEditorContribution));
|
|
44
|
+
bind(MergeEditorDevContribution).toSelf().inSingletonScope();
|
|
45
|
+
bind(CommandContribution).toService(MergeEditorDevContribution);
|
|
50
46
|
}
|
|
51
|
-
class MergeEditorFactory {
|
|
52
|
-
constructor(container, editorManager = container.get(
|
|
47
|
+
export class MergeEditorFactory {
|
|
48
|
+
constructor(container, editorManager = container.get(EditorManager)) {
|
|
53
49
|
this.container = container;
|
|
54
50
|
this.editorManager = editorManager;
|
|
55
51
|
}
|
|
56
52
|
async createMergeEditor({ baseUri, side1Uri, side2Uri, resultUri }) {
|
|
57
|
-
const toDisposeOnError = new
|
|
53
|
+
const toDisposeOnError = new DisposableCollection();
|
|
58
54
|
const createEditorWidget = (uri) => this.createEditorWidget(uri, toDisposeOnError);
|
|
59
55
|
try {
|
|
60
56
|
const [baseEditorWidget, side1EditorWidget, side2EditorWidget, resultEditorWidget] = await Promise.all([
|
|
@@ -67,7 +63,7 @@ class MergeEditorFactory {
|
|
|
67
63
|
createEditorWidget(resultUri)
|
|
68
64
|
]);
|
|
69
65
|
resultEditorWidget.navigationHistorySupport = true;
|
|
70
|
-
const resultDocument =
|
|
66
|
+
const resultDocument = MonacoEditor.get(resultEditorWidget).document;
|
|
71
67
|
const hasConflictMarkers = resultDocument.textEditorModel.getLinesContent().some(lineContent => lineContent.startsWith('<<<<<<<'));
|
|
72
68
|
return this.createMergeEditorContainer({
|
|
73
69
|
baseEditorWidget,
|
|
@@ -77,7 +73,7 @@ class MergeEditorFactory {
|
|
|
77
73
|
options: {
|
|
78
74
|
resetResult: hasConflictMarkers
|
|
79
75
|
}
|
|
80
|
-
}).get(
|
|
76
|
+
}).get(MergeEditor);
|
|
81
77
|
}
|
|
82
78
|
catch (error) {
|
|
83
79
|
toDisposeOnError.dispose();
|
|
@@ -90,13 +86,13 @@ class MergeEditorFactory {
|
|
|
90
86
|
* merge conflicts where there is no common ancestor (git index stage 1).
|
|
91
87
|
*/
|
|
92
88
|
async createEmptyFallbackEditorWidget(originalUri, disposables) {
|
|
93
|
-
const fallbackUri = new
|
|
89
|
+
const fallbackUri = new URI().withScheme(MEMORY_TEXT_READONLY).withPath(`${generateUuid()}/${originalUri.path.base}`);
|
|
94
90
|
return this.createEditorWidget(fallbackUri, disposables);
|
|
95
91
|
}
|
|
96
92
|
async createEditorWidget(uri, disposables) {
|
|
97
93
|
const editorWidget = await this.editorManager.createByUri(uri);
|
|
98
94
|
disposables.push(editorWidget);
|
|
99
|
-
const editor =
|
|
95
|
+
const editor = MonacoEditor.get(editorWidget);
|
|
100
96
|
if (!editor) {
|
|
101
97
|
throw new Error('The merge editor only supports Monaco editors as its parts');
|
|
102
98
|
}
|
|
@@ -108,23 +104,22 @@ class MergeEditorFactory {
|
|
|
108
104
|
return editorWidget;
|
|
109
105
|
}
|
|
110
106
|
createMergeEditorContainer({ baseEditorWidget, side1EditorWidget, side2EditorWidget, resultEditorWidget, options }) {
|
|
111
|
-
const child = new
|
|
107
|
+
const child = new Container({ defaultScope: 'Singleton' });
|
|
112
108
|
child.parent = this.container;
|
|
113
|
-
const [baseEditor, side1Editor, side2Editor, resultEditor] = [baseEditorWidget, side1EditorWidget, side2EditorWidget, resultEditorWidget].map(editorWidget =>
|
|
114
|
-
child.bind(
|
|
115
|
-
child.bind(
|
|
116
|
-
child.bind(
|
|
117
|
-
child.bind(
|
|
118
|
-
child.bind(
|
|
119
|
-
child.bind(
|
|
120
|
-
child.bind(
|
|
121
|
-
child.bind(
|
|
122
|
-
child.bind(
|
|
123
|
-
child.bind(
|
|
124
|
-
child.bind(
|
|
125
|
-
child.bind(
|
|
109
|
+
const [baseEditor, side1Editor, side2Editor, resultEditor] = [baseEditorWidget, side1EditorWidget, side2EditorWidget, resultEditorWidget].map(editorWidget => MonacoEditor.get(editorWidget));
|
|
110
|
+
child.bind(MergeEditorModelProps).toConstantValue({ baseEditor, side1Editor, side2Editor, resultEditor, options });
|
|
111
|
+
child.bind(MergeEditorModel).toSelf();
|
|
112
|
+
child.bind(MergeEditorPaneHeader).toSelf().inTransientScope();
|
|
113
|
+
child.bind(MergeEditorBasePane).toSelf();
|
|
114
|
+
child.bind(MergeEditorSide1Pane).toSelf();
|
|
115
|
+
child.bind(MergeEditorSide2Pane).toSelf();
|
|
116
|
+
child.bind(MergeEditorResultPane).toSelf();
|
|
117
|
+
child.bind(EditorWidget).toConstantValue(baseEditorWidget).whenInjectedInto(MergeEditorBasePane);
|
|
118
|
+
child.bind(EditorWidget).toConstantValue(side1EditorWidget).whenInjectedInto(MergeEditorSide1Pane);
|
|
119
|
+
child.bind(EditorWidget).toConstantValue(side2EditorWidget).whenInjectedInto(MergeEditorSide2Pane);
|
|
120
|
+
child.bind(EditorWidget).toConstantValue(resultEditorWidget).whenInjectedInto(MergeEditorResultPane);
|
|
121
|
+
child.bind(MergeEditor).toSelf();
|
|
126
122
|
return child;
|
|
127
123
|
}
|
|
128
124
|
}
|
|
129
|
-
exports.MergeEditorFactory = MergeEditorFactory;
|
|
130
125
|
//# sourceMappingURL=merge-editor-module.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"merge-editor-module.js","sourceRoot":"","sources":["../../../src/browser/merge-editor/merge-editor-module.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"merge-editor-module.js","sourceRoot":"","sources":["../../../src/browser/merge-editor/merge-editor-module.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,11 +2,11 @@ import { Disposable, URI } from '@theia/core';
|
|
|
2
2
|
import { ApplicationShell, BaseWidget, LabelProvider, Message, Navigatable, NavigatableWidgetOpenHandler, Saveable, SaveableSource, SplitPanel, StatefulWidget, StorageService, Widget, WidgetOpenerOptions } from '@theia/core/lib/browser';
|
|
3
3
|
import { Observable } from '@theia/core/lib/common/observable';
|
|
4
4
|
import { Range } from '@theia/editor/lib/browser';
|
|
5
|
-
import { MergeRange } from './model/merge-range';
|
|
6
|
-
import { MergeEditorModel } from './model/merge-editor-model';
|
|
7
|
-
import { MergeEditorBasePane, MergeEditorPane, MergeEditorResultPane, MergeEditorSide1Pane, MergeEditorSide2Pane } from './view/merge-editor-panes';
|
|
8
|
-
import { MergeEditorViewZoneComputer } from './view/merge-editor-view-zones';
|
|
9
|
-
import { MergeEditorScrollSync } from './view/merge-editor-scroll-sync';
|
|
5
|
+
import { MergeRange } from './model/merge-range.js';
|
|
6
|
+
import { MergeEditorModel } from './model/merge-editor-model.js';
|
|
7
|
+
import { MergeEditorBasePane, MergeEditorPane, MergeEditorResultPane, MergeEditorSide1Pane, MergeEditorSide2Pane } from './view/merge-editor-panes/index.js';
|
|
8
|
+
import { MergeEditorViewZoneComputer } from './view/merge-editor-view-zones.js';
|
|
9
|
+
import { MergeEditorScrollSync } from './view/merge-editor-scroll-sync.js';
|
|
10
10
|
export interface MergeUris {
|
|
11
11
|
baseUri: URI;
|
|
12
12
|
side1Uri: URI;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"merge-editor.d.ts","sourceRoot":"","sources":["../../../src/browser/merge-editor/merge-editor.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAc,UAAU,EAA6B,GAAG,EAAE,MAAM,aAAa,CAAC;AACrF,OAAO,EACH,gBAAgB,EAAE,UAAU,EAAgB,aAAa,EAAE,OAAO,EAAE,WAAW,EAAE,4BAA4B,EAC7G,QAAQ,EAAE,cAAc,EAAE,UAAU,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,EAAE,mBAAmB,EACpG,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAA8B,UAAU,EAAsB,MAAM,mCAAmC,CAAC;AAC/G,OAAO,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"merge-editor.d.ts","sourceRoot":"","sources":["../../../src/browser/merge-editor/merge-editor.ts"],"names":[],"mappings":"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"}
|