@theia/scm 1.77.0-next.1 → 1.77.0-next.108
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
|
@@ -0,0 +1,165 @@
|
|
|
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
|
+
import { expect } from 'chai';
|
|
17
|
+
import { URI } from '@theia/core';
|
|
18
|
+
import { MultiDiffEditorUri } from './multi-diff-editor-uri.js';
|
|
19
|
+
describe('MultiDiffEditorUri', () => {
|
|
20
|
+
const sampleData = {
|
|
21
|
+
title: 'Test Changes',
|
|
22
|
+
resources: [
|
|
23
|
+
{
|
|
24
|
+
originalUri: new URI('file:///path/to/original/file1.ts'),
|
|
25
|
+
modifiedUri: new URI('file:///path/to/modified/file1.ts')
|
|
26
|
+
},
|
|
27
|
+
{
|
|
28
|
+
originalUri: new URI('file:///path/to/original/file2.ts'),
|
|
29
|
+
modifiedUri: new URI('file:///path/to/modified/file2.ts')
|
|
30
|
+
}
|
|
31
|
+
]
|
|
32
|
+
};
|
|
33
|
+
describe('encode', () => {
|
|
34
|
+
it('should create a URI with the multi-diff-editor scheme', () => {
|
|
35
|
+
const uri = MultiDiffEditorUri.encode(sampleData);
|
|
36
|
+
expect(uri.scheme).to.equal('multi-diff-editor');
|
|
37
|
+
});
|
|
38
|
+
it('should encode resources in the query', () => {
|
|
39
|
+
const uri = MultiDiffEditorUri.encode(sampleData);
|
|
40
|
+
const parsed = JSON.parse(uri.query);
|
|
41
|
+
expect(parsed.title).to.equal('Test Changes');
|
|
42
|
+
expect(parsed.resources).to.have.length(2);
|
|
43
|
+
});
|
|
44
|
+
it('should be deterministic for the same data', () => {
|
|
45
|
+
const uri1 = MultiDiffEditorUri.encode(sampleData);
|
|
46
|
+
const uri2 = MultiDiffEditorUri.encode(sampleData);
|
|
47
|
+
expect(uri1.toString()).to.equal(uri2.toString());
|
|
48
|
+
});
|
|
49
|
+
it('should produce different URIs for different data', () => {
|
|
50
|
+
const uri1 = MultiDiffEditorUri.encode(sampleData);
|
|
51
|
+
const uri2 = MultiDiffEditorUri.encode({
|
|
52
|
+
...sampleData,
|
|
53
|
+
title: 'Different Title'
|
|
54
|
+
});
|
|
55
|
+
expect(uri1.toString()).to.not.equal(uri2.toString());
|
|
56
|
+
});
|
|
57
|
+
});
|
|
58
|
+
describe('decode', () => {
|
|
59
|
+
it('should decode an encoded URI back to the original data', () => {
|
|
60
|
+
const uri = MultiDiffEditorUri.encode(sampleData);
|
|
61
|
+
const decoded = MultiDiffEditorUri.decode(uri);
|
|
62
|
+
expect(decoded.title).to.equal(sampleData.title);
|
|
63
|
+
expect(decoded.resources).to.have.length(2);
|
|
64
|
+
expect(decoded.resources[0].originalUri.toString()).to.equal(sampleData.resources[0].originalUri.toString());
|
|
65
|
+
expect(decoded.resources[0].modifiedUri.toString()).to.equal(sampleData.resources[0].modifiedUri.toString());
|
|
66
|
+
expect(decoded.resources[1].originalUri.toString()).to.equal(sampleData.resources[1].originalUri.toString());
|
|
67
|
+
expect(decoded.resources[1].modifiedUri.toString()).to.equal(sampleData.resources[1].modifiedUri.toString());
|
|
68
|
+
});
|
|
69
|
+
it('should throw for URIs with wrong scheme', () => {
|
|
70
|
+
const wrongUri = new URI('file:///some/path');
|
|
71
|
+
expect(() => MultiDiffEditorUri.decode(wrongUri)).to.throw('must have scheme multi-diff-editor');
|
|
72
|
+
});
|
|
73
|
+
it('should throw for URIs whose query is not valid JSON', () => {
|
|
74
|
+
const malformedUri = new URI().withScheme('multi-diff-editor').withQuery('not-json');
|
|
75
|
+
expect(() => MultiDiffEditorUri.decode(malformedUri)).to.throw(/is not a valid URI for scheme multi-diff-editor/);
|
|
76
|
+
});
|
|
77
|
+
it('should throw when the parsed payload is missing a title', () => {
|
|
78
|
+
const uri = new URI().withScheme('multi-diff-editor').withQuery(JSON.stringify({ resources: [] }));
|
|
79
|
+
expect(() => MultiDiffEditorUri.decode(uri)).to.throw(/is not a valid URI for scheme multi-diff-editor/);
|
|
80
|
+
});
|
|
81
|
+
it('should throw when the parsed payload is missing resources', () => {
|
|
82
|
+
const uri = new URI().withScheme('multi-diff-editor').withQuery(JSON.stringify({ title: 'x' }));
|
|
83
|
+
expect(() => MultiDiffEditorUri.decode(uri)).to.throw(/is not a valid URI for scheme multi-diff-editor/);
|
|
84
|
+
});
|
|
85
|
+
it('should throw when a resource entry is not a string pair', () => {
|
|
86
|
+
const uri = new URI().withScheme('multi-diff-editor').withQuery(JSON.stringify({
|
|
87
|
+
title: 'x',
|
|
88
|
+
resources: [['only-one']]
|
|
89
|
+
}));
|
|
90
|
+
expect(() => MultiDiffEditorUri.decode(uri)).to.throw(/is not a valid URI for scheme multi-diff-editor/);
|
|
91
|
+
});
|
|
92
|
+
it('should throw when a resource entry contains non-string values', () => {
|
|
93
|
+
const uri = new URI().withScheme('multi-diff-editor').withQuery(JSON.stringify({
|
|
94
|
+
title: 'x',
|
|
95
|
+
resources: [[123, 456]]
|
|
96
|
+
}));
|
|
97
|
+
expect(() => MultiDiffEditorUri.decode(uri)).to.throw(/is not a valid URI for scheme multi-diff-editor/);
|
|
98
|
+
});
|
|
99
|
+
it('should throw when the payload is a primitive value', () => {
|
|
100
|
+
const uri = new URI().withScheme('multi-diff-editor').withQuery(JSON.stringify('not-an-object'));
|
|
101
|
+
expect(() => MultiDiffEditorUri.decode(uri)).to.throw(/is not a valid URI for scheme multi-diff-editor/);
|
|
102
|
+
});
|
|
103
|
+
});
|
|
104
|
+
describe('isMultiDiffEditorUri', () => {
|
|
105
|
+
it('should return true for multi-diff-editor URIs', () => {
|
|
106
|
+
const uri = MultiDiffEditorUri.encode(sampleData);
|
|
107
|
+
expect(MultiDiffEditorUri.isMultiDiffEditorUri(uri)).to.be.true;
|
|
108
|
+
});
|
|
109
|
+
it('should return false for other URIs', () => {
|
|
110
|
+
const uri = new URI('file:///some/path');
|
|
111
|
+
expect(MultiDiffEditorUri.isMultiDiffEditorUri(uri)).to.be.false;
|
|
112
|
+
});
|
|
113
|
+
});
|
|
114
|
+
describe('roundtrip', () => {
|
|
115
|
+
it('should handle empty resources list', () => {
|
|
116
|
+
const data = {
|
|
117
|
+
title: 'Empty',
|
|
118
|
+
resources: []
|
|
119
|
+
};
|
|
120
|
+
const uri = MultiDiffEditorUri.encode(data);
|
|
121
|
+
const decoded = MultiDiffEditorUri.decode(uri);
|
|
122
|
+
expect(decoded.title).to.equal('Empty');
|
|
123
|
+
expect(decoded.resources).to.have.length(0);
|
|
124
|
+
});
|
|
125
|
+
it('should handle single resource', () => {
|
|
126
|
+
const data = {
|
|
127
|
+
title: 'Single Change',
|
|
128
|
+
resources: [{
|
|
129
|
+
originalUri: new URI('file:///original/file.ts'),
|
|
130
|
+
modifiedUri: new URI('file:///modified/file.ts')
|
|
131
|
+
}]
|
|
132
|
+
};
|
|
133
|
+
const uri = MultiDiffEditorUri.encode(data);
|
|
134
|
+
const decoded = MultiDiffEditorUri.decode(uri);
|
|
135
|
+
expect(decoded.title).to.equal('Single Change');
|
|
136
|
+
expect(decoded.resources).to.have.length(1);
|
|
137
|
+
expect(decoded.resources[0].originalUri.toString()).to.equal(data.resources[0].originalUri.toString());
|
|
138
|
+
expect(decoded.resources[0].modifiedUri.toString()).to.equal(data.resources[0].modifiedUri.toString());
|
|
139
|
+
});
|
|
140
|
+
it('should handle URIs with special characters', () => {
|
|
141
|
+
const data = {
|
|
142
|
+
title: 'Special Chars: äöü & <test>',
|
|
143
|
+
resources: [{
|
|
144
|
+
originalUri: new URI('file:///path/with spaces/file.ts'),
|
|
145
|
+
modifiedUri: new URI('file:///path/with%20encoded/file.ts')
|
|
146
|
+
}]
|
|
147
|
+
};
|
|
148
|
+
const uri = MultiDiffEditorUri.encode(data);
|
|
149
|
+
const decoded = MultiDiffEditorUri.decode(uri);
|
|
150
|
+
expect(decoded.title).to.equal(data.title);
|
|
151
|
+
expect(decoded.resources[0].originalUri.toString()).to.equal(data.resources[0].originalUri.toString());
|
|
152
|
+
expect(decoded.resources[0].modifiedUri.toString()).to.equal(data.resources[0].modifiedUri.toString());
|
|
153
|
+
});
|
|
154
|
+
it('should handle a title with slashes without confusing the URI path', () => {
|
|
155
|
+
const data = {
|
|
156
|
+
title: 'changes/in/nested/path',
|
|
157
|
+
resources: []
|
|
158
|
+
};
|
|
159
|
+
const uri = MultiDiffEditorUri.encode(data);
|
|
160
|
+
const decoded = MultiDiffEditorUri.decode(uri);
|
|
161
|
+
expect(decoded.title).to.equal('changes/in/nested/path');
|
|
162
|
+
});
|
|
163
|
+
});
|
|
164
|
+
});
|
|
165
|
+
//# sourceMappingURL=multi-diff-editor.spec.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"multi-diff-editor.spec.js","sourceRoot":"","sources":["../../../src/browser/multi-diff-editor/multi-diff-editor.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,8 +2,8 @@ import { CommandService, DisposableCollection, MenuNode } from '@theia/core';
|
|
|
2
2
|
import { Message } from '@theia/core/shared/@lumino/messaging';
|
|
3
3
|
import * as React from '@theia/core/shared/react';
|
|
4
4
|
import { ContextMenuRenderer, ReactWidget } from '@theia/core/lib/browser';
|
|
5
|
-
import { ScmService } from './scm-service';
|
|
6
|
-
import { ScmActionButton } from './scm-provider';
|
|
5
|
+
import { ScmService } from './scm-service.js';
|
|
6
|
+
import { ScmActionButton } from './scm-provider.js';
|
|
7
7
|
import { LabelParser } from '@theia/core/lib/browser/label-parser';
|
|
8
8
|
import { BrowserMenuNodeFactory } from '@theia/core/lib/browser/menu/browser-menu-node-factory';
|
|
9
9
|
export declare class ScmActionButtonWidget extends ReactWidget {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scm-action-button-widget.d.ts","sourceRoot":"","sources":["../../src/browser/scm-action-button-widget.tsx"],"names":[],"mappings":"AAiBA,OAAO,EAAE,cAAc,EAAE,oBAAoB,EAAE,QAAQ,EAAoB,MAAM,aAAa,CAAC;AAC/F,OAAO,EAAE,OAAO,EAAE,MAAM,sCAAsC,CAAC;AAC/D,OAAO,KAAK,KAAK,MAAM,0BAA0B,CAAC;AAClD,OAAO,EAAW,mBAAmB,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACpF,OAAO,EAAE,UAAU,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"scm-action-button-widget.d.ts","sourceRoot":"","sources":["../../src/browser/scm-action-button-widget.tsx"],"names":[],"mappings":"AAiBA,OAAO,EAAE,cAAc,EAAE,oBAAoB,EAAE,QAAQ,EAAoB,MAAM,aAAa,CAAC;AAC/F,OAAO,EAAE,OAAO,EAAE,MAAM,sCAAsC,CAAC;AAC/D,OAAO,KAAK,KAAK,MAAM,0BAA0B,CAAC;AAClD,OAAO,EAAW,mBAAmB,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACpF,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C,OAAO,EAAE,eAAe,EAA2B,MAAM,mBAAmB,CAAC;AAC7E,OAAO,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AACnE,OAAO,EAAE,sBAAsB,EAAE,MAAM,wDAAwD,CAAC;AAEhG,qBACa,qBAAsB,SAAQ,WAAW;IAElD,MAAM,CAAC,EAAE,SAA8B;IAEnB,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,UAAU,CAAC;IACtC,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAC;IAC7C,SAAS,CAAC,QAAQ,CAAC,mBAAmB,EAAE,mBAAmB,CAAC;IACpE,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;IACjC,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,sBAAsB,CAAC;IAE3F,SAAS,CAAC,QAAQ,CAAC,2BAA2B,uBAA8B;;cAQzD,aAAa,CAAC,GAAG,EAAE,OAAO,GAAG,IAAI;IASpD,SAAS,CAAC,yBAAyB,IAAI,IAAI;IAgB3C,SAAS,CAAC,MAAM,IAAI,KAAK,CAAC,SAAS;IASnC;;OAEG;IACH,SAAS,CAAC,yBAAyB,IAAI,KAAK,CAAC,cAAc,CAAC,WAAW,CAAC;IAMxE,SAAS,CAAC,YAAY,IAAI,KAAK,CAAC,SAAS;IAkBzC,SAAS,CAAC,oBAAoB,GAAI,WAAW,MAAM,EAAE,MAAM,OAAO,EAAE,KAAG,IAAI,CAEzE;IAEF,SAAS,CAAC,uBAAuB,GAC7B,OAAO,KAAK,CAAC,UAAU,EACvB,cAAc,eAAe,KAC9B,IAAI,CAuBL;IAEF,SAAS,CAAC,2BAA2B,CAAC,YAAY,EAAE,eAAe,GAAG,QAAQ,EAAE;IAmChF,SAAS,CAAC,WAAW,GAAI,MAAM,MAAM,KAAG,KAAK,CAAC,SAAS,EAAE,CAWvD;IAEF,SAAS,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;CAW7C;AAqDD,yBAAiB,qBAAqB,CAAC;IAEnC,UAAiB,MAAM,CAAC;QACb,MAAM,aAAa,4BAA4B,CAAC;QAChD,MAAM,uBAAuB,sCAAsC,CAAC;QACpE,MAAM,qBAAqB,oCAAoC,CAAC;QAChE,MAAM,8BAA8B,6CAA6C,CAAC;QAClF,MAAM,uBAAuB,sCAAsC,CAAC;KAC9E;CAEJ"}
|
|
@@ -1,9 +1,6 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
var ScmActionButtonWidget_1;
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
const tslib_1 = require("tslib");
|
|
6
|
-
const jsx_runtime_1 = require("@theia/core/shared/react/jsx-runtime");
|
|
2
|
+
import { __decorate } from "tslib";
|
|
3
|
+
import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "@theia/core/shared/react/jsx-runtime";
|
|
7
4
|
// *****************************************************************************
|
|
8
5
|
// Copyright (C) 2025 EclipseSource GmbH and others.
|
|
9
6
|
//
|
|
@@ -19,19 +16,19 @@ const jsx_runtime_1 = require("@theia/core/shared/react/jsx-runtime");
|
|
|
19
16
|
//
|
|
20
17
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
21
18
|
// *****************************************************************************
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
let ScmActionButtonWidget = class ScmActionButtonWidget extends
|
|
19
|
+
import { injectable, inject } from '@theia/core/shared/inversify';
|
|
20
|
+
import { CommandService, DisposableCollection, nls } from '@theia/core';
|
|
21
|
+
import * as React from '@theia/core/shared/react';
|
|
22
|
+
import { codicon, ContextMenuRenderer, ReactWidget } from '@theia/core/lib/browser';
|
|
23
|
+
import { ScmService } from './scm-service.js';
|
|
24
|
+
import { LabelParser } from '@theia/core/lib/browser/label-parser';
|
|
25
|
+
import { BrowserMenuNodeFactory } from '@theia/core/lib/browser/menu/browser-menu-node-factory';
|
|
26
|
+
let ScmActionButtonWidget = class ScmActionButtonWidget extends ReactWidget {
|
|
30
27
|
static { ScmActionButtonWidget_1 = this; }
|
|
31
28
|
static { this.ID = 'scm-action-button-widget'; }
|
|
32
29
|
constructor() {
|
|
33
30
|
super();
|
|
34
|
-
this.toDisposeOnRepositoryChange = new
|
|
31
|
+
this.toDisposeOnRepositoryChange = new DisposableCollection();
|
|
35
32
|
this.handleExecuteCommand = (commandId, args) => {
|
|
36
33
|
this.commandService.executeCommand(commandId, ...args);
|
|
37
34
|
};
|
|
@@ -64,7 +61,7 @@ let ScmActionButtonWidget = class ScmActionButtonWidget extends browser_1.ReactW
|
|
|
64
61
|
result.push(labelPart);
|
|
65
62
|
}
|
|
66
63
|
else {
|
|
67
|
-
result.push((
|
|
64
|
+
result.push(_jsx("span", { className: codicon(labelPart.name) }, index));
|
|
68
65
|
}
|
|
69
66
|
});
|
|
70
67
|
return result;
|
|
@@ -123,7 +120,7 @@ let ScmActionButtonWidget = class ScmActionButtonWidget extends browser_1.ReactW
|
|
|
123
120
|
if (actionButton === undefined) {
|
|
124
121
|
return undefined;
|
|
125
122
|
}
|
|
126
|
-
return (
|
|
123
|
+
return _jsx(_Fragment, { children: _jsx(ScmActionButtonComponent, { actionButton: actionButton, onExecuteCommand: this.handleExecuteCommand, onShowSecondaryMenu: this.handleShowSecondaryMenu, renderLabel: this.renderLabel }) });
|
|
127
124
|
}
|
|
128
125
|
;
|
|
129
126
|
buildMenuGroupsWithCommands(actionButton) {
|
|
@@ -164,39 +161,33 @@ let ScmActionButtonWidget = class ScmActionButtonWidget extends browser_1.ReactW
|
|
|
164
161
|
}
|
|
165
162
|
;
|
|
166
163
|
};
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
(0, inversify_1.inject)(scm_service_1.ScmService),
|
|
170
|
-
tslib_1.__metadata("design:type", scm_service_1.ScmService)
|
|
164
|
+
__decorate([
|
|
165
|
+
inject(ScmService)
|
|
171
166
|
], ScmActionButtonWidget.prototype, "scmService", void 0);
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
tslib_1.__metadata("design:type", Object)
|
|
167
|
+
__decorate([
|
|
168
|
+
inject(CommandService)
|
|
175
169
|
], ScmActionButtonWidget.prototype, "commandService", void 0);
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
tslib_1.__metadata("design:type", browser_1.ContextMenuRenderer)
|
|
170
|
+
__decorate([
|
|
171
|
+
inject(ContextMenuRenderer)
|
|
179
172
|
], ScmActionButtonWidget.prototype, "contextMenuRenderer", void 0);
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
tslib_1.__metadata("design:type", label_parser_1.LabelParser)
|
|
173
|
+
__decorate([
|
|
174
|
+
inject(LabelParser)
|
|
183
175
|
], ScmActionButtonWidget.prototype, "labelParser", void 0);
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
tslib_1.__metadata("design:type", browser_menu_node_factory_1.BrowserMenuNodeFactory)
|
|
176
|
+
__decorate([
|
|
177
|
+
inject(BrowserMenuNodeFactory)
|
|
187
178
|
], ScmActionButtonWidget.prototype, "menuNodeFactory", void 0);
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
tslib_1.__metadata("design:paramtypes", [])
|
|
179
|
+
ScmActionButtonWidget = ScmActionButtonWidget_1 = __decorate([
|
|
180
|
+
injectable()
|
|
191
181
|
], ScmActionButtonWidget);
|
|
182
|
+
export { ScmActionButtonWidget };
|
|
192
183
|
class ScmActionButtonComponent extends React.Component {
|
|
193
184
|
render() {
|
|
194
185
|
const { actionButton, onExecuteCommand, onShowSecondaryMenu, renderLabel } = this.props;
|
|
195
186
|
const isDisabled = !actionButton.enabled;
|
|
196
187
|
const result = renderLabel(actionButton.command.title || '');
|
|
197
|
-
return ((
|
|
198
|
-
(
|
|
199
|
-
(isDisabled ? ` ${ScmActionButtonWidget.Styles.ACTION_BUTTON_DIVIDER_DISABLED}` : '') }), (
|
|
188
|
+
return (_jsxs("div", { className: ScmActionButtonWidget.Styles.ACTION_BUTTON_CONTAINER, children: [_jsx("button", { className: ScmActionButtonWidget.Styles.ACTION_BUTTON, onClick: () => onExecuteCommand(actionButton.command.command ?? '', actionButton.command.arguments || []), disabled: isDisabled, title: actionButton.command.tooltip || '', children: result }), actionButton.secondaryCommands && actionButton.secondaryCommands.length > 0 &&
|
|
189
|
+
_jsxs(_Fragment, { children: [_jsx("div", { className: ScmActionButtonWidget.Styles.ACTION_BUTTON_DIVIDER +
|
|
190
|
+
(isDisabled ? ` ${ScmActionButtonWidget.Styles.ACTION_BUTTON_DIVIDER_DISABLED}` : '') }), _jsx("button", { className: `${ScmActionButtonWidget.Styles.ACTION_BUTTON_SECONDARY} ${ScmActionButtonWidget.Styles.ACTION_BUTTON}`, onClick: e => onShowSecondaryMenu(e, actionButton), disabled: isDisabled, title: nls.localizeByDefault('More Actions...'), children: _jsx("span", { className: codicon('chevron-down') }) })] })] }));
|
|
200
191
|
}
|
|
201
192
|
}
|
|
202
193
|
(function (ScmActionButtonComponent) {
|
|
@@ -212,5 +203,5 @@ class ScmActionButtonComponent extends React.Component {
|
|
|
212
203
|
Styles.ACTION_BUTTON_CONTAINER = 'theia-scm-action-button-container';
|
|
213
204
|
})(Styles = ScmActionButtonWidget.Styles || (ScmActionButtonWidget.Styles = {}));
|
|
214
205
|
;
|
|
215
|
-
})(ScmActionButtonWidget || (
|
|
206
|
+
})(ScmActionButtonWidget || (ScmActionButtonWidget = {}));
|
|
216
207
|
//# sourceMappingURL=scm-action-button-widget.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scm-action-button-widget.js","sourceRoot":"","sources":["../../src/browser/scm-action-button-widget.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"scm-action-button-widget.js","sourceRoot":"","sources":["../../src/browser/scm-action-button-widget.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import '../../src/browser/style/scm-amend-component.css';
|
|
2
2
|
import * as React from '@theia/core/shared/react';
|
|
3
|
-
import { ScmAvatarService } from './scm-avatar-service';
|
|
3
|
+
import { ScmAvatarService } from './scm-avatar-service.js';
|
|
4
4
|
import { StorageService } from '@theia/core/lib/browser';
|
|
5
5
|
import { DisposableCollection } from '@theia/core';
|
|
6
|
-
import { ScmRepository } from './scm-repository';
|
|
7
|
-
import { ScmAmendSupport, ScmCommit } from './scm-provider';
|
|
6
|
+
import { ScmRepository } from './scm-repository.js';
|
|
7
|
+
import { ScmAmendSupport, ScmCommit } from './scm-provider.js';
|
|
8
8
|
export interface ScmAmendComponentProps {
|
|
9
9
|
style: React.CSSProperties | undefined;
|
|
10
10
|
repository: ScmRepository;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scm-amend-component.d.ts","sourceRoot":"","sources":["../../src/browser/scm-amend-component.tsx"],"names":[],"mappings":"AAgBA,OAAO,iDAAiD,CAAC;AAEzD,OAAO,KAAK,KAAK,MAAM,0BAA0B,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"scm-amend-component.d.ts","sourceRoot":"","sources":["../../src/browser/scm-amend-component.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,4 @@
|
|
|
1
|
-
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.ScmAmendComponent = void 0;
|
|
4
|
-
const jsx_runtime_1 = require("@theia/core/shared/react/jsx-runtime");
|
|
1
|
+
import { jsx as _jsx, jsxs as _jsxs } from "@theia/core/shared/react/jsx-runtime";
|
|
5
2
|
// *****************************************************************************
|
|
6
3
|
// Copyright (C) 2019 Arm and others.
|
|
7
4
|
//
|
|
@@ -17,14 +14,14 @@ const jsx_runtime_1 = require("@theia/core/shared/react/jsx-runtime");
|
|
|
17
14
|
//
|
|
18
15
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
19
16
|
// *****************************************************************************
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
17
|
+
import '../../src/browser/style/scm-amend-component.css';
|
|
18
|
+
import * as React from '@theia/core/shared/react';
|
|
19
|
+
import { codicon } from '@theia/core/lib/browser';
|
|
20
|
+
import { Disposable, DisposableCollection } from '@theia/core';
|
|
21
|
+
import { nls } from '@theia/core/lib/common/nls';
|
|
25
22
|
const TRANSITION_TIME_MS = 300;
|
|
26
23
|
const REPOSITORY_STORAGE_KEY = 'scmRepository';
|
|
27
|
-
class ScmAmendComponent extends React.Component {
|
|
24
|
+
export class ScmAmendComponent extends React.Component {
|
|
28
25
|
constructor(props) {
|
|
29
26
|
super(props);
|
|
30
27
|
/**
|
|
@@ -38,7 +35,7 @@ class ScmAmendComponent extends React.Component {
|
|
|
38
35
|
this.lastCommitHeight = instance.getBoundingClientRect().height;
|
|
39
36
|
}
|
|
40
37
|
};
|
|
41
|
-
this.toDisposeOnUnmount = new
|
|
38
|
+
this.toDisposeOnUnmount = new DisposableCollection();
|
|
42
39
|
/**
|
|
43
40
|
* This function will update the 'model' (lastCommit, amendingCommits) only
|
|
44
41
|
* when the repository sees the last commit change.
|
|
@@ -85,7 +82,7 @@ class ScmAmendComponent extends React.Component {
|
|
|
85
82
|
};
|
|
86
83
|
}
|
|
87
84
|
async componentDidMount() {
|
|
88
|
-
this.toDisposeOnUnmount.push(
|
|
85
|
+
this.toDisposeOnUnmount.push(Disposable.create(() => { }));
|
|
89
86
|
const lastCommit = await this.getLastCommit();
|
|
90
87
|
this.setState({ amendingCommits: await this.buildAmendingList(lastCommit ? lastCommit.commit : undefined), lastCommit });
|
|
91
88
|
if (this.toDisposeOnUnmount.disposed) {
|
|
@@ -224,10 +221,10 @@ class ScmAmendComponent extends React.Component {
|
|
|
224
221
|
flexShrink: 1,
|
|
225
222
|
minHeight: 240 // height with three commits
|
|
226
223
|
};
|
|
227
|
-
return ((
|
|
224
|
+
return (_jsxs("div", { className: ScmAmendComponent.Styles.COMMIT_CONTAINER + ' no-select', style: style, children: [this.state.amendingCommits.length > 0 || (this.state.lastCommit && this.state.transition.state !== 'none' && this.state.transition.direction === 'down')
|
|
228
225
|
? this.renderAmendingCommits()
|
|
229
226
|
: '', this.state.lastCommit ?
|
|
230
|
-
(
|
|
227
|
+
_jsx("div", { children: _jsxs("div", { id: 'lastCommit', className: 'theia-scm-amend', children: [_jsx("div", { className: 'theia-header scm-theia-header', children: nls.localize('theia/scm/amendHeadCommit', 'HEAD Commit') }), this.renderLastCommit()] }) })
|
|
231
228
|
: ''] }));
|
|
232
229
|
}
|
|
233
230
|
async getLastCommit() {
|
|
@@ -250,33 +247,33 @@ class ScmAmendComponent extends React.Component {
|
|
|
250
247
|
// what the height would be when the parent is at its minHeight
|
|
251
248
|
minHeight: 0
|
|
252
249
|
};
|
|
253
|
-
return (
|
|
250
|
+
return _jsxs("div", { id: 'amendedCommits', className: 'theia-scm-amend-outer-container', style: style, children: [_jsxs("div", { className: 'theia-header scm-theia-header', children: [_jsx("div", { className: 'noWrapInfo', children: "Commits being Amended" }), this.renderAmendCommitListButtons(), this.renderCommitCount(this.state.amendingCommits.length)] }), _jsxs("div", { style: this.styleAmendedCommits(), children: [this.state.amendingCommits.map((commitData, index, array) => this.renderCommitBeingAmended(commitData, index === array.length - 1)), this.state.lastCommit && this.state.transition.state !== 'none' && this.state.transition.direction === 'down'
|
|
254
251
|
? this.renderCommitBeingAmended(this.state.lastCommit, false)
|
|
255
252
|
: ''] })] });
|
|
256
253
|
}
|
|
257
254
|
renderAmendCommitListButtons() {
|
|
258
|
-
return (
|
|
255
|
+
return _jsx("div", { className: 'theia-scm-inline-actions-container', children: _jsxs("div", { className: 'theia-scm-inline-actions', children: [_jsx("div", { className: 'theia-scm-inline-action', children: _jsx("a", { className: codicon('dash'), title: 'Unamend All Commits', onClick: this.unamendAll }) }), _jsx("div", { className: 'theia-scm-inline-action', children: _jsx("a", { className: codicon('close'), title: 'Clear Amending Commits', onClick: this.clearAmending }) })] }) });
|
|
259
256
|
}
|
|
260
257
|
renderLastCommit() {
|
|
261
258
|
if (!this.state.lastCommit) {
|
|
262
259
|
return '';
|
|
263
260
|
}
|
|
264
261
|
const canAmend = true;
|
|
265
|
-
return (
|
|
266
|
-
? (
|
|
262
|
+
return _jsxs("div", { className: ScmAmendComponent.Styles.COMMIT_AND_BUTTON, style: { flexGrow: 0, flexShrink: 0 }, children: [this.renderLastCommitNoButton(this.state.lastCommit), canAmend
|
|
263
|
+
? _jsx("div", { className: ScmAmendComponent.Styles.FLEX_CENTER, children: _jsx("button", { className: 'theia-button', title: nls.localize('theia/scm/amendLastCommit', 'Amend last commit'), onClick: this.amend, children: nls.localize('theia/scm/amend', 'Amend') }) })
|
|
267
264
|
: ''] }, this.state.lastCommit.commit.id);
|
|
268
265
|
}
|
|
269
266
|
renderLastCommitNoButton(lastCommit) {
|
|
270
267
|
switch (this.state.transition.state) {
|
|
271
268
|
case 'none':
|
|
272
|
-
return (
|
|
269
|
+
return _jsx("div", { ref: this.lastCommitScrollRef, className: 'theia-scm-scrolling-container', children: this.renderCommitAvatarAndDetail(lastCommit) });
|
|
273
270
|
case 'start':
|
|
274
271
|
case 'transitioning':
|
|
275
272
|
switch (this.state.transition.direction) {
|
|
276
273
|
case 'up':
|
|
277
|
-
return (
|
|
274
|
+
return _jsxs("div", { style: this.styleLastCommitMovingUp(this.state.transition.state), children: [this.renderCommitAvatarAndDetail(this.state.transition.previousLastCommit), this.renderCommitAvatarAndDetail(lastCommit)] });
|
|
278
275
|
case 'down':
|
|
279
|
-
return (
|
|
276
|
+
return _jsxs("div", { style: this.styleLastCommitMovingDown(this.state.transition.state), children: [this.renderCommitAvatarAndDetail(lastCommit), this.renderCommitAvatarAndDetail(this.state.transition.previousLastCommit)] });
|
|
280
277
|
}
|
|
281
278
|
}
|
|
282
279
|
}
|
|
@@ -290,18 +287,18 @@ class ScmAmendComponent extends React.Component {
|
|
|
290
287
|
}
|
|
291
288
|
renderCommitAvatarAndDetail(commitData) {
|
|
292
289
|
const { commit, avatar } = commitData;
|
|
293
|
-
return (
|
|
290
|
+
return _jsxs("div", { className: ScmAmendComponent.Styles.COMMIT_AVATAR_AND_TEXT, children: [_jsx("div", { className: ScmAmendComponent.Styles.COMMIT_MESSAGE_AVATAR, children: _jsx("img", { src: avatar }) }), _jsxs("div", { className: ScmAmendComponent.Styles.COMMIT_DETAILS, children: [_jsx("div", { className: ScmAmendComponent.Styles.COMMIT_MESSAGE_SUMMARY, children: commit.summary }), _jsx("div", { className: ScmAmendComponent.Styles.LAST_COMMIT_MESSAGE_TIME, children: `${commit.authorDateRelative} by ${commit.authorName}` })] })] }, commit.id);
|
|
294
291
|
}
|
|
295
292
|
renderCommitCount(commits) {
|
|
296
|
-
return (
|
|
293
|
+
return _jsx("div", { className: 'notification-count-container scm-change-count', children: _jsx("span", { className: 'notification-count', children: commits }) });
|
|
297
294
|
}
|
|
298
295
|
renderCommitBeingAmended(commitData, isOldestAmendCommit) {
|
|
299
296
|
if (isOldestAmendCommit && this.state.transition.state !== 'none' && this.state.transition.direction === 'up') {
|
|
300
|
-
return (
|
|
297
|
+
return _jsx("div", { className: ScmAmendComponent.Styles.COMMIT_AVATAR_AND_TEXT, style: { flexGrow: 0, flexShrink: 0 }, children: _jsx("div", { className: 'fixed-height-commit-container', children: this.renderCommitAvatarAndDetail(commitData) }) }, commitData.commit.id);
|
|
301
298
|
}
|
|
302
299
|
else {
|
|
303
|
-
return (
|
|
304
|
-
? (
|
|
300
|
+
return _jsxs("div", { className: ScmAmendComponent.Styles.COMMIT_AVATAR_AND_TEXT, style: { flexGrow: 0, flexShrink: 0 }, children: [this.renderCommitAvatarAndDetail(commitData), isOldestAmendCommit
|
|
301
|
+
? _jsx("div", { className: ScmAmendComponent.Styles.FLEX_CENTER, children: _jsx("button", { className: 'theia-button', title: nls.localize('theia/scm/unamendCommit', 'Unamend commit'), onClick: this.unamend, children: nls.localize('theia/scm/unamend', 'Unamend') }) })
|
|
305
302
|
: ''] }, commitData.commit.id);
|
|
306
303
|
}
|
|
307
304
|
}
|
|
@@ -414,7 +411,6 @@ class ScmAmendComponent extends React.Component {
|
|
|
414
411
|
this.setState({ amendingCommits: [] });
|
|
415
412
|
}
|
|
416
413
|
}
|
|
417
|
-
exports.ScmAmendComponent = ScmAmendComponent;
|
|
418
414
|
(function (ScmAmendComponent) {
|
|
419
415
|
let Styles;
|
|
420
416
|
(function (Styles) {
|
|
@@ -427,5 +423,5 @@ exports.ScmAmendComponent = ScmAmendComponent;
|
|
|
427
423
|
Styles.LAST_COMMIT_MESSAGE_TIME = 'theia-scm-commit-message-time';
|
|
428
424
|
Styles.FLEX_CENTER = 'theia-scm-flex-container-center';
|
|
429
425
|
})(Styles = ScmAmendComponent.Styles || (ScmAmendComponent.Styles = {}));
|
|
430
|
-
})(ScmAmendComponent || (
|
|
426
|
+
})(ScmAmendComponent || (ScmAmendComponent = {}));
|
|
431
427
|
//# sourceMappingURL=scm-amend-component.js.map
|