@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
|
@@ -20,9 +20,9 @@ const disableJSDOM = enableJSDOM();
|
|
|
20
20
|
import { expect } from 'chai';
|
|
21
21
|
import { ContextKey, ContextKeyServiceDummyImpl, ContextKeyValue } from '@theia/core/lib/browser/context-key-service';
|
|
22
22
|
import { Emitter } from '@theia/core/lib/common/event';
|
|
23
|
-
import { ScmContextKeyService } from './scm-context-key-service';
|
|
24
|
-
import { ScmContribution } from './scm-contribution';
|
|
25
|
-
import { ScmRepository } from './scm-repository';
|
|
23
|
+
import { ScmContextKeyService } from './scm-context-key-service.js';
|
|
24
|
+
import { ScmContribution } from './scm-contribution.js';
|
|
25
|
+
import { ScmRepository } from './scm-repository.js';
|
|
26
26
|
|
|
27
27
|
disableJSDOM();
|
|
28
28
|
|
|
@@ -31,21 +31,21 @@ import {
|
|
|
31
31
|
import { TabBarToolbarContribution, TabBarToolbarRegistry, TabBarToolbarAction } from '@theia/core/lib/browser/shell/tab-bar-toolbar';
|
|
32
32
|
import { CommandRegistry, Command, Disposable, DisposableCollection, CommandService, MenuModelRegistry } from '@theia/core/lib/common';
|
|
33
33
|
import { ContextKeyService, ContextKey } from '@theia/core/lib/browser/context-key-service';
|
|
34
|
-
import { ScmService } from './scm-service';
|
|
35
|
-
import { ScmContextKeyService } from './scm-context-key-service';
|
|
36
|
-
import { ScmWidget } from '../browser/scm-widget';
|
|
34
|
+
import { ScmService } from './scm-service.js';
|
|
35
|
+
import { ScmContextKeyService } from './scm-context-key-service.js';
|
|
36
|
+
import { ScmWidget } from '../browser/scm-widget.js';
|
|
37
37
|
import URI from '@theia/core/lib/common/uri';
|
|
38
|
-
import { ScmQuickOpenService } from './scm-quick-open-service';
|
|
38
|
+
import { ScmQuickOpenService } from './scm-quick-open-service.js';
|
|
39
39
|
import { ColorContribution } from '@theia/core/lib/browser/color-application-contribution';
|
|
40
40
|
import { ColorRegistry } from '@theia/core/lib/browser/color-registry';
|
|
41
41
|
import { Color } from '@theia/core/lib/common/color';
|
|
42
|
-
import { ScmColors } from './scm-colors';
|
|
43
|
-
import { ScmCommand } from './scm-provider';
|
|
44
|
-
import { ScmDecorationsService } from '../browser/decorations/scm-decorations-service';
|
|
42
|
+
import { ScmColors } from './scm-colors.js';
|
|
43
|
+
import { ScmCommand } from './scm-provider.js';
|
|
44
|
+
import { ScmDecorationsService } from '../browser/decorations/scm-decorations-service.js';
|
|
45
45
|
import { nls } from '@theia/core/lib/common/nls';
|
|
46
46
|
import { isHighContrast } from '@theia/core/lib/common/theme';
|
|
47
47
|
import { EditorMainMenu, EditorWidget } from '@theia/editor/lib/browser';
|
|
48
|
-
import { DirtyDiffNavigator } from './dirty-diff/dirty-diff-navigator';
|
|
48
|
+
import { DirtyDiffNavigator } from './dirty-diff/dirty-diff-navigator.js';
|
|
49
49
|
import { MonacoDiffEditor } from '@theia/monaco/lib/browser/monaco-diff-editor';
|
|
50
50
|
|
|
51
51
|
export const SCM_WIDGET_FACTORY_ID = ScmWidget.ID;
|
|
@@ -23,31 +23,32 @@ import {
|
|
|
23
23
|
WidgetManager, ApplicationShellLayoutMigration,
|
|
24
24
|
createTreeContainer, TreeModel, TreeModelImpl, StylingParticipant
|
|
25
25
|
} from '@theia/core/lib/browser';
|
|
26
|
-
import { ScmService } from './scm-service';
|
|
27
|
-
import { SCM_WIDGET_FACTORY_ID, ScmContribution, SCM_VIEW_CONTAINER_ID, SCM_VIEW_CONTAINER_TITLE_OPTIONS } from './scm-contribution';
|
|
28
|
-
import { ScmWidget } from './scm-widget';
|
|
29
|
-
import { ScmTreeWidget } from './scm-tree-widget';
|
|
30
|
-
import { ScmCommitWidget } from './scm-commit-widget';
|
|
31
|
-
import { ScmActionButtonWidget } from './scm-action-button-widget';
|
|
32
|
-
import { ScmAmendWidget } from './scm-amend-widget';
|
|
33
|
-
import { ScmTreeModelProps } from './scm-tree-model';
|
|
34
|
-
import { ScmGroupsTreeModel } from './scm-groups-tree-model';
|
|
35
|
-
import { ScmQuickOpenService } from './scm-quick-open-service';
|
|
36
|
-
import { bindDirtyDiff } from './dirty-diff/dirty-diff-module';
|
|
37
|
-
import { ScmDecorationsService } from './decorations/scm-decorations-service';
|
|
38
|
-
import { ScmAvatarService } from './scm-avatar-service';
|
|
39
|
-
import { ScmContextKeyService } from './scm-context-key-service';
|
|
40
|
-
import { ScmLayoutVersion3Migration, ScmLayoutVersion5Migration } from './scm-layout-migrations';
|
|
41
|
-
import { ScmTreeLabelProvider } from './scm-tree-label-provider';
|
|
26
|
+
import { ScmService } from './scm-service.js';
|
|
27
|
+
import { SCM_WIDGET_FACTORY_ID, ScmContribution, SCM_VIEW_CONTAINER_ID, SCM_VIEW_CONTAINER_TITLE_OPTIONS } from './scm-contribution.js';
|
|
28
|
+
import { ScmWidget } from './scm-widget.js';
|
|
29
|
+
import { ScmTreeWidget } from './scm-tree-widget.js';
|
|
30
|
+
import { ScmCommitWidget } from './scm-commit-widget.js';
|
|
31
|
+
import { ScmActionButtonWidget } from './scm-action-button-widget.js';
|
|
32
|
+
import { ScmAmendWidget } from './scm-amend-widget.js';
|
|
33
|
+
import { ScmTreeModelProps } from './scm-tree-model.js';
|
|
34
|
+
import { ScmGroupsTreeModel } from './scm-groups-tree-model.js';
|
|
35
|
+
import { ScmQuickOpenService } from './scm-quick-open-service.js';
|
|
36
|
+
import { bindDirtyDiff } from './dirty-diff/dirty-diff-module.js';
|
|
37
|
+
import { ScmDecorationsService } from './decorations/scm-decorations-service.js';
|
|
38
|
+
import { ScmAvatarService } from './scm-avatar-service.js';
|
|
39
|
+
import { ScmContextKeyService } from './scm-context-key-service.js';
|
|
40
|
+
import { ScmLayoutVersion3Migration, ScmLayoutVersion5Migration } from './scm-layout-migrations.js';
|
|
41
|
+
import { ScmTreeLabelProvider } from './scm-tree-label-provider.js';
|
|
42
42
|
import { TabBarToolbarContribution } from '@theia/core/lib/browser/shell/tab-bar-toolbar';
|
|
43
43
|
import { ColorContribution } from '@theia/core/lib/browser/color-application-contribution';
|
|
44
44
|
import { LabelProviderContribution } from '@theia/core/lib/browser/label-provider';
|
|
45
|
-
import { bindScmPreferences } from '../common/scm-preferences';
|
|
46
|
-
import { bindMergeEditor } from './merge-editor/merge-editor-module';
|
|
47
|
-
import {
|
|
48
|
-
import {
|
|
49
|
-
import {
|
|
50
|
-
import {
|
|
45
|
+
import { bindScmPreferences } from '../common/scm-preferences.js';
|
|
46
|
+
import { bindMergeEditor } from './merge-editor/merge-editor-module.js';
|
|
47
|
+
import { bindMultiDiffEditor } from './multi-diff-editor/multi-diff-editor-module.js';
|
|
48
|
+
import { ScmRepositoriesWidget } from './scm-repositories-widget.js';
|
|
49
|
+
import { ScmHistoryGraphWidget } from './scm-history-graph-widget.js';
|
|
50
|
+
import { ScmHistoryGraphModel, ScmHistoryGraphModelProvider } from './scm-history-graph-model.js';
|
|
51
|
+
import { ScmHistoryGraphContribution } from './scm-history-graph-contribution.js';
|
|
51
52
|
import { CommandContribution, MenuContribution } from '@theia/core';
|
|
52
53
|
|
|
53
54
|
export default new ContainerModule(bind => {
|
|
@@ -156,6 +157,8 @@ export default new ContainerModule(bind => {
|
|
|
156
157
|
bindScmPreferences(bind);
|
|
157
158
|
|
|
158
159
|
bindMergeEditor(bind);
|
|
160
|
+
|
|
161
|
+
bindMultiDiffEditor(bind);
|
|
159
162
|
});
|
|
160
163
|
|
|
161
164
|
export function createScmTreeContainer(parent: interfaces.Container): Container {
|
|
@@ -16,9 +16,9 @@
|
|
|
16
16
|
|
|
17
17
|
import { injectable, inject, postConstruct } from '@theia/core/shared/inversify';
|
|
18
18
|
import { Disposable, DisposableCollection } from '@theia/core/lib/common/disposable';
|
|
19
|
-
import { ScmService } from './scm-service';
|
|
20
|
-
import { ScmTreeModel } from './scm-tree-model';
|
|
21
|
-
import { ScmResourceGroup, ScmProvider } from './scm-provider';
|
|
19
|
+
import { ScmService } from './scm-service.js';
|
|
20
|
+
import { ScmTreeModel } from './scm-tree-model.js';
|
|
21
|
+
import { ScmResourceGroup, ScmProvider } from './scm-provider.js';
|
|
22
22
|
|
|
23
23
|
@injectable()
|
|
24
24
|
export class ScmGroupsTreeModel extends ScmTreeModel {
|
|
@@ -20,9 +20,9 @@ const disableJSDOM = enableJSDOM();
|
|
|
20
20
|
import { expect } from 'chai';
|
|
21
21
|
import { Command, CommandHandler, CommandRegistry } from '@theia/core/lib/common/command';
|
|
22
22
|
import { Disposable } from '@theia/core/lib/common/disposable';
|
|
23
|
-
import { ScmHistoryGraphContribution, ScmHistoryGraphCommands } from './scm-history-graph-contribution';
|
|
24
|
-
import { ScmHistoryGraphModel, ScmHistoryViewMode } from './scm-history-graph-model';
|
|
25
|
-
import { ScmHistoryProvider } from './scm-provider';
|
|
23
|
+
import { ScmHistoryGraphContribution, ScmHistoryGraphCommands } from './scm-history-graph-contribution.js';
|
|
24
|
+
import { ScmHistoryGraphModel, ScmHistoryViewMode } from './scm-history-graph-model.js';
|
|
25
|
+
import { ScmHistoryProvider } from './scm-provider.js';
|
|
26
26
|
|
|
27
27
|
disableJSDOM();
|
|
28
28
|
|
|
@@ -23,12 +23,12 @@ import { CancellationTokenSource } from '@theia/core/lib/common/cancellation';
|
|
|
23
23
|
import { QuickInputService } from '@theia/core/lib/browser';
|
|
24
24
|
import { QuickPickItem, QuickPickSeparator } from '@theia/core/lib/common/quick-pick-service';
|
|
25
25
|
import { codicon } from '@theia/core/lib/browser/widgets/widget';
|
|
26
|
-
import { ScmHistoryGraphModel, ScmHistoryGraphModelProvider } from './scm-history-graph-model';
|
|
27
|
-
import { ScmService } from './scm-service';
|
|
28
|
-
import { ScmContextKeyService } from './scm-context-key-service';
|
|
29
|
-
import { ScmHistoryItemRef, ScmHistoryProvider } from './scm-provider';
|
|
30
|
-
import { SCM_HISTORY_TITLE_MENU } from './scm-history-graph-widget';
|
|
31
|
-
import { getRefBadgeClass } from './scm-history-graph-helpers';
|
|
26
|
+
import { ScmHistoryGraphModel, ScmHistoryGraphModelProvider } from './scm-history-graph-model.js';
|
|
27
|
+
import { ScmService } from './scm-service.js';
|
|
28
|
+
import { ScmContextKeyService } from './scm-context-key-service.js';
|
|
29
|
+
import { ScmHistoryItemRef, ScmHistoryProvider } from './scm-provider.js';
|
|
30
|
+
import { SCM_HISTORY_TITLE_MENU } from './scm-history-graph-widget.js';
|
|
31
|
+
import { getRefBadgeClass } from './scm-history-graph-helpers.js';
|
|
32
32
|
|
|
33
33
|
export namespace ScmHistoryGraphCommands {
|
|
34
34
|
export const REFRESH = Command.toDefaultLocalizedCommand({
|
|
@@ -17,8 +17,8 @@
|
|
|
17
17
|
import { expect } from 'chai';
|
|
18
18
|
import {
|
|
19
19
|
buildChangeTreeRows, ChangeTreeFileRow, ChangeTreeRow, filterRefsForBadges, getFileName, getRefBadgePresentation, getRefColorIndex
|
|
20
|
-
} from './scm-history-graph-helpers';
|
|
21
|
-
import { ScmHistoryItemChange, ScmHistoryItemRef, ScmHistoryProvider } from './scm-provider';
|
|
20
|
+
} from './scm-history-graph-helpers.js';
|
|
21
|
+
import { ScmHistoryItemChange, ScmHistoryItemRef, ScmHistoryProvider } from './scm-provider.js';
|
|
22
22
|
|
|
23
23
|
describe('getRefColorIndex', () => {
|
|
24
24
|
|
|
@@ -14,7 +14,7 @@
|
|
|
14
14
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
15
15
|
// *****************************************************************************
|
|
16
16
|
|
|
17
|
-
import { ScmHistoryItemRef, ScmHistoryItemChange, ScmHistoryProvider } from './scm-provider';
|
|
17
|
+
import { ScmHistoryItemRef, ScmHistoryItemChange, ScmHistoryProvider } from './scm-provider.js';
|
|
18
18
|
|
|
19
19
|
/**
|
|
20
20
|
* Returns the CSS color variable for the given color index.
|
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
// *****************************************************************************
|
|
16
16
|
|
|
17
17
|
import { expect } from 'chai';
|
|
18
|
-
import { computeGraphRows } from './scm-history-graph-lanes';
|
|
18
|
+
import { computeGraphRows } from './scm-history-graph-lanes.js';
|
|
19
19
|
|
|
20
20
|
describe('computeGraphRows', () => {
|
|
21
21
|
|
|
@@ -16,9 +16,9 @@
|
|
|
16
16
|
|
|
17
17
|
import { expect } from 'chai';
|
|
18
18
|
import { Emitter } from '@theia/core/lib/common/event';
|
|
19
|
-
import { ScmHistoryGraphModel, PAGE_SIZE } from './scm-history-graph-model';
|
|
20
|
-
import { ScmHistoryItem, ScmHistoryItemRef, ScmHistoryItemRefsChangeEvent, ScmHistoryItemChange, ScmHistoryOptions, ScmHistoryProvider } from './scm-provider';
|
|
21
|
-
import { ScmRepository } from './scm-repository';
|
|
19
|
+
import { ScmHistoryGraphModel, PAGE_SIZE } from './scm-history-graph-model.js';
|
|
20
|
+
import { ScmHistoryItem, ScmHistoryItemRef, ScmHistoryItemRefsChangeEvent, ScmHistoryItemChange, ScmHistoryOptions, ScmHistoryProvider } from './scm-provider.js';
|
|
21
|
+
import { ScmRepository } from './scm-repository.js';
|
|
22
22
|
|
|
23
23
|
class StubHistoryProvider implements ScmHistoryProvider {
|
|
24
24
|
currentHistoryItemRef: ScmHistoryItemRef | undefined;
|
|
@@ -18,12 +18,12 @@ import { injectable, inject, postConstruct, named } from '@theia/core/shared/inv
|
|
|
18
18
|
import { Disposable, DisposableCollection } from '@theia/core/lib/common/disposable';
|
|
19
19
|
import { Emitter, Event } from '@theia/core/lib/common/event';
|
|
20
20
|
import { CancellationTokenSource } from '@theia/core/lib/common/cancellation';
|
|
21
|
-
import { ScmService } from './scm-service';
|
|
22
|
-
import { ScmHistoryItem, ScmHistoryItemRef, ScmHistoryProvider, ScmHistoryOptions } from './scm-provider';
|
|
23
|
-
import { computeGraphRows, GraphRow } from './scm-history-graph-lanes';
|
|
21
|
+
import { ScmService } from './scm-service.js';
|
|
22
|
+
import { ScmHistoryItem, ScmHistoryItemRef, ScmHistoryProvider, ScmHistoryOptions } from './scm-provider.js';
|
|
23
|
+
import { computeGraphRows, GraphRow } from './scm-history-graph-lanes.js';
|
|
24
24
|
import { ILogger } from '@theia/core';
|
|
25
|
-
import { getRefColorIndex } from './scm-history-graph-helpers';
|
|
26
|
-
import { ScmPreferences } from '../common/scm-preferences';
|
|
25
|
+
import { getRefColorIndex } from './scm-history-graph-helpers.js';
|
|
26
|
+
import { ScmPreferences } from '../common/scm-preferences.js';
|
|
27
27
|
|
|
28
28
|
export const PAGE_SIZE = 50;
|
|
29
29
|
|
|
@@ -24,9 +24,9 @@ import { OpenerService } from '@theia/core/lib/browser/opener-service';
|
|
|
24
24
|
import { markMarkdownLinksWired } from '@theia/core/lib/browser/markdown-rendering/markdown-link-handler';
|
|
25
25
|
import { DisposableCollection } from '@theia/core/lib/common/disposable';
|
|
26
26
|
import URI from '@theia/core/lib/common/uri';
|
|
27
|
-
import { ScmHistoryItem } from './scm-provider';
|
|
28
|
-
import { HistoryGraphEntry } from './scm-history-graph-model';
|
|
29
|
-
import { buildHtmlTooltip, buildProviderTooltip, HistoryTooltipActions } from './scm-history-graph-tooltip';
|
|
27
|
+
import { ScmHistoryItem } from './scm-provider.js';
|
|
28
|
+
import { HistoryGraphEntry } from './scm-history-graph-model.js';
|
|
29
|
+
import { buildHtmlTooltip, buildProviderTooltip, HistoryTooltipActions } from './scm-history-graph-tooltip.js';
|
|
30
30
|
|
|
31
31
|
disableJSDOM();
|
|
32
32
|
|
|
@@ -21,9 +21,9 @@ import { OpenerService } from '@theia/core/lib/browser/opener-service';
|
|
|
21
21
|
import { DisposableCollection } from '@theia/core/lib/common/disposable';
|
|
22
22
|
import { codicon } from '@theia/core/lib/browser/widgets/widget';
|
|
23
23
|
import { nls } from '@theia/core/lib/common/nls';
|
|
24
|
-
import { ScmHistoryItem, ScmHistoryItemRef, ScmHistoryProvider } from './scm-provider';
|
|
25
|
-
import { HistoryGraphEntry } from './scm-history-graph-model';
|
|
26
|
-
import { laneColor, getRefBadgeClass, getRefBadgePresentation, deduplicateRefs, isTagRef, isRemoteRef } from './scm-history-graph-helpers';
|
|
24
|
+
import { ScmHistoryItem, ScmHistoryItemRef, ScmHistoryProvider } from './scm-provider.js';
|
|
25
|
+
import { HistoryGraphEntry } from './scm-history-graph-model.js';
|
|
26
|
+
import { laneColor, getRefBadgeClass, getRefBadgePresentation, deduplicateRefs, isTagRef, isRemoteRef } from './scm-history-graph-helpers.js';
|
|
27
27
|
|
|
28
28
|
export function formatRelativeTime(ms: number): string {
|
|
29
29
|
const now = Date.now();
|
|
@@ -21,10 +21,10 @@ import { expect } from 'chai';
|
|
|
21
21
|
import * as React from '@theia/core/shared/react';
|
|
22
22
|
import { Emitter } from '@theia/core/lib/common/event';
|
|
23
23
|
import { ContextKey, ContextKeyServiceDummyImpl, ContextKeyValue } from '@theia/core/lib/browser/context-key-service';
|
|
24
|
-
import { ScmContextKeyService } from './scm-context-key-service';
|
|
25
|
-
import { ScmHistoryGraphWidget } from './scm-history-graph-widget';
|
|
26
|
-
import { GraphRow } from './scm-history-graph-lanes';
|
|
27
|
-
import { ScmHistoryItemChange, ScmHistoryProvider } from './scm-provider';
|
|
24
|
+
import { ScmContextKeyService } from './scm-context-key-service.js';
|
|
25
|
+
import { ScmHistoryGraphWidget } from './scm-history-graph-widget.js';
|
|
26
|
+
import { GraphRow } from './scm-history-graph-lanes.js';
|
|
27
|
+
import { ScmHistoryItemChange, ScmHistoryProvider } from './scm-provider.js';
|
|
28
28
|
|
|
29
29
|
disableJSDOM();
|
|
30
30
|
|
|
@@ -22,10 +22,10 @@ import { LabelProvider } from '@theia/core/lib/browser/label-provider';
|
|
|
22
22
|
import { HoverService } from '@theia/core/lib/browser/hover-service';
|
|
23
23
|
import { ClipboardService } from '@theia/core/lib/browser/clipboard-service';
|
|
24
24
|
import { MarkdownRenderer, MarkdownRendererFactory } from '@theia/core/lib/browser/markdown-rendering/markdown-renderer';
|
|
25
|
-
import { ScmHistoryGraphModel, HistoryGraphEntry } from './scm-history-graph-model';
|
|
26
|
-
import { ScmHistoryItemRef, ScmHistoryItemChange } from './scm-provider';
|
|
27
|
-
import { ScmService } from './scm-service';
|
|
28
|
-
import { GraphRow } from './scm-history-graph-lanes';
|
|
25
|
+
import { ScmHistoryGraphModel, HistoryGraphEntry } from './scm-history-graph-model.js';
|
|
26
|
+
import { ScmHistoryItemRef, ScmHistoryItemChange } from './scm-provider.js';
|
|
27
|
+
import { ScmService } from './scm-service.js';
|
|
28
|
+
import { GraphRow } from './scm-history-graph-lanes.js';
|
|
29
29
|
import URI from '@theia/core/lib/common/uri';
|
|
30
30
|
import { nls } from '@theia/core/lib/common/nls';
|
|
31
31
|
import { CancellationTokenSource } from '@theia/core/lib/common/cancellation';
|
|
@@ -36,15 +36,15 @@ import { MenuPath } from '@theia/core/lib/common/menu/menu-types';
|
|
|
36
36
|
import { ContextMenuRenderer } from '@theia/core/lib/browser/context-menu-renderer';
|
|
37
37
|
import { OpenerService, open } from '@theia/core/lib/browser/opener-service';
|
|
38
38
|
import { DiffUris } from '@theia/core/lib/browser/diff-uris';
|
|
39
|
-
import { ScmContextKeyService } from './scm-context-key-service';
|
|
40
|
-
import { ScmPreferences } from '../common/scm-preferences';
|
|
39
|
+
import { ScmContextKeyService } from './scm-context-key-service.js';
|
|
40
|
+
import { ScmPreferences } from '../common/scm-preferences.js';
|
|
41
41
|
import {
|
|
42
42
|
laneColor, filterRefsForBadges, getChangeStatus, getFileName, getFilePath, getRepoRelativePath,
|
|
43
43
|
getRefBadgeClass, getRefBadgePresentation, isTagRef, isRemoteRef, deduplicateRefs, DeduplicatedRef,
|
|
44
44
|
buildChangeTreeRows, ChangeTreeFolderRow
|
|
45
|
-
} from './scm-history-graph-helpers';
|
|
45
|
+
} from './scm-history-graph-helpers.js';
|
|
46
46
|
import { ILogger } from '@theia/core';
|
|
47
|
-
import { buildHtmlTooltip, buildProviderTooltip } from './scm-history-graph-tooltip';
|
|
47
|
+
import { buildHtmlTooltip, buildProviderTooltip } from './scm-history-graph-tooltip.js';
|
|
48
48
|
|
|
49
49
|
/** Menu path matching the VS Code 'scm/history/title' contribution point (graph section toolbar). */
|
|
50
50
|
export const SCM_HISTORY_TITLE_MENU: MenuPath = ['plugin_scm/history/title'];
|
package/src/browser/scm-input.ts
CHANGED
|
@@ -16,7 +16,7 @@
|
|
|
16
16
|
|
|
17
17
|
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
18
18
|
|
|
19
|
-
import
|
|
19
|
+
import debounce from 'p-debounce';
|
|
20
20
|
import { Disposable, DisposableCollection, Emitter } from '@theia/core/lib/common';
|
|
21
21
|
import { JSONExt, JSONObject } from '@theia/core/shared/@lumino/coreutils';
|
|
22
22
|
|
|
@@ -16,7 +16,7 @@
|
|
|
16
16
|
|
|
17
17
|
import { injectable } from '@theia/core/shared/inversify';
|
|
18
18
|
import { ApplicationShellLayoutMigration, WidgetDescription, ApplicationShellLayoutMigrationContext } from '@theia/core/lib/browser/shell/shell-layout-restorer';
|
|
19
|
-
import { SCM_VIEW_CONTAINER_TITLE_OPTIONS, SCM_VIEW_CONTAINER_ID, SCM_WIDGET_FACTORY_ID } from './scm-contribution';
|
|
19
|
+
import { SCM_VIEW_CONTAINER_TITLE_OPTIONS, SCM_VIEW_CONTAINER_ID, SCM_WIDGET_FACTORY_ID } from './scm-contribution.js';
|
|
20
20
|
|
|
21
21
|
@injectable()
|
|
22
22
|
export class ScmLayoutVersion3Migration implements ApplicationShellLayoutMigration {
|
|
@@ -62,6 +62,8 @@ export interface ScmResourceGroup extends Disposable {
|
|
|
62
62
|
export interface ScmResource {
|
|
63
63
|
/** The uri of the underlying resource inside the workspace. */
|
|
64
64
|
readonly sourceUri: URI;
|
|
65
|
+
readonly multiDiffEditorOriginalUri?: URI;
|
|
66
|
+
readonly multiDiffEditorModifiedUri?: URI;
|
|
65
67
|
readonly decorations?: ScmResourceDecorations;
|
|
66
68
|
open(): Promise<void>;
|
|
67
69
|
|
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
import { injectable, inject, optional } from '@theia/core/shared/inversify';
|
|
18
18
|
import { MessageService } from '@theia/core/lib/common/message-service';
|
|
19
19
|
import URI from '@theia/core/lib/common/uri';
|
|
20
|
-
import { ScmService } from './scm-service';
|
|
20
|
+
import { ScmService } from './scm-service.js';
|
|
21
21
|
import { LabelProvider } from '@theia/core/lib/browser/label-provider';
|
|
22
22
|
import { QuickInputService } from '@theia/core/lib/browser';
|
|
23
23
|
|
|
@@ -24,8 +24,8 @@ import { createRoot, Root } from '@theia/core/shared/react-dom/client';
|
|
|
24
24
|
import { MessageLoop } from '@theia/core/shared/@lumino/messaging';
|
|
25
25
|
import { Emitter } from '@theia/core/lib/common/event';
|
|
26
26
|
import { LabelParser } from '@theia/core/lib/browser/label-parser';
|
|
27
|
-
import { ScmRepositoriesWidget } from './scm-repositories-widget';
|
|
28
|
-
import { ScmRepository } from './scm-repository';
|
|
27
|
+
import { ScmRepositoriesWidget } from './scm-repositories-widget.js';
|
|
28
|
+
import { ScmRepository } from './scm-repository.js';
|
|
29
29
|
|
|
30
30
|
disableReactActEnvironment();
|
|
31
31
|
disableJSDOM();
|
|
@@ -23,10 +23,10 @@ import { DisposableCollection } from '@theia/core/lib/common/disposable';
|
|
|
23
23
|
import { nls } from '@theia/core/lib/common/nls';
|
|
24
24
|
import { Path } from '@theia/core/lib/common/path';
|
|
25
25
|
import URI from '@theia/core/lib/common/uri';
|
|
26
|
-
import { ScmService } from './scm-service';
|
|
27
|
-
import { ScmRepository } from './scm-repository';
|
|
28
|
-
import { ScmCommand } from './scm-provider';
|
|
29
|
-
import { ScmContextKeyService } from './scm-context-key-service';
|
|
26
|
+
import { ScmService } from './scm-service.js';
|
|
27
|
+
import { ScmRepository } from './scm-repository.js';
|
|
28
|
+
import { ScmCommand } from './scm-provider.js';
|
|
29
|
+
import { ScmContextKeyService } from './scm-context-key-service.js';
|
|
30
30
|
|
|
31
31
|
/** Menu path matching the VS Code 'scm/title' contribution point (git actions: Pull, Push, etc.). */
|
|
32
32
|
export const SCM_TITLE_MENU: MenuPath = ['plugin_scm/title'];
|
|
@@ -16,8 +16,8 @@
|
|
|
16
16
|
|
|
17
17
|
import { Disposable, DisposableCollection, Emitter } from '@theia/core/lib/common';
|
|
18
18
|
import URI from '@theia/core/lib/common/uri';
|
|
19
|
-
import { ScmInput, ScmInputOptions } from './scm-input';
|
|
20
|
-
import { ScmProvider } from './scm-provider';
|
|
19
|
+
import { ScmInput, ScmInputOptions } from './scm-input.js';
|
|
20
|
+
import { ScmProvider } from './scm-provider.js';
|
|
21
21
|
|
|
22
22
|
export interface ScmProviderOptions {
|
|
23
23
|
input?: ScmInputOptions;
|
|
@@ -16,8 +16,8 @@
|
|
|
16
16
|
|
|
17
17
|
import { expect } from 'chai';
|
|
18
18
|
import { Emitter } from '@theia/core/lib/common/event';
|
|
19
|
-
import { ScmService } from './scm-service';
|
|
20
|
-
import { ScmProvider } from './scm-provider';
|
|
19
|
+
import { ScmService } from './scm-service.js';
|
|
20
|
+
import { ScmProvider } from './scm-provider.js';
|
|
21
21
|
|
|
22
22
|
function makeProvider(id: string, rootUri: string): ScmProvider {
|
|
23
23
|
return {
|
|
@@ -18,9 +18,9 @@
|
|
|
18
18
|
|
|
19
19
|
import { DisposableCollection, Emitter } from '@theia/core/lib/common';
|
|
20
20
|
import { injectable, inject } from '@theia/core/shared/inversify';
|
|
21
|
-
import { ScmContextKeyService } from './scm-context-key-service';
|
|
22
|
-
import { ScmRepository, ScmProviderOptions } from './scm-repository';
|
|
23
|
-
import { ScmCommand, ScmProvider } from './scm-provider';
|
|
21
|
+
import { ScmContextKeyService } from './scm-context-key-service.js';
|
|
22
|
+
import { ScmRepository, ScmProviderOptions } from './scm-repository.js';
|
|
23
|
+
import { ScmCommand, ScmProvider } from './scm-provider.js';
|
|
24
24
|
import URI from '@theia/core/lib/common/uri';
|
|
25
25
|
|
|
26
26
|
@injectable()
|
|
@@ -18,7 +18,7 @@ import { inject, injectable } from '@theia/core/shared/inversify';
|
|
|
18
18
|
import URI from '@theia/core/lib/common/uri';
|
|
19
19
|
import { LabelProviderContribution, LabelProvider } from '@theia/core/lib/browser/label-provider';
|
|
20
20
|
import { TreeNode } from '@theia/core/lib/browser/tree';
|
|
21
|
-
import { ScmFileChangeFolderNode, ScmFileChangeNode, ScmFileChangeGroupNode } from './scm-tree-model';
|
|
21
|
+
import { ScmFileChangeFolderNode, ScmFileChangeNode, ScmFileChangeGroupNode } from './scm-tree-model.js';
|
|
22
22
|
|
|
23
23
|
@injectable()
|
|
24
24
|
export class ScmTreeLabelProvider implements LabelProviderContribution {
|
|
@@ -17,8 +17,8 @@
|
|
|
17
17
|
import { injectable, inject } from '@theia/core/shared/inversify';
|
|
18
18
|
import { TreeModelImpl, TreeNode, TreeProps, CompositeTreeNode, SelectableTreeNode, ExpandableTreeNode } from '@theia/core/lib/browser/tree';
|
|
19
19
|
import URI from '@theia/core/lib/common/uri';
|
|
20
|
-
import { ScmProvider, ScmResourceGroup, ScmResource, ScmResourceDecorations } from './scm-provider';
|
|
21
|
-
import { ScmContextKeyService } from './scm-context-key-service';
|
|
20
|
+
import { ScmProvider, ScmResourceGroup, ScmResource, ScmResourceDecorations } from './scm-provider.js';
|
|
21
|
+
import { ScmContextKeyService } from './scm-context-key-service.js';
|
|
22
22
|
|
|
23
23
|
export const ScmTreeModelProps = Symbol('ScmTreeModelProps');
|
|
24
24
|
export interface ScmTreeModelProps {
|
|
@@ -23,16 +23,16 @@ import { isOSX } from '@theia/core/lib/common/os';
|
|
|
23
23
|
import { DisposableCollection, Disposable } from '@theia/core/lib/common/disposable';
|
|
24
24
|
import { TreeWidget, TreeNode, SelectableTreeNode, TreeModel, TreeProps, NodeProps, TREE_NODE_SEGMENT_CLASS, TREE_NODE_SEGMENT_GROW_CLASS } from '@theia/core/lib/browser/tree';
|
|
25
25
|
import { TreeViewWelcomeWidget } from '@theia/core/lib/browser/tree/tree-view-welcome-widget';
|
|
26
|
-
import { ScmTreeModel, ScmFileChangeRootNode, ScmFileChangeGroupNode, ScmFileChangeFolderNode, ScmFileChangeNode } from './scm-tree-model';
|
|
26
|
+
import { ScmTreeModel, ScmFileChangeRootNode, ScmFileChangeGroupNode, ScmFileChangeFolderNode, ScmFileChangeNode } from './scm-tree-model.js';
|
|
27
27
|
import { MenuModelRegistry, CompoundMenuNode, MenuPath, CommandMenu } from '@theia/core/lib/common/menu';
|
|
28
|
-
import { ScmResource } from './scm-provider';
|
|
28
|
+
import { ScmResource } from './scm-provider.js';
|
|
29
29
|
import { ContextMenuRenderer, LabelProvider, DiffUris, ACTION_ITEM } from '@theia/core/lib/browser';
|
|
30
|
-
import { ScmContextKeyService } from './scm-context-key-service';
|
|
30
|
+
import { ScmContextKeyService } from './scm-context-key-service.js';
|
|
31
31
|
import { EditorWidget, EditorManager, DiffNavigatorProvider } from '@theia/editor/lib/browser';
|
|
32
32
|
import { IconThemeService } from '@theia/core/lib/browser/icon-theme-service';
|
|
33
33
|
import { ColorRegistry } from '@theia/core/lib/browser/color-registry';
|
|
34
34
|
import { Decoration, DecorationsService } from '@theia/core/lib/browser/decorations-service';
|
|
35
|
-
import { ScmService } from './scm-service';
|
|
35
|
+
import { ScmService } from './scm-service.js';
|
|
36
36
|
import { FileStat } from '@theia/filesystem/lib/common/files';
|
|
37
37
|
import { ThemeService } from '@theia/core/lib/browser/theming';
|
|
38
38
|
import { CorePreferences } from '@theia/core/lib/common';
|
|
@@ -23,12 +23,12 @@ import {
|
|
|
23
23
|
BaseWidget, Widget, StatefulWidget, Panel, PanelLayout, MessageLoop, CompositeTreeNode, SelectableTreeNode, ApplicationShell, NavigatableWidget,
|
|
24
24
|
BadgeService,
|
|
25
25
|
} from '@theia/core/lib/browser';
|
|
26
|
-
import { ScmCommitWidget } from './scm-commit-widget';
|
|
27
|
-
import { ScmActionButtonWidget } from './scm-action-button-widget';
|
|
28
|
-
import { ScmAmendWidget } from './scm-amend-widget';
|
|
29
|
-
import { ScmService } from './scm-service';
|
|
30
|
-
import { ScmTreeWidget } from './scm-tree-widget';
|
|
31
|
-
import { ScmPreferences } from '../common/scm-preferences';
|
|
26
|
+
import { ScmCommitWidget } from './scm-commit-widget.js';
|
|
27
|
+
import { ScmActionButtonWidget } from './scm-action-button-widget.js';
|
|
28
|
+
import { ScmAmendWidget } from './scm-amend-widget.js';
|
|
29
|
+
import { ScmService } from './scm-service.js';
|
|
30
|
+
import { ScmTreeWidget } from './scm-tree-widget.js';
|
|
31
|
+
import { ScmPreferences } from '../common/scm-preferences.js';
|
|
32
32
|
import { nls } from '@theia/core/lib/common/nls';
|
|
33
33
|
|
|
34
34
|
@injectable()
|
|
@@ -0,0 +1,113 @@
|
|
|
1
|
+
/********************************************************************************
|
|
2
|
+
* Copyright (C) 2026 EclipseSource and others.
|
|
3
|
+
*
|
|
4
|
+
* This program and the accompanying materials are made available under the
|
|
5
|
+
* terms of the Eclipse Public License v. 2.0 which is available at
|
|
6
|
+
* http://www.eclipse.org/legal/epl-2.0.
|
|
7
|
+
*
|
|
8
|
+
* This Source Code may also be made available under the following Secondary
|
|
9
|
+
* Licenses when the conditions for such availability set forth in the Eclipse
|
|
10
|
+
* Public License v. 2.0 are satisfied: GNU General Public License, version 2
|
|
11
|
+
* with the GNU Classpath Exception which is available at
|
|
12
|
+
* https://www.gnu.org/software/classpath/license.html.
|
|
13
|
+
*
|
|
14
|
+
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
15
|
+
********************************************************************************/
|
|
16
|
+
|
|
17
|
+
.theia-multi-diff-editor {
|
|
18
|
+
height: 100%;
|
|
19
|
+
width: 100%;
|
|
20
|
+
overflow: hidden;
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
/* Override Lumino PanelLayout default absolute positioning to enable document flow. */
|
|
24
|
+
.theia-multi-diff-editor>.multi-diff-editor-entries {
|
|
25
|
+
position: absolute;
|
|
26
|
+
top: 0;
|
|
27
|
+
left: 0;
|
|
28
|
+
width: 100%;
|
|
29
|
+
height: 100%;
|
|
30
|
+
overflow-y: auto;
|
|
31
|
+
overflow-x: hidden;
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
/* Override Lumino default: children use normal flow instead of absolute positioning.
|
|
35
|
+
* The inline `height` is set dynamically by DiffEntryWidget.setHeight based on the
|
|
36
|
+
* embedded editor content, capped at 5000px for multiple entries. */
|
|
37
|
+
.theia-multi-diff-editor .multi-diff-editor-entries>.multi-diff-entry {
|
|
38
|
+
position: relative;
|
|
39
|
+
width: 100%;
|
|
40
|
+
margin-bottom: calc(var(--theia-ui-padding) / 2);
|
|
41
|
+
border: 1px solid var(--theia-panel-border);
|
|
42
|
+
box-sizing: border-box;
|
|
43
|
+
overflow: hidden;
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
.theia-multi-diff-editor .multi-diff-entry:only-child {
|
|
47
|
+
margin-bottom: 0;
|
|
48
|
+
}
|
|
49
|
+
|
|
50
|
+
.theia-multi-diff-editor .multi-diff-entry-header {
|
|
51
|
+
display: flex;
|
|
52
|
+
align-items: center;
|
|
53
|
+
padding: 0 var(--theia-ui-padding);
|
|
54
|
+
background-color: var(--theia-editorGroupHeader-tabsBackground);
|
|
55
|
+
border-bottom: 1px solid var(--theia-panel-border);
|
|
56
|
+
user-select: none;
|
|
57
|
+
overflow: hidden;
|
|
58
|
+
cursor: pointer;
|
|
59
|
+
outline: none;
|
|
60
|
+
}
|
|
61
|
+
|
|
62
|
+
.theia-multi-diff-editor .multi-diff-entry-header:focus-visible {
|
|
63
|
+
outline: 1px solid var(--theia-focusBorder);
|
|
64
|
+
outline-offset: -1px;
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
.theia-multi-diff-editor .multi-diff-entry-chevron {
|
|
68
|
+
flex-shrink: 0;
|
|
69
|
+
margin-right: calc(var(--theia-ui-padding) / 2);
|
|
70
|
+
color: var(--theia-foreground);
|
|
71
|
+
}
|
|
72
|
+
|
|
73
|
+
.theia-multi-diff-editor .multi-diff-entry-icon {
|
|
74
|
+
flex-shrink: 0;
|
|
75
|
+
margin-right: var(--theia-ui-padding);
|
|
76
|
+
}
|
|
77
|
+
|
|
78
|
+
.theia-multi-diff-editor .multi-diff-entry-label {
|
|
79
|
+
flex-shrink: 0;
|
|
80
|
+
margin-right: var(--theia-ui-padding);
|
|
81
|
+
font-weight: 600;
|
|
82
|
+
white-space: nowrap;
|
|
83
|
+
overflow: hidden;
|
|
84
|
+
text-overflow: ellipsis;
|
|
85
|
+
}
|
|
86
|
+
|
|
87
|
+
.theia-multi-diff-editor .multi-diff-entry-description {
|
|
88
|
+
flex-shrink: 1;
|
|
89
|
+
color: var(--theia-descriptionForeground);
|
|
90
|
+
font-size: 0.9em;
|
|
91
|
+
white-space: nowrap;
|
|
92
|
+
overflow: hidden;
|
|
93
|
+
text-overflow: ellipsis;
|
|
94
|
+
}
|
|
95
|
+
|
|
96
|
+
.theia-multi-diff-editor .multi-diff-entry-loading,
|
|
97
|
+
.theia-multi-diff-editor .multi-diff-entry-error {
|
|
98
|
+
display: flex;
|
|
99
|
+
align-items: center;
|
|
100
|
+
justify-content: center;
|
|
101
|
+
gap: var(--theia-ui-padding);
|
|
102
|
+
padding: calc(var(--theia-ui-padding) * 2);
|
|
103
|
+
height: 100%;
|
|
104
|
+
box-sizing: border-box;
|
|
105
|
+
}
|
|
106
|
+
|
|
107
|
+
.theia-multi-diff-editor .multi-diff-entry-loading {
|
|
108
|
+
color: var(--theia-descriptionForeground);
|
|
109
|
+
}
|
|
110
|
+
|
|
111
|
+
.theia-multi-diff-editor .multi-diff-entry-error {
|
|
112
|
+
color: var(--theia-errorForeground);
|
|
113
|
+
}
|
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
// *****************************************************************************
|
|
16
16
|
|
|
17
17
|
import { ContainerModule } from '@theia/core/shared/inversify';
|
|
18
|
-
import { bindScmPreferences } from '../common/scm-preferences';
|
|
18
|
+
import { bindScmPreferences } from '../common/scm-preferences.js';
|
|
19
19
|
export default new ContainerModule(bind => {
|
|
20
20
|
bindScmPreferences(bind);
|
|
21
21
|
});
|