@theia/scm 1.77.0-next.0 → 1.77.0-next.101
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/browser/decorations/scm-decorations-service.d.ts +2 -2
- package/lib/browser/decorations/scm-decorations-service.d.ts.map +1 -1
- package/lib/browser/decorations/scm-decorations-service.js +22 -28
- package/lib/browser/decorations/scm-decorations-service.js.map +1 -1
- package/lib/browser/decorations/scm-navigator-decorator.js +22 -28
- package/lib/browser/decorations/scm-navigator-decorator.js.map +1 -1
- package/lib/browser/dirty-diff/content-lines.js +2 -5
- package/lib/browser/dirty-diff/content-lines.js.map +1 -1
- package/lib/browser/dirty-diff/content-lines.spec.js +15 -16
- package/lib/browser/dirty-diff/content-lines.spec.js.map +1 -1
- package/lib/browser/dirty-diff/diff-computer.d.ts +1 -1
- package/lib/browser/dirty-diff/diff-computer.d.ts.map +1 -1
- package/lib/browser/dirty-diff/diff-computer.js +11 -15
- package/lib/browser/dirty-diff/diff-computer.js.map +1 -1
- package/lib/browser/dirty-diff/diff-computer.spec.js +26 -27
- package/lib/browser/dirty-diff/diff-computer.spec.js.map +1 -1
- package/lib/browser/dirty-diff/dirty-diff-decorator.d.ts +1 -1
- package/lib/browser/dirty-diff/dirty-diff-decorator.d.ts.map +1 -1
- package/lib/browser/dirty-diff/dirty-diff-decorator.js +19 -22
- package/lib/browser/dirty-diff/dirty-diff-decorator.js.map +1 -1
- package/lib/browser/dirty-diff/dirty-diff-module.js +11 -14
- package/lib/browser/dirty-diff/dirty-diff-module.js.map +1 -1
- package/lib/browser/dirty-diff/dirty-diff-navigator.d.ts +3 -3
- package/lib/browser/dirty-diff/dirty-diff-navigator.d.ts.map +1 -1
- package/lib/browser/dirty-diff/dirty-diff-navigator.js +30 -40
- package/lib/browser/dirty-diff/dirty-diff-navigator.js.map +1 -1
- package/lib/browser/dirty-diff/dirty-diff-widget.d.ts +1 -1
- package/lib/browser/dirty-diff/dirty-diff-widget.d.ts.map +1 -1
- package/lib/browser/dirty-diff/dirty-diff-widget.js +50 -54
- package/lib/browser/dirty-diff/dirty-diff-widget.js.map +1 -1
- package/lib/browser/merge-editor/merge-editor-contribution.d.ts +2 -2
- package/lib/browser/merge-editor/merge-editor-contribution.d.ts.map +1 -1
- package/lib/browser/merge-editor/merge-editor-contribution.js +43 -49
- package/lib/browser/merge-editor/merge-editor-contribution.js.map +1 -1
- package/lib/browser/merge-editor/merge-editor-dev-contribution.d.ts +2 -2
- package/lib/browser/merge-editor/merge-editor-dev-contribution.d.ts.map +1 -1
- package/lib/browser/merge-editor/merge-editor-dev-contribution.js +35 -45
- package/lib/browser/merge-editor/merge-editor-dev-contribution.js.map +1 -1
- package/lib/browser/merge-editor/merge-editor-module.d.ts +1 -1
- package/lib/browser/merge-editor/merge-editor-module.d.ts.map +1 -1
- package/lib/browser/merge-editor/merge-editor-module.js +49 -54
- package/lib/browser/merge-editor/merge-editor-module.js.map +1 -1
- package/lib/browser/merge-editor/merge-editor.d.ts +5 -5
- package/lib/browser/merge-editor/merge-editor.d.ts.map +1 -1
- package/lib/browser/merge-editor/merge-editor.js +77 -92
- package/lib/browser/merge-editor/merge-editor.js.map +1 -1
- package/lib/browser/merge-editor/model/line-range.js +6 -10
- package/lib/browser/merge-editor/model/line-range.js.map +1 -1
- package/lib/browser/merge-editor/model/live-diff.d.ts +1 -1
- package/lib/browser/merge-editor/model/live-diff.d.ts.map +1 -1
- package/lib/browser/merge-editor/model/live-diff.js +14 -18
- package/lib/browser/merge-editor/model/live-diff.js.map +1 -1
- package/lib/browser/merge-editor/model/merge-editor-model.d.ts +4 -4
- package/lib/browser/merge-editor/model/merge-editor-model.d.ts.map +1 -1
- package/lib/browser/merge-editor/model/merge-editor-model.js +88 -98
- package/lib/browser/merge-editor/model/merge-editor-model.js.map +1 -1
- package/lib/browser/merge-editor/model/merge-range.d.ts +3 -3
- package/lib/browser/merge-editor/model/merge-range.d.ts.map +1 -1
- package/lib/browser/merge-editor/model/merge-range.js +26 -30
- package/lib/browser/merge-editor/model/merge-range.js.map +1 -1
- package/lib/browser/merge-editor/model/range-editing.d.ts +1 -1
- package/lib/browser/merge-editor/model/range-editing.d.ts.map +1 -1
- package/lib/browser/merge-editor/model/range-editing.js +8 -13
- package/lib/browser/merge-editor/model/range-editing.js.map +1 -1
- package/lib/browser/merge-editor/model/range-mapping.d.ts +2 -2
- package/lib/browser/merge-editor/model/range-mapping.d.ts.map +1 -1
- package/lib/browser/merge-editor/model/range-mapping.js +28 -37
- package/lib/browser/merge-editor/model/range-mapping.js.map +1 -1
- package/lib/browser/merge-editor/model/range-mapping.spec.js +19 -21
- package/lib/browser/merge-editor/model/range-mapping.spec.js.map +1 -1
- package/lib/browser/merge-editor/model/range-utils.js +9 -12
- package/lib/browser/merge-editor/model/range-utils.js.map +1 -1
- package/lib/browser/merge-editor/view/diff-spacers.d.ts +1 -1
- package/lib/browser/merge-editor/view/diff-spacers.d.ts.map +1 -1
- package/lib/browser/merge-editor/view/diff-spacers.js +7 -10
- package/lib/browser/merge-editor/view/diff-spacers.js.map +1 -1
- package/lib/browser/merge-editor/view/merge-editor-panes/index.d.ts +5 -5
- package/lib/browser/merge-editor/view/merge-editor-panes/index.d.ts.map +1 -1
- package/lib/browser/merge-editor/view/merge-editor-panes/index.js +5 -8
- package/lib/browser/merge-editor/view/merge-editor-panes/index.js.map +1 -1
- package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-base-pane.d.ts +3 -3
- package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-base-pane.d.ts.map +1 -1
- package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-base-pane.js +11 -15
- package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-base-pane.js.map +1 -1
- package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-pane-header.js +18 -25
- package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-pane-header.js.map +1 -1
- package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-pane.d.ts +5 -5
- package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-pane.d.ts.map +1 -1
- package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-pane.js +48 -58
- package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-pane.js.map +1 -1
- package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-result-pane.d.ts +4 -4
- package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-result-pane.d.ts.map +1 -1
- package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-result-pane.js +32 -38
- package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-result-pane.js.map +1 -1
- package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-side-pane.d.ts +4 -4
- package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-side-pane.d.ts.map +1 -1
- package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-side-pane.js +32 -41
- package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-side-pane.js.map +1 -1
- package/lib/browser/merge-editor/view/merge-editor-scroll-sync.d.ts +2 -2
- package/lib/browser/merge-editor/view/merge-editor-scroll-sync.d.ts.map +1 -1
- package/lib/browser/merge-editor/view/merge-editor-scroll-sync.js +3 -7
- package/lib/browser/merge-editor/view/merge-editor-scroll-sync.js.map +1 -1
- package/lib/browser/merge-editor/view/merge-editor-view-zones.d.ts +5 -5
- package/lib/browser/merge-editor/view/merge-editor-view-zones.d.ts.map +1 -1
- package/lib/browser/merge-editor/view/merge-editor-view-zones.js +18 -25
- package/lib/browser/merge-editor/view/merge-editor-view-zones.js.map +1 -1
- package/lib/browser/merge-editor/view/merge-range-actions.d.ts +2 -2
- package/lib/browser/merge-editor/view/merge-range-actions.d.ts.map +1 -1
- package/lib/browser/merge-editor/view/merge-range-actions.js +34 -38
- package/lib/browser/merge-editor/view/merge-range-actions.js.map +1 -1
- package/lib/browser/multi-diff-editor/multi-diff-editor-module.d.ts +4 -0
- package/lib/browser/multi-diff-editor/multi-diff-editor-module.d.ts.map +1 -0
- package/lib/browser/multi-diff-editor/multi-diff-editor-module.js +31 -0
- package/lib/browser/multi-diff-editor/multi-diff-editor-module.js.map +1 -0
- package/lib/browser/multi-diff-editor/multi-diff-editor-uri.d.ts +15 -0
- package/lib/browser/multi-diff-editor/multi-diff-editor-uri.d.ts.map +1 -0
- package/lib/browser/multi-diff-editor/multi-diff-editor-uri.js +65 -0
- package/lib/browser/multi-diff-editor/multi-diff-editor-uri.js.map +1 -0
- package/lib/browser/multi-diff-editor/multi-diff-editor-widget-factory.d.ts +18 -0
- package/lib/browser/multi-diff-editor/multi-diff-editor-widget-factory.d.ts.map +1 -0
- package/lib/browser/multi-diff-editor/multi-diff-editor-widget-factory.js +72 -0
- package/lib/browser/multi-diff-editor/multi-diff-editor-widget-factory.js.map +1 -0
- package/lib/browser/multi-diff-editor/multi-diff-editor-widget.spec.d.ts +2 -0
- package/lib/browser/multi-diff-editor/multi-diff-editor-widget.spec.d.ts.map +1 -0
- package/lib/browser/multi-diff-editor/multi-diff-editor-widget.spec.js +832 -0
- package/lib/browser/multi-diff-editor/multi-diff-editor-widget.spec.js.map +1 -0
- package/lib/browser/multi-diff-editor/multi-diff-editor.d.ts +163 -0
- package/lib/browser/multi-diff-editor/multi-diff-editor.d.ts.map +1 -0
- package/lib/browser/multi-diff-editor/multi-diff-editor.js +552 -0
- package/lib/browser/multi-diff-editor/multi-diff-editor.js.map +1 -0
- package/lib/browser/multi-diff-editor/multi-diff-editor.spec.d.ts +2 -0
- package/lib/browser/multi-diff-editor/multi-diff-editor.spec.d.ts.map +1 -0
- package/lib/browser/multi-diff-editor/multi-diff-editor.spec.js +165 -0
- package/lib/browser/multi-diff-editor/multi-diff-editor.spec.js.map +1 -0
- package/lib/browser/scm-action-button-widget.d.ts +2 -2
- package/lib/browser/scm-action-button-widget.d.ts.map +1 -1
- package/lib/browser/scm-action-button-widget.js +30 -39
- package/lib/browser/scm-action-button-widget.js.map +1 -1
- package/lib/browser/scm-amend-component.d.ts +3 -3
- package/lib/browser/scm-amend-component.d.ts.map +1 -1
- package/lib/browser/scm-amend-component.js +24 -28
- package/lib/browser/scm-amend-component.js.map +1 -1
- package/lib/browser/scm-amend-widget.d.ts +2 -2
- package/lib/browser/scm-amend-widget.d.ts.map +1 -1
- package/lib/browser/scm-amend-widget.js +26 -36
- package/lib/browser/scm-amend-widget.js.map +1 -1
- package/lib/browser/scm-avatar-service.js +7 -10
- package/lib/browser/scm-avatar-service.js.map +1 -1
- package/lib/browser/scm-colors.js +2 -5
- package/lib/browser/scm-colors.js.map +1 -1
- package/lib/browser/scm-commit-widget.d.ts +2 -2
- package/lib/browser/scm-commit-widget.d.ts.map +1 -1
- package/lib/browser/scm-commit-widget.js +25 -31
- package/lib/browser/scm-commit-widget.js.map +1 -1
- package/lib/browser/scm-context-key-service.js +10 -17
- package/lib/browser/scm-context-key-service.js.map +1 -1
- package/lib/browser/scm-context-key-service.spec.js +33 -35
- package/lib/browser/scm-context-key-service.spec.js.map +1 -1
- package/lib/browser/scm-contribution.d.ts +8 -8
- package/lib/browser/scm-contribution.d.ts.map +1 -1
- package/lib/browser/scm-contribution.js +114 -131
- package/lib/browser/scm-contribution.js.map +1 -1
- package/lib/browser/scm-frontend-module.d.ts.map +1 -1
- package/lib/browser/scm-frontend-module.js +99 -101
- package/lib/browser/scm-frontend-module.js.map +1 -1
- package/lib/browser/scm-groups-tree-model.d.ts +3 -3
- package/lib/browser/scm-groups-tree-model.d.ts.map +1 -1
- package/lib/browser/scm-groups-tree-model.js +15 -22
- package/lib/browser/scm-groups-tree-model.js.map +1 -1
- package/lib/browser/scm-history-graph-contribution.d.ts +4 -4
- package/lib/browser/scm-history-graph-contribution.d.ts.map +1 -1
- package/lib/browser/scm-history-graph-contribution.js +52 -60
- package/lib/browser/scm-history-graph-contribution.js.map +1 -1
- package/lib/browser/scm-history-graph-contribution.spec.js +35 -37
- package/lib/browser/scm-history-graph-contribution.spec.js.map +1 -1
- package/lib/browser/scm-history-graph-helpers.d.ts +1 -1
- package/lib/browser/scm-history-graph-helpers.d.ts.map +1 -1
- package/lib/browser/scm-history-graph-helpers.js +14 -30
- package/lib/browser/scm-history-graph-helpers.js.map +1 -1
- package/lib/browser/scm-history-graph-helpers.spec.js +44 -46
- package/lib/browser/scm-history-graph-helpers.spec.js.map +1 -1
- package/lib/browser/scm-history-graph-lanes.js +1 -4
- package/lib/browser/scm-history-graph-lanes.js.map +1 -1
- package/lib/browser/scm-history-graph-lanes.spec.js +135 -137
- package/lib/browser/scm-history-graph-lanes.spec.js.map +1 -1
- package/lib/browser/scm-history-graph-model.d.ts +4 -4
- package/lib/browser/scm-history-graph-model.d.ts.map +1 -1
- package/lib/browser/scm-history-graph-model.js +34 -43
- package/lib/browser/scm-history-graph-model.js.map +1 -1
- package/lib/browser/scm-history-graph-model.spec.js +74 -76
- package/lib/browser/scm-history-graph-model.spec.js.map +1 -1
- package/lib/browser/scm-history-graph-tooltip.d.ts +2 -2
- package/lib/browser/scm-history-graph-tooltip.d.ts.map +1 -1
- package/lib/browser/scm-history-graph-tooltip.js +33 -42
- package/lib/browser/scm-history-graph-tooltip.js.map +1 -1
- package/lib/browser/scm-history-graph-tooltip.spec.js +63 -65
- package/lib/browser/scm-history-graph-tooltip.spec.js.map +1 -1
- package/lib/browser/scm-history-graph-widget.d.ts +7 -7
- package/lib/browser/scm-history-graph-widget.d.ts.map +1 -1
- package/lib/browser/scm-history-graph-widget.js +116 -134
- package/lib/browser/scm-history-graph-widget.js.map +1 -1
- package/lib/browser/scm-history-graph-widget.spec.js +40 -42
- package/lib/browser/scm-history-graph-widget.spec.js.map +1 -1
- package/lib/browser/scm-input.js +10 -14
- package/lib/browser/scm-input.js.map +1 -1
- package/lib/browser/scm-layout-migrations.js +15 -18
- package/lib/browser/scm-layout-migrations.js.map +1 -1
- package/lib/browser/scm-provider.d.ts +2 -0
- package/lib/browser/scm-provider.d.ts.map +1 -1
- package/lib/browser/scm-provider.js +1 -4
- package/lib/browser/scm-provider.js.map +1 -1
- package/lib/browser/scm-quick-open-service.d.ts +1 -1
- package/lib/browser/scm-quick-open-service.d.ts.map +1 -1
- package/lib/browser/scm-quick-open-service.js +20 -27
- package/lib/browser/scm-quick-open-service.js.map +1 -1
- package/lib/browser/scm-repositories-widget.d.ts +4 -4
- package/lib/browser/scm-repositories-widget.d.ts.map +1 -1
- package/lib/browser/scm-repositories-widget.js +55 -67
- package/lib/browser/scm-repositories-widget.js.map +1 -1
- package/lib/browser/scm-repositories-widget.spec.js +86 -88
- package/lib/browser/scm-repositories-widget.spec.js.map +1 -1
- package/lib/browser/scm-repository.d.ts +2 -2
- package/lib/browser/scm-repository.d.ts.map +1 -1
- package/lib/browser/scm-repository.js +6 -10
- package/lib/browser/scm-repository.js.map +1 -1
- package/lib/browser/scm-service.d.ts +3 -3
- package/lib/browser/scm-service.d.ts.map +1 -1
- package/lib/browser/scm-service.js +18 -22
- package/lib/browser/scm-service.js.map +1 -1
- package/lib/browser/scm-service.spec.js +15 -17
- package/lib/browser/scm-service.spec.js.map +1 -1
- package/lib/browser/scm-tree-label-provider.d.ts +1 -1
- package/lib/browser/scm-tree-label-provider.d.ts.map +1 -1
- package/lib/browser/scm-tree-label-provider.js +16 -20
- package/lib/browser/scm-tree-label-provider.js.map +1 -1
- package/lib/browser/scm-tree-model.d.ts +2 -2
- package/lib/browser/scm-tree-model.d.ts.map +1 -1
- package/lib/browser/scm-tree-model.js +27 -32
- package/lib/browser/scm-tree-model.js.map +1 -1
- package/lib/browser/scm-tree-widget.d.ts +4 -4
- package/lib/browser/scm-tree-widget.d.ts.map +1 -1
- package/lib/browser/scm-tree-widget.js +98 -122
- package/lib/browser/scm-tree-widget.js.map +1 -1
- package/lib/browser/scm-widget.d.ts +6 -6
- package/lib/browser/scm-widget.d.ts.map +1 -1
- package/lib/browser/scm-widget.js +49 -64
- package/lib/browser/scm-widget.js.map +1 -1
- package/lib/common/scm-preferences.js +21 -26
- package/lib/common/scm-preferences.js.map +1 -1
- package/lib/node/scm-backend-module.js +4 -6
- package/lib/node/scm-backend-module.js.map +1 -1
- package/package.json +15 -6
- package/src/browser/decorations/scm-decorations-service.ts +5 -5
- package/src/browser/dirty-diff/content-lines.spec.ts +3 -2
- package/src/browser/dirty-diff/diff-computer.spec.ts +4 -3
- package/src/browser/dirty-diff/diff-computer.ts +1 -1
- package/src/browser/dirty-diff/dirty-diff-decorator.ts +1 -1
- package/src/browser/dirty-diff/dirty-diff-module.ts +3 -3
- package/src/browser/dirty-diff/dirty-diff-navigator.ts +4 -4
- package/src/browser/dirty-diff/dirty-diff-widget.ts +2 -2
- package/src/browser/merge-editor/merge-editor-contribution.ts +2 -2
- package/src/browser/merge-editor/merge-editor-dev-contribution.ts +1 -1
- package/src/browser/merge-editor/merge-editor-module.ts +7 -7
- package/src/browser/merge-editor/merge-editor.ts +5 -5
- package/src/browser/merge-editor/model/live-diff.ts +2 -2
- package/src/browser/merge-editor/model/merge-editor-model.ts +8 -8
- package/src/browser/merge-editor/model/merge-range.ts +4 -4
- package/src/browser/merge-editor/model/range-editing.ts +1 -1
- package/src/browser/merge-editor/model/range-mapping.spec.ts +1 -1
- package/src/browser/merge-editor/model/range-mapping.ts +3 -3
- package/src/browser/merge-editor/view/diff-spacers.ts +1 -1
- package/src/browser/merge-editor/view/merge-editor-panes/index.ts +5 -5
- package/src/browser/merge-editor/view/merge-editor-panes/merge-editor-base-pane.ts +3 -3
- package/src/browser/merge-editor/view/merge-editor-panes/merge-editor-pane.ts +7 -7
- package/src/browser/merge-editor/view/merge-editor-panes/merge-editor-result-pane.ts +4 -4
- package/src/browser/merge-editor/view/merge-editor-panes/merge-editor-side-pane.ts +4 -4
- package/src/browser/merge-editor/view/merge-editor-scroll-sync.ts +2 -2
- package/src/browser/merge-editor/view/merge-editor-view-zones.ts +5 -5
- package/src/browser/merge-editor/view/merge-range-actions.ts +2 -2
- package/src/browser/multi-diff-editor/multi-diff-editor-module.ts +35 -0
- package/src/browser/multi-diff-editor/multi-diff-editor-uri.ts +83 -0
- package/src/browser/multi-diff-editor/multi-diff-editor-widget-factory.ts +81 -0
- package/src/browser/multi-diff-editor/multi-diff-editor-widget.spec.ts +878 -0
- package/src/browser/multi-diff-editor/multi-diff-editor.spec.ts +189 -0
- package/src/browser/multi-diff-editor/multi-diff-editor.ts +628 -0
- package/src/browser/scm-action-button-widget.tsx +3 -3
- package/src/browser/scm-amend-component.tsx +3 -3
- package/src/browser/scm-amend-widget.tsx +3 -3
- package/src/browser/scm-commit-widget.tsx +2 -2
- package/src/browser/scm-context-key-service.spec.ts +3 -3
- package/src/browser/scm-contribution.ts +8 -8
- package/src/browser/scm-frontend-module.ts +25 -22
- package/src/browser/scm-groups-tree-model.ts +3 -3
- package/src/browser/scm-history-graph-contribution.spec.ts +3 -3
- package/src/browser/scm-history-graph-contribution.ts +6 -6
- package/src/browser/scm-history-graph-helpers.spec.ts +2 -2
- package/src/browser/scm-history-graph-helpers.ts +1 -1
- package/src/browser/scm-history-graph-lanes.spec.ts +1 -1
- package/src/browser/scm-history-graph-model.spec.ts +3 -3
- package/src/browser/scm-history-graph-model.ts +5 -5
- package/src/browser/scm-history-graph-tooltip.spec.ts +3 -3
- package/src/browser/scm-history-graph-tooltip.ts +3 -3
- package/src/browser/scm-history-graph-widget.spec.ts +4 -4
- package/src/browser/scm-history-graph-widget.tsx +8 -8
- package/src/browser/scm-input.ts +1 -1
- package/src/browser/scm-layout-migrations.ts +1 -1
- package/src/browser/scm-provider.ts +2 -0
- package/src/browser/scm-quick-open-service.ts +1 -1
- package/src/browser/scm-repositories-widget.spec.ts +2 -2
- package/src/browser/scm-repositories-widget.tsx +4 -4
- package/src/browser/scm-repository.ts +2 -2
- package/src/browser/scm-service.spec.ts +2 -2
- package/src/browser/scm-service.ts +3 -3
- package/src/browser/scm-tree-label-provider.ts +1 -1
- package/src/browser/scm-tree-model.ts +2 -2
- package/src/browser/scm-tree-widget.tsx +4 -4
- package/src/browser/scm-widget.tsx +6 -6
- package/src/browser/style/multi-diff-editor.css +113 -0
- package/src/node/scm-backend-module.ts +1 -1
|
@@ -1,9 +1,6 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
var ScmHistoryGraphWidget_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, jsxs as _jsxs } from "@theia/core/shared/react/jsx-runtime";
|
|
7
4
|
// *****************************************************************************
|
|
8
5
|
// Copyright (C) 2026 EclipseSource GmbH and others.
|
|
9
6
|
//
|
|
@@ -19,35 +16,35 @@ 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
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
19
|
+
import * as React from '@theia/core/shared/react';
|
|
20
|
+
import { Virtuoso } from '@theia/core/shared/react-virtuoso';
|
|
21
|
+
import { injectable, inject, postConstruct, named } from '@theia/core/shared/inversify';
|
|
22
|
+
import { ReactWidget } from '@theia/core/lib/browser/widgets/react-widget';
|
|
23
|
+
import { LabelProvider } from '@theia/core/lib/browser/label-provider';
|
|
24
|
+
import { HoverService } from '@theia/core/lib/browser/hover-service';
|
|
25
|
+
import { ClipboardService } from '@theia/core/lib/browser/clipboard-service';
|
|
26
|
+
import { MarkdownRendererFactory } from '@theia/core/lib/browser/markdown-rendering/markdown-renderer';
|
|
27
|
+
import { ScmHistoryGraphModel } from './scm-history-graph-model.js';
|
|
28
|
+
import { ScmService } from './scm-service.js';
|
|
29
|
+
import URI from '@theia/core/lib/common/uri';
|
|
30
|
+
import { nls } from '@theia/core/lib/common/nls';
|
|
31
|
+
import { CancellationTokenSource } from '@theia/core/lib/common/cancellation';
|
|
32
|
+
import { DisposableCollection } from '@theia/core/lib/common/disposable';
|
|
33
|
+
import { Emitter } from '@theia/core/lib/common/event';
|
|
34
|
+
import { ContextMenuRenderer } from '@theia/core/lib/browser/context-menu-renderer';
|
|
35
|
+
import { OpenerService, open } from '@theia/core/lib/browser/opener-service';
|
|
36
|
+
import { DiffUris } from '@theia/core/lib/browser/diff-uris';
|
|
37
|
+
import { ScmContextKeyService } from './scm-context-key-service.js';
|
|
38
|
+
import { ScmPreferences } from '../common/scm-preferences.js';
|
|
39
|
+
import { laneColor, filterRefsForBadges, getChangeStatus, getFileName, getFilePath, getRepoRelativePath, getRefBadgeClass, getRefBadgePresentation, isTagRef, isRemoteRef, deduplicateRefs, buildChangeTreeRows } from './scm-history-graph-helpers.js';
|
|
40
|
+
import { ILogger } from '@theia/core';
|
|
41
|
+
import { buildHtmlTooltip, buildProviderTooltip } from './scm-history-graph-tooltip.js';
|
|
45
42
|
/** Menu path matching the VS Code 'scm/history/title' contribution point (graph section toolbar). */
|
|
46
|
-
|
|
43
|
+
export const SCM_HISTORY_TITLE_MENU = ['plugin_scm/history/title'];
|
|
47
44
|
/** Menu path matching the VS Code 'scm/historyItem/context' contribution point (commit row context menu). */
|
|
48
|
-
|
|
45
|
+
export const SCM_HISTORY_ITEM_CONTEXT_MENU = ['plugin_scm/historyItem/context'];
|
|
49
46
|
/** Menu path matching the VS Code 'scm/historyItemRef/context' contribution point (ref badge context menu). */
|
|
50
|
-
|
|
47
|
+
export const SCM_HISTORY_ITEM_REF_CONTEXT_MENU = ['plugin_scm/historyItemRef/context'];
|
|
51
48
|
// ── Layout constants ────────────────────────────────────────────────────────
|
|
52
49
|
const ROW_HEIGHT = 22;
|
|
53
50
|
/** Horizontal width of each lane column in the SVG — matches VS Code exactly. */
|
|
@@ -67,13 +64,13 @@ function indentStyle(depth) {
|
|
|
67
64
|
}
|
|
68
65
|
/** Renders a ref badge as a JSX element for the commit row. */
|
|
69
66
|
function renderJsxRefBadge(ref, iconClass, showText, style, key, onContextMenu) {
|
|
70
|
-
return ((
|
|
67
|
+
return (_jsxs("span", { className: `scm-history-ref-badge ${getRefBadgeClass(ref)}`, title: ref.description ?? ref.name, style: style, onContextMenu: onContextMenu, children: [_jsx("i", { className: `codicon ${iconClass} scm-history-ref-icon` }), showText && _jsx("span", { className: 'scm-history-ref-text', children: ref.name })] }, key));
|
|
71
68
|
}
|
|
72
69
|
// ── Widget ──────────────────────────────────────────────────────────────────
|
|
73
|
-
let ScmHistoryGraphWidget = class ScmHistoryGraphWidget extends
|
|
70
|
+
let ScmHistoryGraphWidget = class ScmHistoryGraphWidget extends ReactWidget {
|
|
74
71
|
static { ScmHistoryGraphWidget_1 = this; }
|
|
75
72
|
static { this.ID = 'scm-history-graph-widget'; }
|
|
76
|
-
static { this.LABEL =
|
|
73
|
+
static { this.LABEL = nls.localizeByDefault('Graph'); }
|
|
77
74
|
constructor() {
|
|
78
75
|
super();
|
|
79
76
|
this.selectedIndex = -1;
|
|
@@ -88,8 +85,8 @@ let ScmHistoryGraphWidget = class ScmHistoryGraphWidget extends react_widget_1.R
|
|
|
88
85
|
/** Map from commit id → in-flight CancellationTokenSource for loadChanges. */
|
|
89
86
|
this.loadChangesCts = new Map();
|
|
90
87
|
/** Cleanup for the content of the hover currently being shown. */
|
|
91
|
-
this.toDisposeOnHover = new
|
|
92
|
-
this.onDidChangeToolbarItemsEmitter = new
|
|
88
|
+
this.toDisposeOnHover = new DisposableCollection();
|
|
89
|
+
this.onDidChangeToolbarItemsEmitter = new Emitter();
|
|
93
90
|
/** Re-renders the part toolbar on model changes, e.g. to reflect the toggled state of the ref filter picker. */
|
|
94
91
|
this.onDidChangeToolbarItems = this.onDidChangeToolbarItemsEmitter.event;
|
|
95
92
|
this.handleEndReached = () => {
|
|
@@ -135,7 +132,7 @@ let ScmHistoryGraphWidget = class ScmHistoryGraphWidget extends react_widget_1.R
|
|
|
135
132
|
? [{ sourceControlHandle }, { sourceControlHandle, id: item.id, type: 'historyItem' }]
|
|
136
133
|
: [];
|
|
137
134
|
this.contextMenuRenderer.render({
|
|
138
|
-
menuPath:
|
|
135
|
+
menuPath: SCM_HISTORY_ITEM_CONTEXT_MENU,
|
|
139
136
|
anchor: e.nativeEvent,
|
|
140
137
|
args,
|
|
141
138
|
context: this.node
|
|
@@ -154,7 +151,7 @@ let ScmHistoryGraphWidget = class ScmHistoryGraphWidget extends react_widget_1.R
|
|
|
154
151
|
? [{ sourceControlHandle }, { sourceControlHandle, id: ref.id, type: 'historyItemRef' }]
|
|
155
152
|
: [];
|
|
156
153
|
this.contextMenuRenderer.render({
|
|
157
|
-
menuPath:
|
|
154
|
+
menuPath: SCM_HISTORY_ITEM_REF_CONTEXT_MENU,
|
|
158
155
|
anchor: e.nativeEvent,
|
|
159
156
|
args,
|
|
160
157
|
context: this.node
|
|
@@ -242,9 +239,9 @@ let ScmHistoryGraphWidget = class ScmHistoryGraphWidget extends react_widget_1.R
|
|
|
242
239
|
// render a loading indicator to avoid a flash of "no history" on startup.
|
|
243
240
|
if (!loading && entries.length === 0) {
|
|
244
241
|
if (!this.model.hasAttemptedLoad) {
|
|
245
|
-
return ((
|
|
242
|
+
return (_jsx("div", { className: 'scm-history-loading', children: nls.localizeByDefault('Loading') }));
|
|
246
243
|
}
|
|
247
|
-
return ((
|
|
244
|
+
return (_jsx("div", { className: 'scm-history-empty', children: nls.localize('theia/scm/noHistory', 'No source control history available.') }));
|
|
248
245
|
}
|
|
249
246
|
// Determine how many lanes are active for SVG width
|
|
250
247
|
const maxLane = entries.reduce((max, e) => {
|
|
@@ -253,11 +250,11 @@ let ScmHistoryGraphWidget = class ScmHistoryGraphWidget extends react_widget_1.R
|
|
|
253
250
|
}, 0);
|
|
254
251
|
const svgWidth = (maxLane + 1) * LANE_WIDTH;
|
|
255
252
|
const footer = loading
|
|
256
|
-
? () => (
|
|
253
|
+
? () => _jsx("div", { className: 'scm-history-loading', children: nls.localizeByDefault('Loading') })
|
|
257
254
|
: hasMore
|
|
258
|
-
? () => ((
|
|
255
|
+
? () => (_jsx("div", { className: 'scm-history-load-more', onClick: this.handleLoadMore, role: 'button', tabIndex: 0, onKeyDown: this.handleLoadMoreKey, children: nls.localizeByDefault('Load more') }))
|
|
259
256
|
: undefined;
|
|
260
|
-
return ((
|
|
257
|
+
return (_jsx(Virtuoso, { ref: this.listRef, className: 'scm-history-graph-list', data: entries, itemContent: (idx, entry) => this.renderRow(entry, idx, svgWidth), endReached: hasMore && !loading && this.scmPreferences['scm.graph.pageOnScroll'] !== false ? this.handleEndReached : undefined, overscan: 500, components: footer ? { Footer: footer } : {}, style: { overflowX: 'hidden' } }));
|
|
261
258
|
}
|
|
262
259
|
renderRow(entry, idx, svgWidth) {
|
|
263
260
|
const { item, graphRow } = entry;
|
|
@@ -265,7 +262,7 @@ let ScmHistoryGraphWidget = class ScmHistoryGraphWidget extends react_widget_1.R
|
|
|
265
262
|
const isExpanded = this.expandedIds.has(item.id);
|
|
266
263
|
const changes = this.expandedChanges.get(item.id);
|
|
267
264
|
const isHead = entry.isCurrent;
|
|
268
|
-
return ((
|
|
265
|
+
return (_jsxs(React.Fragment, { children: [_jsxs("div", { className: `scm-history-graph-row${isSelected ? ' selected' : ''}`, onClick: () => this.handleRowClick(idx, entry), onContextMenu: e => this.handleRowContextMenu(e, entry), onMouseEnter: e => this.handleRowMouseEnter(e, entry), children: [this.renderGraphSvg(graphRow, svgWidth, isHead), _jsxs("div", { className: 'scm-history-graph-info', children: [_jsx("span", { className: 'scm-history-subject', children: item.subject }), item.author && (_jsx("span", { className: 'scm-history-author', children: item.author })), item.references && item.references.length > 0 && (_jsx("span", { className: 'scm-history-badges scm-history-badges-right', children: this.renderRefBadges(item.references, entry) }))] })] }), isExpanded && this.renderChangesRows(item.id, svgWidth, graphRow, changes)] }, item.id));
|
|
269
266
|
}
|
|
270
267
|
get markdownRenderer() {
|
|
271
268
|
this._markdownRenderer ||= this.markdownRendererFactory();
|
|
@@ -279,12 +276,12 @@ let ScmHistoryGraphWidget = class ScmHistoryGraphWidget extends react_widget_1.R
|
|
|
279
276
|
buildTooltip(entry) {
|
|
280
277
|
const { tooltip } = entry.item;
|
|
281
278
|
if (tooltip) {
|
|
282
|
-
const provided =
|
|
279
|
+
const provided = buildProviderTooltip(tooltip, this.markdownRenderer, this.openerService, this.toDisposeOnHover);
|
|
283
280
|
if (provided) {
|
|
284
281
|
return provided;
|
|
285
282
|
}
|
|
286
283
|
}
|
|
287
|
-
return
|
|
284
|
+
return buildHtmlTooltip(entry, this.markdownRenderer, this.model.provider, {
|
|
288
285
|
openCommit: () => this.openCommitFromTooltip(entry),
|
|
289
286
|
copyCommitHash: () => this.clipboardService.writeText(entry.item.id),
|
|
290
287
|
});
|
|
@@ -306,23 +303,23 @@ let ScmHistoryGraphWidget = class ScmHistoryGraphWidget extends react_widget_1.R
|
|
|
306
303
|
}
|
|
307
304
|
renderChangesRows(itemId, svgWidth, graphRow, changes) {
|
|
308
305
|
if (changes === 'loading' || changes === undefined) {
|
|
309
|
-
return ((
|
|
306
|
+
return (_jsx("div", { className: 'scm-history-changes-loading', children: nls.localizeByDefault('Loading') }, `${itemId}-loading`));
|
|
310
307
|
}
|
|
311
308
|
if (changes.length === 0) {
|
|
312
|
-
return ((
|
|
309
|
+
return (_jsx("div", { className: 'scm-history-changes-empty', children: nls.localize('theia/scm/noChanges', 'No changed files.') }, `${itemId}-empty`));
|
|
313
310
|
}
|
|
314
311
|
if (this.model.viewMode === 'tree') {
|
|
315
312
|
const rootUri = this.scmService.selectedRepository?.provider.rootUri;
|
|
316
|
-
const rows =
|
|
317
|
-
return ((
|
|
313
|
+
const rows = buildChangeTreeRows(changes, rootUri, this.collapsedFolders.get(itemId) ?? EMPTY_FOLDER_SET);
|
|
314
|
+
return (_jsx(React.Fragment, { children: rows.map(row => row.type === 'folder'
|
|
318
315
|
? this.renderChangeFolderRow(row, itemId, svgWidth, graphRow)
|
|
319
316
|
: this.renderChangeRow(row.change, row.index, itemId, svgWidth, graphRow, row.depth)) }, `${itemId}-changes`));
|
|
320
317
|
}
|
|
321
|
-
return ((
|
|
318
|
+
return (_jsx(React.Fragment, { children: changes.map((change, ci) => this.renderChangeRow(change, ci, itemId, svgWidth, graphRow)) }, `${itemId}-changes`));
|
|
322
319
|
}
|
|
323
320
|
renderChangeFolderRow(row, itemId, svgWidth, graphRow) {
|
|
324
321
|
const collapsed = this.isFolderCollapsed(itemId, row.path);
|
|
325
|
-
return ((
|
|
322
|
+
return (_jsxs("div", { className: 'scm-history-change-row scm-history-change-folder-row', onClick: e => this.handleFolderClick(e, itemId, row.path), role: 'treeitem', "aria-expanded": !collapsed, tabIndex: -1, children: [this.renderChangeRowSvg(graphRow, svgWidth), _jsxs("div", { className: 'scm-history-change-info', style: indentStyle(row.depth), children: [_jsx("span", { className: `codicon ${collapsed ? 'codicon-chevron-right' : 'codicon-chevron-down'} scm-history-change-twistie` }), _jsx("span", { className: 'name scm-history-change-name', title: row.path, children: row.label })] })] }, `${itemId}-folder-${row.path}`));
|
|
326
323
|
}
|
|
327
324
|
isFolderCollapsed(itemId, path) {
|
|
328
325
|
return !!this.collapsedFolders.get(itemId)?.has(path);
|
|
@@ -341,36 +338,36 @@ let ScmHistoryGraphWidget = class ScmHistoryGraphWidget extends react_widget_1.R
|
|
|
341
338
|
renderChangeRow(change, ci, itemId, svgWidth, graphRow, depth = 0) {
|
|
342
339
|
const rootUri = this.scmService.selectedRepository?.provider.rootUri;
|
|
343
340
|
const uri = change.modifiedUri ?? change.originalUri ?? change.uri;
|
|
344
|
-
const relativePath =
|
|
345
|
-
const fileName =
|
|
341
|
+
const relativePath = getRepoRelativePath(uri, rootUri);
|
|
342
|
+
const fileName = getFileName(relativePath);
|
|
346
343
|
// In tree mode the folder rows already carry the directory.
|
|
347
344
|
const dirPath = this.model.viewMode === 'list' && relativePath.includes('/')
|
|
348
345
|
? relativePath.slice(0, relativePath.lastIndexOf('/'))
|
|
349
346
|
: '';
|
|
350
|
-
const status =
|
|
347
|
+
const status = getChangeStatus(change);
|
|
351
348
|
const statusClass = status === 'A' ? 'added' : status === 'D' ? 'deleted' : status === 'R' ? 'renamed' : 'modified';
|
|
352
|
-
const resourceUri = new
|
|
349
|
+
const resourceUri = new URI(uri);
|
|
353
350
|
const fileIcon = this.labelProvider.getIcon(resourceUri);
|
|
354
351
|
const changeKey = `${itemId}-change-${ci}`;
|
|
355
352
|
const isSelected = this.selectedChangeKey === changeKey;
|
|
356
|
-
return ((
|
|
353
|
+
return (_jsxs("div", { className: `scm-history-change-row${isSelected ? ' selected' : ''}`, onClick: e => this.handleChangeClick(e, change, changeKey), role: 'treeitem', tabIndex: -1, children: [this.renderChangeRowSvg(graphRow, svgWidth), _jsxs("div", { className: 'scm-history-change-info', style: indentStyle(depth), children: [_jsx("span", { className: `${fileIcon} file-icon scm-history-change-file-icon` }), _jsxs("div", { className: 'scm-history-change-name-container', children: [_jsx("span", { className: 'name scm-history-change-name', title: relativePath, children: fileName }), dirPath && _jsx("span", { className: 'path scm-history-change-dir', children: dirPath })] }), _jsx("span", { className: `scm-history-change-status ${statusClass}`, children: status })] })] }, changeKey));
|
|
357
354
|
}
|
|
358
355
|
openChange(change) {
|
|
359
356
|
try {
|
|
360
357
|
if (change.originalUri && change.modifiedUri) {
|
|
361
|
-
const originalUri = new
|
|
362
|
-
const modifiedUri = new
|
|
363
|
-
const label =
|
|
364
|
-
|
|
358
|
+
const originalUri = new URI(change.originalUri);
|
|
359
|
+
const modifiedUri = new URI(change.modifiedUri);
|
|
360
|
+
const label = getFileName(getFilePath(change.modifiedUri));
|
|
361
|
+
open(this.openerService, DiffUris.encode(originalUri, modifiedUri, label));
|
|
365
362
|
}
|
|
366
363
|
else if (change.modifiedUri) {
|
|
367
|
-
|
|
364
|
+
open(this.openerService, new URI(change.modifiedUri));
|
|
368
365
|
}
|
|
369
366
|
else if (change.originalUri) {
|
|
370
|
-
|
|
367
|
+
open(this.openerService, new URI(change.originalUri));
|
|
371
368
|
}
|
|
372
369
|
else {
|
|
373
|
-
|
|
370
|
+
open(this.openerService, new URI(change.uri));
|
|
374
371
|
}
|
|
375
372
|
}
|
|
376
373
|
catch (err) {
|
|
@@ -379,7 +376,7 @@ let ScmHistoryGraphWidget = class ScmHistoryGraphWidget extends react_widget_1.R
|
|
|
379
376
|
}
|
|
380
377
|
renderChangeRowSvg(graphRow, svgWidth) {
|
|
381
378
|
const commitX = graphRow.lane * LANE_WIDTH + 11;
|
|
382
|
-
const commitColor =
|
|
379
|
+
const commitColor = laneColor(graphRow.color);
|
|
383
380
|
const elements = [];
|
|
384
381
|
let keyIdx = 0;
|
|
385
382
|
for (const edge of graphRow.edges) {
|
|
@@ -387,13 +384,13 @@ let ScmHistoryGraphWidget = class ScmHistoryGraphWidget extends react_widget_1.R
|
|
|
387
384
|
continue;
|
|
388
385
|
}
|
|
389
386
|
const x = edge.fromLane * LANE_WIDTH + 11;
|
|
390
|
-
const color =
|
|
391
|
-
elements.push((
|
|
387
|
+
const color = laneColor(edge.color);
|
|
388
|
+
elements.push(_jsx("path", { fill: 'none', strokeWidth: '1px', strokeLinecap: 'round', d: `M ${x} 0 V 22`, style: { stroke: color } }, `pass-${keyIdx++}`));
|
|
392
389
|
}
|
|
393
390
|
if (graphRow.hasContinuation) {
|
|
394
|
-
elements.push((
|
|
391
|
+
elements.push(_jsx("path", { fill: 'none', strokeWidth: '1px', strokeLinecap: 'round', d: `M ${commitX} 0 V 22`, style: { stroke: commitColor } }, `commit-${keyIdx++}`));
|
|
395
392
|
}
|
|
396
|
-
return ((
|
|
393
|
+
return (_jsx("svg", { className: 'scm-history-graph-svg', style: { height: `${ROW_HEIGHT}px`, width: `${svgWidth}px` }, children: elements }));
|
|
397
394
|
}
|
|
398
395
|
/**
|
|
399
396
|
* Renders the SVG graph column for a commit row, matching VS Code's SVG structure:
|
|
@@ -411,7 +408,7 @@ let ScmHistoryGraphWidget = class ScmHistoryGraphWidget extends react_widget_1.R
|
|
|
411
408
|
renderGraphSvg(row, svgWidth, isHead) {
|
|
412
409
|
const commitX = row.lane * LANE_WIDTH + 11;
|
|
413
410
|
const cy = DOT_CY;
|
|
414
|
-
const commitColor =
|
|
411
|
+
const commitColor = laneColor(row.color);
|
|
415
412
|
const elements = [];
|
|
416
413
|
let keyIdx = 0;
|
|
417
414
|
// Pass-through lines: straight vertical line through the full row height
|
|
@@ -420,8 +417,8 @@ let ScmHistoryGraphWidget = class ScmHistoryGraphWidget extends react_widget_1.R
|
|
|
420
417
|
continue;
|
|
421
418
|
}
|
|
422
419
|
const x = edge.fromLane * LANE_WIDTH + 11;
|
|
423
|
-
const color =
|
|
424
|
-
elements.push((
|
|
420
|
+
const color = laneColor(edge.color);
|
|
421
|
+
elements.push(_jsx("path", { fill: 'none', strokeWidth: '1px', strokeLinecap: 'round', d: `M ${x} 0 V 22`, style: { stroke: color } }, `pass-${keyIdx++}`));
|
|
425
422
|
}
|
|
426
423
|
// Merge-in edges: source lane at top curves into the commit position (mid-row)
|
|
427
424
|
for (const edge of row.edges) {
|
|
@@ -429,11 +426,11 @@ let ScmHistoryGraphWidget = class ScmHistoryGraphWidget extends react_widget_1.R
|
|
|
429
426
|
continue;
|
|
430
427
|
}
|
|
431
428
|
const srcX = edge.fromLane * LANE_WIDTH + 11;
|
|
432
|
-
const color =
|
|
429
|
+
const color = laneColor(edge.color);
|
|
433
430
|
// Cubic bezier: start at (srcX, 0), control points pull both ends to mid-row,
|
|
434
431
|
// end at commit position (commitX, cy)
|
|
435
432
|
const d = `M ${srcX} 0 C ${srcX} ${cy}, ${commitX} ${cy}, ${commitX} ${cy}`;
|
|
436
|
-
elements.push((
|
|
433
|
+
elements.push(_jsx("path", { fill: 'none', strokeWidth: '1px', strokeLinecap: 'round', d: d, style: { stroke: color } }, `merge-${keyIdx++}`));
|
|
437
434
|
}
|
|
438
435
|
// Commit lane lines — split at cy=11
|
|
439
436
|
// Top segment: only drawn if there is an incoming line from above
|
|
@@ -441,11 +438,11 @@ let ScmHistoryGraphWidget = class ScmHistoryGraphWidget extends react_widget_1.R
|
|
|
441
438
|
// It keeps the color inherited from the chain above, which may differ
|
|
442
439
|
// from the commit's own (ref-based) color.
|
|
443
440
|
if (row.hasTopLine) {
|
|
444
|
-
elements.push((
|
|
441
|
+
elements.push(_jsx("path", { fill: 'none', strokeWidth: '1px', strokeLinecap: 'round', d: `M ${commitX} 0 V ${cy}`, style: { stroke: laneColor(row.topColor) } }, `top-${keyIdx++}`));
|
|
445
442
|
}
|
|
446
443
|
// Bottom segment: only drawn if the lane continues to a parent below
|
|
447
444
|
if (row.hasContinuation) {
|
|
448
|
-
elements.push((
|
|
445
|
+
elements.push(_jsx("path", { fill: 'none', strokeWidth: '1px', strokeLinecap: 'round', d: `M ${commitX} ${cy} V 22`, style: { stroke: commitColor } }, `bottom-${keyIdx++}`));
|
|
449
446
|
}
|
|
450
447
|
// Branch-out edges: commit position (mid-row) curves down to a new lane at bottom
|
|
451
448
|
for (const edge of row.edges) {
|
|
@@ -453,35 +450,35 @@ let ScmHistoryGraphWidget = class ScmHistoryGraphWidget extends react_widget_1.R
|
|
|
453
450
|
continue;
|
|
454
451
|
}
|
|
455
452
|
const dstX = edge.toLane * LANE_WIDTH + 11;
|
|
456
|
-
const color =
|
|
453
|
+
const color = laneColor(edge.color);
|
|
457
454
|
// Diagonal S-curve bezier: CP1 keeps x at srcX while y goes to bottom;
|
|
458
455
|
// CP2 keeps y at cy while x reaches dstX — produces a smooth sweep
|
|
459
456
|
// down-and-right (or left) from the commit circle to the target lane.
|
|
460
457
|
const srcX = edge.fromLane * LANE_WIDTH + 11;
|
|
461
458
|
const d = `M ${srcX} ${cy} C ${srcX} 22, ${dstX} ${cy}, ${dstX} 22`;
|
|
462
|
-
elements.push((
|
|
459
|
+
elements.push(_jsx("path", { fill: 'none', strokeWidth: '1px', strokeLinecap: 'round', d: d, style: { stroke: color } }, `branch-${keyIdx++}`));
|
|
463
460
|
}
|
|
464
461
|
// Commit circle — drawn last so it renders on top of all lines
|
|
465
462
|
if (isHead) {
|
|
466
|
-
elements.push((
|
|
467
|
-
elements.push((
|
|
463
|
+
elements.push(_jsx("circle", { cx: commitX, cy: cy, r: 7, style: { strokeWidth: '2px', fill: commitColor } }, `circle-${keyIdx++}`));
|
|
464
|
+
elements.push(_jsx("circle", { cx: commitX, cy: cy, r: 2, style: { strokeWidth: '4px', fill: 'var(--theia-editor-background)', stroke: 'var(--theia-editor-background)' } }, `inner-${keyIdx++}`));
|
|
468
465
|
}
|
|
469
466
|
else {
|
|
470
|
-
elements.push((
|
|
467
|
+
elements.push(_jsx("circle", { cx: commitX, cy: cy, r: 5, style: { strokeWidth: '2px', fill: commitColor } }, `circle-${keyIdx++}`));
|
|
471
468
|
}
|
|
472
|
-
return ((
|
|
469
|
+
return (_jsx("svg", { className: 'scm-history-graph-svg', style: { height: `${ROW_HEIGHT}px`, width: `${svgWidth}px` }, children: elements }));
|
|
473
470
|
}
|
|
474
471
|
renderRefBadges(refs, entry) {
|
|
475
472
|
if (!refs || refs.length === 0) {
|
|
476
473
|
return undefined;
|
|
477
474
|
}
|
|
478
475
|
const provider = this.model.provider;
|
|
479
|
-
const visibleRefs =
|
|
476
|
+
const visibleRefs = filterRefsForBadges(refs, provider, this.scmPreferences['scm.graph.badges'] ?? 'filter', this.model.historyItemRefFilter);
|
|
480
477
|
if (visibleRefs.length === 0) {
|
|
481
478
|
return undefined;
|
|
482
479
|
}
|
|
483
|
-
const laneColorValue = entry ?
|
|
484
|
-
const deduplicated =
|
|
480
|
+
const laneColorValue = entry ? laneColor(entry.graphRow.color) : undefined;
|
|
481
|
+
const deduplicated = deduplicateRefs(visibleRefs);
|
|
485
482
|
const badgeForeground = 'var(--theia-scmGraph-historyItemRefForeground, var(--theia-badge-foreground))';
|
|
486
483
|
const badges = [];
|
|
487
484
|
for (const info of deduplicated) {
|
|
@@ -489,18 +486,18 @@ let ScmHistoryGraphWidget = class ScmHistoryGraphWidget extends react_widget_1.R
|
|
|
489
486
|
break;
|
|
490
487
|
}
|
|
491
488
|
const { ref, hasBoth } = info;
|
|
492
|
-
const isTag =
|
|
493
|
-
const isRemote =
|
|
489
|
+
const isTag = isTagRef(ref);
|
|
490
|
+
const isRemote = isRemoteRef(ref);
|
|
494
491
|
const onContextMenu = entry ? (e) => this.handleRefBadgeContextMenu(e, entry, ref) : undefined;
|
|
495
492
|
// Current/remote/base refs are colored by role, others by the row's lane color
|
|
496
|
-
const { iconClass, colorIndex } =
|
|
497
|
-
const backgroundColor = colorIndex !== undefined ?
|
|
493
|
+
const { iconClass, colorIndex } = getRefBadgePresentation(ref, provider);
|
|
494
|
+
const backgroundColor = colorIndex !== undefined ? laneColor(colorIndex) : laneColorValue;
|
|
498
495
|
const style = backgroundColor
|
|
499
496
|
? { backgroundColor, color: badgeForeground }
|
|
500
497
|
: {};
|
|
501
498
|
badges.push(renderJsxRefBadge(ref, iconClass, !isTag, style, ref.id, onContextMenu));
|
|
502
499
|
if (!isTag && !isRemote && hasBoth && badges.length < 3) {
|
|
503
|
-
badges.push((
|
|
500
|
+
badges.push(_jsx("span", { className: 'scm-history-ref-badge scm-history-ref-badge-cloud', title: ref.description ?? ref.name, style: style, children: _jsx("i", { className: 'codicon codicon-cloud scm-history-ref-icon' }) }, `${ref.id}-cloud`));
|
|
504
501
|
}
|
|
505
502
|
}
|
|
506
503
|
return badges;
|
|
@@ -515,7 +512,7 @@ let ScmHistoryGraphWidget = class ScmHistoryGraphWidget extends react_widget_1.R
|
|
|
515
512
|
}
|
|
516
513
|
this.expandedChanges.set(item.id, 'loading');
|
|
517
514
|
this.update();
|
|
518
|
-
const cts = new
|
|
515
|
+
const cts = new CancellationTokenSource();
|
|
519
516
|
this.loadChangesCts.set(item.id, cts);
|
|
520
517
|
this.toDispose.push(cts);
|
|
521
518
|
try {
|
|
@@ -538,60 +535,45 @@ let ScmHistoryGraphWidget = class ScmHistoryGraphWidget extends react_widget_1.R
|
|
|
538
535
|
}
|
|
539
536
|
}
|
|
540
537
|
};
|
|
541
|
-
|
|
542
|
-
|
|
543
|
-
(0, inversify_1.inject)(scm_history_graph_model_1.ScmHistoryGraphModel),
|
|
544
|
-
tslib_1.__metadata("design:type", scm_history_graph_model_1.ScmHistoryGraphModel)
|
|
538
|
+
__decorate([
|
|
539
|
+
inject(ScmHistoryGraphModel)
|
|
545
540
|
], ScmHistoryGraphWidget.prototype, "model", void 0);
|
|
546
|
-
|
|
547
|
-
|
|
548
|
-
tslib_1.__metadata("design:type", hover_service_1.HoverService)
|
|
541
|
+
__decorate([
|
|
542
|
+
inject(HoverService)
|
|
549
543
|
], ScmHistoryGraphWidget.prototype, "hoverService", void 0);
|
|
550
|
-
|
|
551
|
-
|
|
552
|
-
tslib_1.__metadata("design:type", Object)
|
|
544
|
+
__decorate([
|
|
545
|
+
inject(ClipboardService)
|
|
553
546
|
], ScmHistoryGraphWidget.prototype, "clipboardService", void 0);
|
|
554
|
-
|
|
555
|
-
|
|
556
|
-
tslib_1.__metadata("design:type", Function)
|
|
547
|
+
__decorate([
|
|
548
|
+
inject(MarkdownRendererFactory)
|
|
557
549
|
], ScmHistoryGraphWidget.prototype, "markdownRendererFactory", void 0);
|
|
558
|
-
|
|
559
|
-
|
|
560
|
-
tslib_1.__metadata("design:type", scm_service_1.ScmService)
|
|
550
|
+
__decorate([
|
|
551
|
+
inject(ScmService)
|
|
561
552
|
], ScmHistoryGraphWidget.prototype, "scmService", void 0);
|
|
562
|
-
|
|
563
|
-
|
|
564
|
-
tslib_1.__metadata("design:type", label_provider_1.LabelProvider)
|
|
553
|
+
__decorate([
|
|
554
|
+
inject(LabelProvider)
|
|
565
555
|
], ScmHistoryGraphWidget.prototype, "labelProvider", void 0);
|
|
566
|
-
|
|
567
|
-
|
|
568
|
-
tslib_1.__metadata("design:type", context_menu_renderer_1.ContextMenuRenderer)
|
|
556
|
+
__decorate([
|
|
557
|
+
inject(ContextMenuRenderer)
|
|
569
558
|
], ScmHistoryGraphWidget.prototype, "contextMenuRenderer", void 0);
|
|
570
|
-
|
|
571
|
-
|
|
572
|
-
tslib_1.__metadata("design:type", Object)
|
|
559
|
+
__decorate([
|
|
560
|
+
inject(OpenerService)
|
|
573
561
|
], ScmHistoryGraphWidget.prototype, "openerService", void 0);
|
|
574
|
-
|
|
575
|
-
|
|
576
|
-
tslib_1.__metadata("design:type", scm_context_key_service_1.ScmContextKeyService)
|
|
562
|
+
__decorate([
|
|
563
|
+
inject(ScmContextKeyService)
|
|
577
564
|
], ScmHistoryGraphWidget.prototype, "scmContextKeys", void 0);
|
|
578
|
-
|
|
579
|
-
|
|
580
|
-
tslib_1.__metadata("design:type", Object)
|
|
565
|
+
__decorate([
|
|
566
|
+
inject(ScmPreferences)
|
|
581
567
|
], ScmHistoryGraphWidget.prototype, "scmPreferences", void 0);
|
|
582
|
-
|
|
583
|
-
|
|
584
|
-
|
|
585
|
-
tslib_1.__metadata("design:type", Object)
|
|
568
|
+
__decorate([
|
|
569
|
+
inject(ILogger),
|
|
570
|
+
named('scm:ScmHistoryGraphWidget')
|
|
586
571
|
], ScmHistoryGraphWidget.prototype, "logger", void 0);
|
|
587
|
-
|
|
588
|
-
|
|
589
|
-
tslib_1.__metadata("design:type", Function),
|
|
590
|
-
tslib_1.__metadata("design:paramtypes", []),
|
|
591
|
-
tslib_1.__metadata("design:returntype", void 0)
|
|
572
|
+
__decorate([
|
|
573
|
+
postConstruct()
|
|
592
574
|
], ScmHistoryGraphWidget.prototype, "init", null);
|
|
593
|
-
|
|
594
|
-
|
|
595
|
-
tslib_1.__metadata("design:paramtypes", [])
|
|
575
|
+
ScmHistoryGraphWidget = ScmHistoryGraphWidget_1 = __decorate([
|
|
576
|
+
injectable()
|
|
596
577
|
], ScmHistoryGraphWidget);
|
|
578
|
+
export { ScmHistoryGraphWidget };
|
|
597
579
|
//# sourceMappingURL=scm-history-graph-widget.js.map
|