@theia/scm 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/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 -17
- 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 -16
- package/lib/browser/dirty-diff/diff-computer.js.map +1 -1
- package/lib/browser/dirty-diff/diff-computer.spec.js +26 -28
- 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.js +13 -16
- package/lib/browser/multi-diff-editor/multi-diff-editor-module.js.map +1 -1
- package/lib/browser/multi-diff-editor/multi-diff-editor-uri.js +7 -10
- package/lib/browser/multi-diff-editor/multi-diff-editor-uri.js.map +1 -1
- package/lib/browser/multi-diff-editor/multi-diff-editor-widget-factory.d.ts +2 -2
- package/lib/browser/multi-diff-editor/multi-diff-editor-widget-factory.d.ts.map +1 -1
- package/lib/browser/multi-diff-editor/multi-diff-editor-widget-factory.js +17 -21
- package/lib/browser/multi-diff-editor/multi-diff-editor-widget-factory.js.map +1 -1
- package/lib/browser/multi-diff-editor/multi-diff-editor-widget.spec.js +226 -229
- package/lib/browser/multi-diff-editor/multi-diff-editor-widget.spec.js.map +1 -1
- package/lib/browser/multi-diff-editor/multi-diff-editor.d.ts +1 -1
- package/lib/browser/multi-diff-editor/multi-diff-editor.d.ts.map +1 -1
- package/lib/browser/multi-diff-editor/multi-diff-editor.js +70 -81
- package/lib/browser/multi-diff-editor/multi-diff-editor.js.map +1 -1
- package/lib/browser/multi-diff-editor/multi-diff-editor.spec.js +66 -68
- package/lib/browser/multi-diff-editor/multi-diff-editor.spec.js.map +1 -1
- 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 -29
- 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.js +99 -103
- 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 -43
- package/lib/browser/scm-history-graph-widget.spec.js.map +1 -1
- package/lib/browser/scm-input.js +11 -16
- 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.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 -89
- 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 +16 -7
- 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 +3 -3
- 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 +2 -2
- package/src/browser/multi-diff-editor/multi-diff-editor-widget-factory.ts +2 -2
- package/src/browser/multi-diff-editor/multi-diff-editor-widget.spec.ts +3 -3
- package/src/browser/multi-diff-editor/multi-diff-editor.spec.ts +1 -1
- package/src/browser/multi-diff-editor/multi-diff-editor.ts +1 -1
- 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 +23 -23
- 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-layout-migrations.ts +1 -1
- 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/node/scm-backend-module.ts +1 -1
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { MergeRange, MergeRangeAcceptedState, MergeSide } from '../model/merge-range';
|
|
2
|
-
import { MergeEditor } from '../merge-editor';
|
|
1
|
+
import { MergeRange, MergeRangeAcceptedState, MergeSide } from '../model/merge-range.js';
|
|
2
|
+
import { MergeEditor } from '../merge-editor.js';
|
|
3
3
|
export interface MergeRangeAction {
|
|
4
4
|
readonly text: string;
|
|
5
5
|
readonly tooltip?: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"merge-range-actions.d.ts","sourceRoot":"","sources":["../../../../src/browser/merge-editor/view/merge-range-actions.ts"],"names":[],"mappings":"AAsBA,OAAO,EAAE,UAAU,EAAE,uBAAuB,EAAE,SAAS,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"merge-range-actions.d.ts","sourceRoot":"","sources":["../../../../src/browser/merge-editor/view/merge-range-actions.ts"],"names":[],"mappings":"AAsBA,OAAO,EAAE,UAAU,EAAE,uBAAuB,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACzF,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAGjD,MAAM,WAAW,gBAAgB;IAC7B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAC1B,GAAG,CAAC,IAAI,OAAO,CAAC;CACnB;AAED,qBAAa,iBAAiB;IAatB,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,WAAW;IAC3C,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,UAAU;IAZ7C,QAAQ,CAAC,sBAAsB,4FAA6D;IAC5F,QAAQ,CAAC,sBAAsB,4FAA6D;IAC5F,QAAQ,CAAC,uBAAuB,4FAA2D;IAE3F,SAAS,CAAC,QAAQ,CAAC,wBAAwB,wEAA2H;IACtK,IAAI,cAAc,IAAI,OAAO,CAAgD;IAE7E,SAAS,CAAC,QAAQ,CAAC,0BAA0B,wEAAiF;IAC9H,IAAI,gBAAgB,IAAI,OAAO,CAAkD;gBAG1D,WAAW,EAAE,WAAW,EACxB,UAAU,EAAE,UAAU;IAG7C,SAAS,CAAC,iBAAiB,CAAC,IAAI,EAAE,SAAS,GAAG,SAAS,gBAAgB,EAAE;IAmCzE,SAAS,CAAC,gBAAgB,IAAI,SAAS,gBAAgB,EAAE;cA0EzC,4BAA4B,CAAC,UAAU,EAAE,UAAU,EAAE,KAAK,EAAE,uBAAuB,GAAG,OAAO,CAAC,IAAI,CAAC;cAUnG,uBAAuB,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;CA2BjF"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
// *****************************************************************************
|
|
3
2
|
// Copyright (C) 2025 1C-Soft LLC and others.
|
|
4
3
|
//
|
|
@@ -19,22 +18,20 @@
|
|
|
19
18
|
* Licensed under the MIT License. See License.txt in the project root for license information.
|
|
20
19
|
*--------------------------------------------------------------------------------------------*/
|
|
21
20
|
// copied and modified from https://github.com/microsoft/vscode/blob/1.96.3/src/vs/workbench/contrib/mergeEditor/browser/view/conflictActions.ts
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
const core_1 = require("@theia/core");
|
|
27
|
-
class MergeRangeActions {
|
|
21
|
+
import { DerivedObservable, ObservableUtils } from '@theia/core/lib/common/observable';
|
|
22
|
+
import { MergeRangeAcceptedState } from '../model/merge-range.js';
|
|
23
|
+
import { nls } from '@theia/core';
|
|
24
|
+
export class MergeRangeActions {
|
|
28
25
|
get hasSideActions() { return this.hasSideActionsObservable.get(); }
|
|
29
26
|
get hasResultActions() { return this.hasResultActionsObservable.get(); }
|
|
30
27
|
constructor(mergeEditor, mergeRange) {
|
|
31
28
|
this.mergeEditor = mergeEditor;
|
|
32
29
|
this.mergeRange = mergeRange;
|
|
33
|
-
this.side1ActionsObservable =
|
|
34
|
-
this.side2ActionsObservable =
|
|
35
|
-
this.resultActionsObservable =
|
|
36
|
-
this.hasSideActionsObservable =
|
|
37
|
-
this.hasResultActionsObservable =
|
|
30
|
+
this.side1ActionsObservable = DerivedObservable.create(() => this.getActionsForSide(1));
|
|
31
|
+
this.side2ActionsObservable = DerivedObservable.create(() => this.getActionsForSide(2));
|
|
32
|
+
this.resultActionsObservable = DerivedObservable.create(() => this.getResultActions());
|
|
33
|
+
this.hasSideActionsObservable = DerivedObservable.create(() => this.side1ActionsObservable.get().length + this.side2ActionsObservable.get().length > 0);
|
|
34
|
+
this.hasResultActionsObservable = DerivedObservable.create(() => this.resultActionsObservable.get().length > 0);
|
|
38
35
|
}
|
|
39
36
|
getActionsForSide(side) {
|
|
40
37
|
const { mergeEditor, mergeRange } = this;
|
|
@@ -48,17 +45,17 @@ class MergeRangeActions {
|
|
|
48
45
|
if (state !== 'Unrecognized' && !state.includes('Side' + side) && mergeRange.getChanges(side).length &&
|
|
49
46
|
(state === 'Base' || !(mergeRange.isEqualChange || mergeRange.getModifiedRange(side).isEmpty))) {
|
|
50
47
|
result.push({
|
|
51
|
-
text:
|
|
52
|
-
tooltip:
|
|
53
|
-
run: () => this.applyMergeRangeAcceptedState(mergeRange,
|
|
48
|
+
text: nls.localizeByDefault('Accept {0}', sideTitle),
|
|
49
|
+
tooltip: nls.localizeByDefault('Accept {0} in the result document.', sideTitle),
|
|
50
|
+
run: () => this.applyMergeRangeAcceptedState(mergeRange, MergeRangeAcceptedState.addSide(state, side))
|
|
54
51
|
});
|
|
55
52
|
if (mergeRange.canBeSmartCombined(side)) {
|
|
56
53
|
result.push({
|
|
57
54
|
text: mergeRange.isSmartCombinationOrderRelevant ?
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
tooltip:
|
|
61
|
-
run: () => this.applyMergeRangeAcceptedState(mergeRange,
|
|
55
|
+
nls.localizeByDefault('Accept Combination ({0} First)', sideTitle) :
|
|
56
|
+
nls.localizeByDefault('Accept Combination'),
|
|
57
|
+
tooltip: nls.localizeByDefault('Accept an automatic combination of both sides in the result document.'),
|
|
58
|
+
run: () => this.applyMergeRangeAcceptedState(mergeRange, MergeRangeAcceptedState.addSide(side === 1 ? 'Side1' : 'Side2', side === 1 ? 2 : 1, { smartCombination: true }))
|
|
62
59
|
});
|
|
63
60
|
}
|
|
64
61
|
}
|
|
@@ -74,23 +71,23 @@ class MergeRangeActions {
|
|
|
74
71
|
const state = model.getMergeRangeResultState(mergeRange);
|
|
75
72
|
if (state === 'Unrecognized') {
|
|
76
73
|
result.push({
|
|
77
|
-
text:
|
|
78
|
-
tooltip:
|
|
74
|
+
text: nls.localizeByDefault('Manual Resolution'),
|
|
75
|
+
tooltip: nls.localizeByDefault('This conflict has been resolved manually.')
|
|
79
76
|
});
|
|
80
77
|
result.push({
|
|
81
|
-
text:
|
|
82
|
-
tooltip:
|
|
78
|
+
text: nls.localizeByDefault('Reset to base'),
|
|
79
|
+
tooltip: nls.localizeByDefault('Reset this conflict to the common ancestor of both the right and left changes.'),
|
|
83
80
|
run: () => this.applyMergeRangeAcceptedState(mergeRange, 'Base')
|
|
84
81
|
});
|
|
85
82
|
}
|
|
86
83
|
else if (state === 'Base') {
|
|
87
84
|
result.push({
|
|
88
|
-
text:
|
|
89
|
-
tooltip:
|
|
85
|
+
text: nls.localizeByDefault('No Changes Accepted'),
|
|
86
|
+
tooltip: nls.localizeByDefault('The current resolution of this conflict equals the common ancestor of both the right and left changes.')
|
|
90
87
|
});
|
|
91
88
|
if (!model.isMergeRangeHandled(mergeRange)) {
|
|
92
89
|
result.push({
|
|
93
|
-
text:
|
|
90
|
+
text: nls.localizeByDefault('Mark as Handled'),
|
|
94
91
|
run: () => this.markMergeRangeAsHandled(mergeRange)
|
|
95
92
|
});
|
|
96
93
|
}
|
|
@@ -100,8 +97,8 @@ class MergeRangeActions {
|
|
|
100
97
|
text: side1Title + ' = ' + side2Title
|
|
101
98
|
});
|
|
102
99
|
result.push({
|
|
103
|
-
text:
|
|
104
|
-
tooltip:
|
|
100
|
+
text: nls.localizeByDefault('Reset to base'),
|
|
101
|
+
tooltip: nls.localizeByDefault('Reset this conflict to the common ancestor of both the right and left changes.'),
|
|
105
102
|
run: () => this.applyMergeRangeAcceptedState(mergeRange, 'Base')
|
|
106
103
|
});
|
|
107
104
|
}
|
|
@@ -111,17 +108,17 @@ class MergeRangeActions {
|
|
|
111
108
|
if (state.includes('Side1')) {
|
|
112
109
|
labels.push(side1Title);
|
|
113
110
|
stateToggles.push({
|
|
114
|
-
text:
|
|
115
|
-
tooltip:
|
|
116
|
-
run: () => this.applyMergeRangeAcceptedState(mergeRange,
|
|
111
|
+
text: nls.localizeByDefault('Remove {0}', side1Title),
|
|
112
|
+
tooltip: nls.localizeByDefault('Remove {0} from the result document.', side1Title),
|
|
113
|
+
run: () => this.applyMergeRangeAcceptedState(mergeRange, MergeRangeAcceptedState.removeSide(state, 1))
|
|
117
114
|
});
|
|
118
115
|
}
|
|
119
116
|
if (state.includes('Side2')) {
|
|
120
117
|
labels.push(side2Title);
|
|
121
118
|
stateToggles.push({
|
|
122
|
-
text:
|
|
123
|
-
tooltip:
|
|
124
|
-
run: () => this.applyMergeRangeAcceptedState(mergeRange,
|
|
119
|
+
text: nls.localizeByDefault('Remove {0}', side2Title),
|
|
120
|
+
tooltip: nls.localizeByDefault('Remove {0} from the result document.', side2Title),
|
|
121
|
+
run: () => this.applyMergeRangeAcceptedState(mergeRange, MergeRangeAcceptedState.removeSide(state, 2))
|
|
125
122
|
});
|
|
126
123
|
}
|
|
127
124
|
if (state.startsWith('Side2')) {
|
|
@@ -140,16 +137,16 @@ class MergeRangeActions {
|
|
|
140
137
|
async applyMergeRangeAcceptedState(mergeRange, state) {
|
|
141
138
|
const { model, resultPane } = this.mergeEditor;
|
|
142
139
|
resultPane.activate();
|
|
143
|
-
await
|
|
140
|
+
await ObservableUtils.waitForState(model.isUpToDateObservable);
|
|
144
141
|
resultPane.goToMergeRange(mergeRange, { reveal: false }); // set the cursor state that will be restored when undoing the operation
|
|
145
142
|
model.applyMergeRangeAcceptedState(mergeRange, state);
|
|
146
|
-
await
|
|
143
|
+
await ObservableUtils.waitForState(model.isUpToDateObservable);
|
|
147
144
|
resultPane.goToMergeRange(mergeRange, { reveal: false }); // set the resulting cursor state
|
|
148
145
|
}
|
|
149
146
|
async markMergeRangeAsHandled(mergeRange) {
|
|
150
147
|
const { model, resultPane } = this.mergeEditor;
|
|
151
148
|
resultPane.activate();
|
|
152
|
-
await
|
|
149
|
+
await ObservableUtils.waitForState(model.isUpToDateObservable);
|
|
153
150
|
resultPane.goToMergeRange(mergeRange, { reveal: false });
|
|
154
151
|
const { cursor } = resultPane.editor;
|
|
155
152
|
const editorRef = new WeakRef(resultPane.editor);
|
|
@@ -174,5 +171,4 @@ class MergeRangeActions {
|
|
|
174
171
|
});
|
|
175
172
|
}
|
|
176
173
|
}
|
|
177
|
-
exports.MergeRangeActions = MergeRangeActions;
|
|
178
174
|
//# sourceMappingURL=merge-range-actions.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"merge-range-actions.js","sourceRoot":"","sources":["../../../../src/browser/merge-editor/view/merge-range-actions.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"merge-range-actions.js","sourceRoot":"","sources":["../../../../src/browser/merge-editor/view/merge-range-actions.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,21 +13,19 @@
|
|
|
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
|
-
id: multi_diff_editor_1.MultiDiffEditorOpenHandler.ID,
|
|
28
|
-
createWidget: (options) => ctx.container.get(multi_diff_editor_widget_factory_1.MultiDiffEditorWidgetFactory).createMultiDiffEditor(new core_1.URI(options.uri))
|
|
16
|
+
import '../../../src/browser/style/multi-diff-editor.css';
|
|
17
|
+
import { URI } from '@theia/core';
|
|
18
|
+
import { LabelProviderContribution, OpenHandler, WidgetFactory } from '@theia/core/lib/browser';
|
|
19
|
+
import { MultiDiffEditorOpenHandler, MultiDiffEditorLabelProvider } from './multi-diff-editor.js';
|
|
20
|
+
import { MultiDiffEditorWidgetFactory } from './multi-diff-editor-widget-factory.js';
|
|
21
|
+
export function bindMultiDiffEditor(bind) {
|
|
22
|
+
bind(MultiDiffEditorWidgetFactory).toDynamicValue(ctx => new MultiDiffEditorWidgetFactory(ctx.container)).inSingletonScope();
|
|
23
|
+
bind(WidgetFactory).toDynamicValue(ctx => ({
|
|
24
|
+
id: MultiDiffEditorOpenHandler.ID,
|
|
25
|
+
createWidget: (options) => ctx.container.get(MultiDiffEditorWidgetFactory).createMultiDiffEditor(new URI(options.uri))
|
|
29
26
|
})).inSingletonScope();
|
|
30
|
-
bind(
|
|
31
|
-
bind(
|
|
32
|
-
bind(
|
|
27
|
+
bind(MultiDiffEditorOpenHandler).toSelf().inSingletonScope();
|
|
28
|
+
bind(OpenHandler).toService(MultiDiffEditorOpenHandler);
|
|
29
|
+
bind(LabelProviderContribution).to(MultiDiffEditorLabelProvider).inSingletonScope();
|
|
33
30
|
}
|
|
34
31
|
//# sourceMappingURL=multi-diff-editor-module.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"multi-diff-editor-module.js","sourceRoot":"","sources":["../../../src/browser/multi-diff-editor/multi-diff-editor-module.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"multi-diff-editor-module.js","sourceRoot":"","sources":["../../../src/browser/multi-diff-editor/multi-diff-editor-module.ts"],"names":[],"mappings":"AAAA,gFAAgF;AAChF,+CAA+C;AAC/C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;AAEhF,OAAO,kDAAkD,CAAC;AAG1D,OAAO,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AAClC,OAAO,EAAE,yBAAyB,EAA4B,WAAW,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAC1H,OAAO,EAAE,0BAA0B,EAAE,4BAA4B,EAAE,MAAM,wBAAwB,CAAC;AAClG,OAAO,EAAE,4BAA4B,EAAE,MAAM,uCAAuC,CAAC;AAErF,MAAM,UAAU,mBAAmB,CAAC,IAAqB;IACrD,IAAI,CAAC,4BAA4B,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,4BAA4B,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAC7H,IAAI,CAAC,aAAa,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACvC,EAAE,EAAE,0BAA0B,CAAC,EAAE;QACjC,YAAY,EAAE,CAAC,OAAiC,EAAE,EAAE,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,4BAA4B,CAAC,CAAC,qBAAqB,CAAC,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;KACnJ,CAAC,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAEvB,IAAI,CAAC,0BAA0B,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC7D,IAAI,CAAC,WAAW,CAAC,CAAC,SAAS,CAAC,0BAA0B,CAAC,CAAC;IACxD,IAAI,CAAC,yBAAyB,CAAC,CAAC,EAAE,CAAC,4BAA4B,CAAC,CAAC,gBAAgB,EAAE,CAAC;AACxF,CAAC"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
// *****************************************************************************
|
|
3
2
|
// Copyright (C) 2026 EclipseSource and others.
|
|
4
3
|
//
|
|
@@ -14,10 +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
|
-
const core_1 = require("@theia/core");
|
|
20
|
-
var MultiDiffEditorUri;
|
|
16
|
+
import { isObject, URI } from '@theia/core';
|
|
17
|
+
export var MultiDiffEditorUri;
|
|
21
18
|
(function (MultiDiffEditorUri) {
|
|
22
19
|
const SCHEME = 'multi-diff-editor';
|
|
23
20
|
function isMultiDiffEditorUri(uri) {
|
|
@@ -29,7 +26,7 @@ var MultiDiffEditorUri;
|
|
|
29
26
|
title: data.title,
|
|
30
27
|
resources: data.resources.map(r => [r.originalUri.toString(), r.modifiedUri.toString()])
|
|
31
28
|
});
|
|
32
|
-
return new
|
|
29
|
+
return new URI().withScheme(SCHEME).withQuery(payload);
|
|
33
30
|
}
|
|
34
31
|
MultiDiffEditorUri.encode = encode;
|
|
35
32
|
function decode(uri) {
|
|
@@ -49,14 +46,14 @@ var MultiDiffEditorUri;
|
|
|
49
46
|
return {
|
|
50
47
|
title: parsed.title,
|
|
51
48
|
resources: parsed.resources.map(pair => ({
|
|
52
|
-
originalUri: new
|
|
53
|
-
modifiedUri: new
|
|
49
|
+
originalUri: new URI(pair[0]),
|
|
50
|
+
modifiedUri: new URI(pair[1])
|
|
54
51
|
}))
|
|
55
52
|
};
|
|
56
53
|
}
|
|
57
54
|
MultiDiffEditorUri.decode = decode;
|
|
58
55
|
function isValidPayload(value) {
|
|
59
|
-
if (!
|
|
56
|
+
if (!isObject(value)) {
|
|
60
57
|
return false;
|
|
61
58
|
}
|
|
62
59
|
if (typeof value.title !== 'string' || !Array.isArray(value.resources)) {
|
|
@@ -64,5 +61,5 @@ var MultiDiffEditorUri;
|
|
|
64
61
|
}
|
|
65
62
|
return value.resources.every(pair => Array.isArray(pair) && pair.length === 2 && pair.every(s => typeof s === 'string'));
|
|
66
63
|
}
|
|
67
|
-
})(MultiDiffEditorUri || (
|
|
64
|
+
})(MultiDiffEditorUri || (MultiDiffEditorUri = {}));
|
|
68
65
|
//# sourceMappingURL=multi-diff-editor-uri.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"multi-diff-editor-uri.js","sourceRoot":"","sources":["../../../src/browser/multi-diff-editor/multi-diff-editor-uri.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"multi-diff-editor-uri.js","sourceRoot":"","sources":["../../../src/browser/multi-diff-editor/multi-diff-editor-uri.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,8 +2,8 @@ import { interfaces } from '@theia/core/shared/inversify';
|
|
|
2
2
|
import { URI } from '@theia/core';
|
|
3
3
|
import { LabelProvider } from '@theia/core/lib/browser';
|
|
4
4
|
import { EditorManager, EditorWidget } from '@theia/editor/lib/browser';
|
|
5
|
-
import { MultiDiffEditor } from './multi-diff-editor';
|
|
6
|
-
import { MultiDiffEditorResourcePair, MultiDiffEditorUriData } from './multi-diff-editor-uri';
|
|
5
|
+
import { MultiDiffEditor } from './multi-diff-editor.js';
|
|
6
|
+
import { MultiDiffEditorResourcePair, MultiDiffEditorUriData } from './multi-diff-editor-uri.js';
|
|
7
7
|
export declare class MultiDiffEditorWidgetFactory {
|
|
8
8
|
protected readonly container: interfaces.Container;
|
|
9
9
|
protected readonly editorManager: EditorManager;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"multi-diff-editor-widget-factory.d.ts","sourceRoot":"","sources":["../../../src/browser/multi-diff-editor/multi-diff-editor-widget-factory.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAa,UAAU,EAAE,MAAM,8BAA8B,CAAC;AACrE,OAAO,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AAClC,OAAO,EAAY,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAIxE,OAAO,EAAyB,eAAe,EAA2C,MAAM,
|
|
1
|
+
{"version":3,"file":"multi-diff-editor-widget-factory.d.ts","sourceRoot":"","sources":["../../../src/browser/multi-diff-editor/multi-diff-editor-widget-factory.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAa,UAAU,EAAE,MAAM,8BAA8B,CAAC;AACrE,OAAO,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AAClC,OAAO,EAAY,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAIxE,OAAO,EAAyB,eAAe,EAA2C,MAAM,wBAAwB,CAAC;AACzH,OAAO,EAAE,2BAA2B,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AAWjG,qBAAa,4BAA4B;IAGjC,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,UAAU,CAAC,SAAS;IAClD,SAAS,CAAC,QAAQ,CAAC,aAAa;IAChC,SAAS,CAAC,QAAQ,CAAC,aAAa;gBAFb,SAAS,EAAE,UAAU,CAAC,SAAS,EAC/B,aAAa,gBAA+B,EAC5C,aAAa,gBAA+B;IAGnE,+FAA+F;IAC/F,qBAAqB,CAAC,GAAG,EAAE,GAAG,GAAG,eAAe;IAUhD,SAAS,CAAC,0BAA0B,CAAC,IAAI,EAAE,sBAAsB,GAAG,eAAe;cAQnE,0BAA0B,CAAC,QAAQ,EAAE,2BAA2B,GAAG,OAAO,CAAC,YAAY,CAAC;IAOxG,SAAS,CAAC,uBAAuB,CAAC,YAAY,EAAE,YAAY,GAAG,IAAI;CAWtE"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
// *****************************************************************************
|
|
3
2
|
// Copyright (C) 2026 EclipseSource and others.
|
|
4
3
|
//
|
|
@@ -14,14 +13,12 @@
|
|
|
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
|
-
const monaco_diff_editor_1 = require("@theia/monaco/lib/browser/monaco-diff-editor");
|
|
24
|
-
const multi_diff_editor_1 = require("./multi-diff-editor");
|
|
16
|
+
import { Container } from '@theia/core/shared/inversify';
|
|
17
|
+
import { DiffUris, LabelProvider } from '@theia/core/lib/browser';
|
|
18
|
+
import { EditorManager } from '@theia/editor/lib/browser';
|
|
19
|
+
import { MonacoEditor } from '@theia/monaco/lib/browser/monaco-editor';
|
|
20
|
+
import { MonacoDiffEditor } from '@theia/monaco/lib/browser/monaco-diff-editor';
|
|
21
|
+
import { DiffEntryHeaderWidget, MultiDiffEditor, MultiDiffEditorData, MultiDiffEditorUri } from './multi-diff-editor.js';
|
|
25
22
|
/** Options shared by embedded diff and code editors. */
|
|
26
23
|
const EMBEDDED_EDITOR_OPTIONS = {
|
|
27
24
|
folding: false,
|
|
@@ -30,41 +27,41 @@ const EMBEDDED_EDITOR_OPTIONS = {
|
|
|
30
27
|
stickyScroll: { enabled: false },
|
|
31
28
|
minimap: { enabled: false }
|
|
32
29
|
};
|
|
33
|
-
class MultiDiffEditorWidgetFactory {
|
|
34
|
-
constructor(container, editorManager = container.get(
|
|
30
|
+
export class MultiDiffEditorWidgetFactory {
|
|
31
|
+
constructor(container, editorManager = container.get(EditorManager), labelProvider = container.get(LabelProvider)) {
|
|
35
32
|
this.container = container;
|
|
36
33
|
this.editorManager = editorManager;
|
|
37
34
|
this.labelProvider = labelProvider;
|
|
38
35
|
}
|
|
39
36
|
/** Create placeholders immediately; embedded editors load as entries approach the viewport. */
|
|
40
37
|
createMultiDiffEditor(uri) {
|
|
41
|
-
const data =
|
|
38
|
+
const data = MultiDiffEditorUri.decode(uri);
|
|
42
39
|
const editor = this.instantiateMultiDiffEditor(data);
|
|
43
40
|
for (const resource of data.resources) {
|
|
44
|
-
const headerWidget = new
|
|
41
|
+
const headerWidget = new DiffEntryHeaderWidget(resource, this.labelProvider);
|
|
45
42
|
editor.addDiffEntry(resource, headerWidget, () => this.createEmbeddedEditorWidget(resource));
|
|
46
43
|
}
|
|
47
44
|
return editor;
|
|
48
45
|
}
|
|
49
46
|
instantiateMultiDiffEditor(data) {
|
|
50
|
-
const child = new
|
|
47
|
+
const child = new Container({ defaultScope: 'Singleton' });
|
|
51
48
|
child.parent = this.container;
|
|
52
|
-
child.bind(
|
|
53
|
-
child.bind(
|
|
54
|
-
return child.get(
|
|
49
|
+
child.bind(MultiDiffEditorData).toConstantValue(data);
|
|
50
|
+
child.bind(MultiDiffEditor).toSelf();
|
|
51
|
+
return child.get(MultiDiffEditor);
|
|
55
52
|
}
|
|
56
53
|
async createEmbeddedEditorWidget(resource) {
|
|
57
|
-
const diffUri =
|
|
54
|
+
const diffUri = DiffUris.encode(resource.originalUri, resource.modifiedUri);
|
|
58
55
|
const editorWidget = await this.editorManager.createByUri(diffUri);
|
|
59
56
|
this.configureEmbeddedEditor(editorWidget);
|
|
60
57
|
return editorWidget;
|
|
61
58
|
}
|
|
62
59
|
configureEmbeddedEditor(editorWidget) {
|
|
63
|
-
const monacoEditor =
|
|
60
|
+
const monacoEditor = MonacoEditor.get(editorWidget);
|
|
64
61
|
if (monacoEditor) {
|
|
65
62
|
monacoEditor.detachModelOnHide = false;
|
|
66
63
|
}
|
|
67
|
-
if (monacoEditor instanceof
|
|
64
|
+
if (monacoEditor instanceof MonacoDiffEditor) {
|
|
68
65
|
monacoEditor.diffEditor.updateOptions({ ...EMBEDDED_EDITOR_OPTIONS, hideUnchangedRegions: { enabled: true } });
|
|
69
66
|
}
|
|
70
67
|
else if (monacoEditor) {
|
|
@@ -72,5 +69,4 @@ class MultiDiffEditorWidgetFactory {
|
|
|
72
69
|
}
|
|
73
70
|
}
|
|
74
71
|
}
|
|
75
|
-
exports.MultiDiffEditorWidgetFactory = MultiDiffEditorWidgetFactory;
|
|
76
72
|
//# sourceMappingURL=multi-diff-editor-widget-factory.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"multi-diff-editor-widget-factory.js","sourceRoot":"","sources":["../../../src/browser/multi-diff-editor/multi-diff-editor-widget-factory.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"multi-diff-editor-widget-factory.js","sourceRoot":"","sources":["../../../src/browser/multi-diff-editor/multi-diff-editor-widget-factory.ts"],"names":[],"mappings":"AAAA,gFAAgF;AAChF,+CAA+C;AAC/C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;AAEhF,OAAO,EAAE,SAAS,EAAc,MAAM,8BAA8B,CAAC;AAErE,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,EAAE,aAAa,EAAgB,MAAM,2BAA2B,CAAC;AAExE,OAAO,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AACvE,OAAO,EAAE,gBAAgB,EAAE,MAAM,8CAA8C,CAAC;AAChF,OAAO,EAAE,qBAAqB,EAAE,eAAe,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAGzH,wDAAwD;AACxD,MAAM,uBAAuB,GAAiC;IAC1D,OAAO,EAAE,KAAK;IACd,QAAQ,EAAE,KAAK;IACf,oBAAoB,EAAE,KAAK;IAC3B,YAAY,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE;IAChC,OAAO,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE;CAC9B,CAAC;AAEF,MAAM,OAAO,4BAA4B;IAErC,YACuB,SAA+B,EAC/B,gBAAgB,SAAS,CAAC,GAAG,CAAC,aAAa,CAAC,EAC5C,gBAAgB,SAAS,CAAC,GAAG,CAAC,aAAa,CAAC;QAF5C,cAAS,GAAT,SAAS,CAAsB;QAC/B,kBAAa,GAAb,aAAa,CAA+B;QAC5C,kBAAa,GAAb,aAAa,CAA+B;IAC/D,CAAC;IAEL,+FAA+F;IAC/F,qBAAqB,CAAC,GAAQ;QAC1B,MAAM,IAAI,GAAG,kBAAkB,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAC5C,MAAM,MAAM,GAAG,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,CAAC;QACrD,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACpC,MAAM,YAAY,GAAG,IAAI,qBAAqB,CAAC,QAAQ,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;YAC7E,MAAM,CAAC,YAAY,CAAC,QAAQ,EAAE,YAAY,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,0BAA0B,CAAC,QAAQ,CAAC,CAAC,CAAC;QACjG,CAAC;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;IAES,0BAA0B,CAAC,IAA4B;QAC7D,MAAM,KAAK,GAAG,IAAI,SAAS,CAAC,EAAE,YAAY,EAAE,WAAW,EAAE,CAAC,CAAC;QAC3D,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC;QAC9B,KAAK,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;QACtD,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,MAAM,EAAE,CAAC;QACrC,OAAO,KAAK,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;IACtC,CAAC;IAES,KAAK,CAAC,0BAA0B,CAAC,QAAqC;QAC5E,MAAM,OAAO,GAAG,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,WAAW,EAAE,QAAQ,CAAC,WAAW,CAAC,CAAC;QAC5E,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;QACnE,IAAI,CAAC,uBAAuB,CAAC,YAAY,CAAC,CAAC;QAC3C,OAAO,YAAY,CAAC;IACxB,CAAC;IAES,uBAAuB,CAAC,YAA0B;QACxD,MAAM,YAAY,GAAG,YAAY,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;QACpD,IAAI,YAAY,EAAE,CAAC;YACf,YAAY,CAAC,iBAAiB,GAAG,KAAK,CAAC;QAC3C,CAAC;QACD,IAAI,YAAY,YAAY,gBAAgB,EAAE,CAAC;YAC3C,YAAY,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE,GAAG,uBAAuB,EAAE,oBAAoB,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;QACnH,CAAC;aAAM,IAAI,YAAY,EAAE,CAAC;YACtB,YAAY,CAAC,UAAU,EAAE,CAAC,aAAa,CAAC,uBAAuB,CAAC,CAAC;QACrE,CAAC;IACL,CAAC;CACJ"}
|