@theia/scm 1.77.0-next.95 → 1.77.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/browser/decorations/scm-decorations-service.d.ts +2 -2
- package/lib/browser/decorations/scm-decorations-service.d.ts.map +1 -1
- package/lib/browser/decorations/scm-decorations-service.js +22 -28
- package/lib/browser/decorations/scm-decorations-service.js.map +1 -1
- package/lib/browser/decorations/scm-navigator-decorator.js +22 -28
- package/lib/browser/decorations/scm-navigator-decorator.js.map +1 -1
- package/lib/browser/dirty-diff/content-lines.js +2 -5
- package/lib/browser/dirty-diff/content-lines.js.map +1 -1
- package/lib/browser/dirty-diff/content-lines.spec.js +15 -17
- package/lib/browser/dirty-diff/content-lines.spec.js.map +1 -1
- package/lib/browser/dirty-diff/diff-computer.d.ts +1 -1
- package/lib/browser/dirty-diff/diff-computer.d.ts.map +1 -1
- package/lib/browser/dirty-diff/diff-computer.js +11 -16
- package/lib/browser/dirty-diff/diff-computer.js.map +1 -1
- package/lib/browser/dirty-diff/diff-computer.spec.js +26 -28
- package/lib/browser/dirty-diff/diff-computer.spec.js.map +1 -1
- package/lib/browser/dirty-diff/dirty-diff-decorator.d.ts +1 -1
- package/lib/browser/dirty-diff/dirty-diff-decorator.d.ts.map +1 -1
- package/lib/browser/dirty-diff/dirty-diff-decorator.js +19 -22
- package/lib/browser/dirty-diff/dirty-diff-decorator.js.map +1 -1
- package/lib/browser/dirty-diff/dirty-diff-module.js +11 -14
- package/lib/browser/dirty-diff/dirty-diff-module.js.map +1 -1
- package/lib/browser/dirty-diff/dirty-diff-navigator.d.ts +3 -3
- package/lib/browser/dirty-diff/dirty-diff-navigator.d.ts.map +1 -1
- package/lib/browser/dirty-diff/dirty-diff-navigator.js +30 -40
- package/lib/browser/dirty-diff/dirty-diff-navigator.js.map +1 -1
- package/lib/browser/dirty-diff/dirty-diff-widget.d.ts +1 -1
- package/lib/browser/dirty-diff/dirty-diff-widget.d.ts.map +1 -1
- package/lib/browser/dirty-diff/dirty-diff-widget.js +50 -54
- package/lib/browser/dirty-diff/dirty-diff-widget.js.map +1 -1
- package/lib/browser/merge-editor/merge-editor-contribution.d.ts +2 -2
- package/lib/browser/merge-editor/merge-editor-contribution.d.ts.map +1 -1
- package/lib/browser/merge-editor/merge-editor-contribution.js +43 -49
- package/lib/browser/merge-editor/merge-editor-contribution.js.map +1 -1
- package/lib/browser/merge-editor/merge-editor-dev-contribution.d.ts +2 -2
- package/lib/browser/merge-editor/merge-editor-dev-contribution.d.ts.map +1 -1
- package/lib/browser/merge-editor/merge-editor-dev-contribution.js +35 -45
- package/lib/browser/merge-editor/merge-editor-dev-contribution.js.map +1 -1
- package/lib/browser/merge-editor/merge-editor-module.d.ts +1 -1
- package/lib/browser/merge-editor/merge-editor-module.d.ts.map +1 -1
- package/lib/browser/merge-editor/merge-editor-module.js +49 -54
- package/lib/browser/merge-editor/merge-editor-module.js.map +1 -1
- package/lib/browser/merge-editor/merge-editor.d.ts +5 -5
- package/lib/browser/merge-editor/merge-editor.d.ts.map +1 -1
- package/lib/browser/merge-editor/merge-editor.js +77 -92
- package/lib/browser/merge-editor/merge-editor.js.map +1 -1
- package/lib/browser/merge-editor/model/line-range.js +6 -10
- package/lib/browser/merge-editor/model/line-range.js.map +1 -1
- package/lib/browser/merge-editor/model/live-diff.d.ts +1 -1
- package/lib/browser/merge-editor/model/live-diff.d.ts.map +1 -1
- package/lib/browser/merge-editor/model/live-diff.js +14 -18
- package/lib/browser/merge-editor/model/live-diff.js.map +1 -1
- package/lib/browser/merge-editor/model/merge-editor-model.d.ts +4 -4
- package/lib/browser/merge-editor/model/merge-editor-model.d.ts.map +1 -1
- package/lib/browser/merge-editor/model/merge-editor-model.js +88 -98
- package/lib/browser/merge-editor/model/merge-editor-model.js.map +1 -1
- package/lib/browser/merge-editor/model/merge-range.d.ts +3 -3
- package/lib/browser/merge-editor/model/merge-range.d.ts.map +1 -1
- package/lib/browser/merge-editor/model/merge-range.js +26 -30
- package/lib/browser/merge-editor/model/merge-range.js.map +1 -1
- package/lib/browser/merge-editor/model/range-editing.d.ts +1 -1
- package/lib/browser/merge-editor/model/range-editing.d.ts.map +1 -1
- package/lib/browser/merge-editor/model/range-editing.js +8 -13
- package/lib/browser/merge-editor/model/range-editing.js.map +1 -1
- package/lib/browser/merge-editor/model/range-mapping.d.ts +2 -2
- package/lib/browser/merge-editor/model/range-mapping.d.ts.map +1 -1
- package/lib/browser/merge-editor/model/range-mapping.js +28 -37
- package/lib/browser/merge-editor/model/range-mapping.js.map +1 -1
- package/lib/browser/merge-editor/model/range-mapping.spec.js +19 -21
- package/lib/browser/merge-editor/model/range-mapping.spec.js.map +1 -1
- package/lib/browser/merge-editor/model/range-utils.js +9 -12
- package/lib/browser/merge-editor/model/range-utils.js.map +1 -1
- package/lib/browser/merge-editor/view/diff-spacers.d.ts +1 -1
- package/lib/browser/merge-editor/view/diff-spacers.d.ts.map +1 -1
- package/lib/browser/merge-editor/view/diff-spacers.js +7 -10
- package/lib/browser/merge-editor/view/diff-spacers.js.map +1 -1
- package/lib/browser/merge-editor/view/merge-editor-panes/index.d.ts +5 -5
- package/lib/browser/merge-editor/view/merge-editor-panes/index.d.ts.map +1 -1
- package/lib/browser/merge-editor/view/merge-editor-panes/index.js +5 -8
- package/lib/browser/merge-editor/view/merge-editor-panes/index.js.map +1 -1
- package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-base-pane.d.ts +3 -3
- package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-base-pane.d.ts.map +1 -1
- package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-base-pane.js +11 -15
- package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-base-pane.js.map +1 -1
- package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-pane-header.js +18 -25
- package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-pane-header.js.map +1 -1
- package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-pane.d.ts +5 -5
- package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-pane.d.ts.map +1 -1
- package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-pane.js +48 -58
- package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-pane.js.map +1 -1
- package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-result-pane.d.ts +4 -4
- package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-result-pane.d.ts.map +1 -1
- package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-result-pane.js +32 -38
- package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-result-pane.js.map +1 -1
- package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-side-pane.d.ts +4 -4
- package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-side-pane.d.ts.map +1 -1
- package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-side-pane.js +32 -41
- package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-side-pane.js.map +1 -1
- package/lib/browser/merge-editor/view/merge-editor-scroll-sync.d.ts +2 -2
- package/lib/browser/merge-editor/view/merge-editor-scroll-sync.d.ts.map +1 -1
- package/lib/browser/merge-editor/view/merge-editor-scroll-sync.js +3 -7
- package/lib/browser/merge-editor/view/merge-editor-scroll-sync.js.map +1 -1
- package/lib/browser/merge-editor/view/merge-editor-view-zones.d.ts +5 -5
- package/lib/browser/merge-editor/view/merge-editor-view-zones.d.ts.map +1 -1
- package/lib/browser/merge-editor/view/merge-editor-view-zones.js +18 -25
- package/lib/browser/merge-editor/view/merge-editor-view-zones.js.map +1 -1
- package/lib/browser/merge-editor/view/merge-range-actions.d.ts +2 -2
- package/lib/browser/merge-editor/view/merge-range-actions.d.ts.map +1 -1
- package/lib/browser/merge-editor/view/merge-range-actions.js +34 -38
- package/lib/browser/merge-editor/view/merge-range-actions.js.map +1 -1
- package/lib/browser/multi-diff-editor/multi-diff-editor-module.js +13 -16
- package/lib/browser/multi-diff-editor/multi-diff-editor-module.js.map +1 -1
- package/lib/browser/multi-diff-editor/multi-diff-editor-uri.js +7 -10
- package/lib/browser/multi-diff-editor/multi-diff-editor-uri.js.map +1 -1
- package/lib/browser/multi-diff-editor/multi-diff-editor-widget-factory.d.ts +2 -2
- package/lib/browser/multi-diff-editor/multi-diff-editor-widget-factory.d.ts.map +1 -1
- package/lib/browser/multi-diff-editor/multi-diff-editor-widget-factory.js +17 -21
- package/lib/browser/multi-diff-editor/multi-diff-editor-widget-factory.js.map +1 -1
- package/lib/browser/multi-diff-editor/multi-diff-editor-widget.spec.js +226 -229
- package/lib/browser/multi-diff-editor/multi-diff-editor-widget.spec.js.map +1 -1
- package/lib/browser/multi-diff-editor/multi-diff-editor.d.ts +1 -1
- package/lib/browser/multi-diff-editor/multi-diff-editor.d.ts.map +1 -1
- package/lib/browser/multi-diff-editor/multi-diff-editor.js +70 -81
- package/lib/browser/multi-diff-editor/multi-diff-editor.js.map +1 -1
- package/lib/browser/multi-diff-editor/multi-diff-editor.spec.js +66 -68
- package/lib/browser/multi-diff-editor/multi-diff-editor.spec.js.map +1 -1
- package/lib/browser/scm-action-button-widget.d.ts +2 -2
- package/lib/browser/scm-action-button-widget.d.ts.map +1 -1
- package/lib/browser/scm-action-button-widget.js +30 -39
- package/lib/browser/scm-action-button-widget.js.map +1 -1
- package/lib/browser/scm-amend-component.d.ts +3 -3
- package/lib/browser/scm-amend-component.d.ts.map +1 -1
- package/lib/browser/scm-amend-component.js +24 -29
- package/lib/browser/scm-amend-component.js.map +1 -1
- package/lib/browser/scm-amend-widget.d.ts +2 -2
- package/lib/browser/scm-amend-widget.d.ts.map +1 -1
- package/lib/browser/scm-amend-widget.js +26 -36
- package/lib/browser/scm-amend-widget.js.map +1 -1
- package/lib/browser/scm-avatar-service.js +7 -10
- package/lib/browser/scm-avatar-service.js.map +1 -1
- package/lib/browser/scm-colors.js +2 -5
- package/lib/browser/scm-colors.js.map +1 -1
- package/lib/browser/scm-commit-widget.d.ts +2 -2
- package/lib/browser/scm-commit-widget.d.ts.map +1 -1
- package/lib/browser/scm-commit-widget.js +25 -31
- package/lib/browser/scm-commit-widget.js.map +1 -1
- package/lib/browser/scm-context-key-service.js +10 -17
- package/lib/browser/scm-context-key-service.js.map +1 -1
- package/lib/browser/scm-context-key-service.spec.js +33 -35
- package/lib/browser/scm-context-key-service.spec.js.map +1 -1
- package/lib/browser/scm-contribution.d.ts +8 -8
- package/lib/browser/scm-contribution.d.ts.map +1 -1
- package/lib/browser/scm-contribution.js +114 -131
- package/lib/browser/scm-contribution.js.map +1 -1
- package/lib/browser/scm-frontend-module.js +99 -103
- package/lib/browser/scm-frontend-module.js.map +1 -1
- package/lib/browser/scm-groups-tree-model.d.ts +3 -3
- package/lib/browser/scm-groups-tree-model.d.ts.map +1 -1
- package/lib/browser/scm-groups-tree-model.js +15 -22
- package/lib/browser/scm-groups-tree-model.js.map +1 -1
- package/lib/browser/scm-history-graph-contribution.d.ts +4 -4
- package/lib/browser/scm-history-graph-contribution.d.ts.map +1 -1
- package/lib/browser/scm-history-graph-contribution.js +52 -60
- package/lib/browser/scm-history-graph-contribution.js.map +1 -1
- package/lib/browser/scm-history-graph-contribution.spec.js +35 -37
- package/lib/browser/scm-history-graph-contribution.spec.js.map +1 -1
- package/lib/browser/scm-history-graph-helpers.d.ts +1 -1
- package/lib/browser/scm-history-graph-helpers.d.ts.map +1 -1
- package/lib/browser/scm-history-graph-helpers.js +14 -30
- package/lib/browser/scm-history-graph-helpers.js.map +1 -1
- package/lib/browser/scm-history-graph-helpers.spec.js +44 -46
- package/lib/browser/scm-history-graph-helpers.spec.js.map +1 -1
- package/lib/browser/scm-history-graph-lanes.js +1 -4
- package/lib/browser/scm-history-graph-lanes.js.map +1 -1
- package/lib/browser/scm-history-graph-lanes.spec.js +135 -137
- package/lib/browser/scm-history-graph-lanes.spec.js.map +1 -1
- package/lib/browser/scm-history-graph-model.d.ts +4 -4
- package/lib/browser/scm-history-graph-model.d.ts.map +1 -1
- package/lib/browser/scm-history-graph-model.js +34 -43
- package/lib/browser/scm-history-graph-model.js.map +1 -1
- package/lib/browser/scm-history-graph-model.spec.js +74 -76
- package/lib/browser/scm-history-graph-model.spec.js.map +1 -1
- package/lib/browser/scm-history-graph-tooltip.d.ts +2 -2
- package/lib/browser/scm-history-graph-tooltip.d.ts.map +1 -1
- package/lib/browser/scm-history-graph-tooltip.js +33 -42
- package/lib/browser/scm-history-graph-tooltip.js.map +1 -1
- package/lib/browser/scm-history-graph-tooltip.spec.js +63 -65
- package/lib/browser/scm-history-graph-tooltip.spec.js.map +1 -1
- package/lib/browser/scm-history-graph-widget.d.ts +7 -7
- package/lib/browser/scm-history-graph-widget.d.ts.map +1 -1
- package/lib/browser/scm-history-graph-widget.js +116 -134
- package/lib/browser/scm-history-graph-widget.js.map +1 -1
- package/lib/browser/scm-history-graph-widget.spec.js +40 -43
- package/lib/browser/scm-history-graph-widget.spec.js.map +1 -1
- package/lib/browser/scm-input.js +11 -16
- package/lib/browser/scm-input.js.map +1 -1
- package/lib/browser/scm-layout-migrations.js +15 -18
- package/lib/browser/scm-layout-migrations.js.map +1 -1
- package/lib/browser/scm-provider.js +1 -4
- package/lib/browser/scm-provider.js.map +1 -1
- package/lib/browser/scm-quick-open-service.d.ts +1 -1
- package/lib/browser/scm-quick-open-service.d.ts.map +1 -1
- package/lib/browser/scm-quick-open-service.js +20 -27
- package/lib/browser/scm-quick-open-service.js.map +1 -1
- package/lib/browser/scm-repositories-widget.d.ts +4 -4
- package/lib/browser/scm-repositories-widget.d.ts.map +1 -1
- package/lib/browser/scm-repositories-widget.js +55 -67
- package/lib/browser/scm-repositories-widget.js.map +1 -1
- package/lib/browser/scm-repositories-widget.spec.js +86 -89
- package/lib/browser/scm-repositories-widget.spec.js.map +1 -1
- package/lib/browser/scm-repository.d.ts +2 -2
- package/lib/browser/scm-repository.d.ts.map +1 -1
- package/lib/browser/scm-repository.js +6 -10
- package/lib/browser/scm-repository.js.map +1 -1
- package/lib/browser/scm-service.d.ts +3 -3
- package/lib/browser/scm-service.d.ts.map +1 -1
- package/lib/browser/scm-service.js +18 -22
- package/lib/browser/scm-service.js.map +1 -1
- package/lib/browser/scm-service.spec.js +15 -17
- package/lib/browser/scm-service.spec.js.map +1 -1
- package/lib/browser/scm-tree-label-provider.d.ts +1 -1
- package/lib/browser/scm-tree-label-provider.d.ts.map +1 -1
- package/lib/browser/scm-tree-label-provider.js +16 -20
- package/lib/browser/scm-tree-label-provider.js.map +1 -1
- package/lib/browser/scm-tree-model.d.ts +2 -2
- package/lib/browser/scm-tree-model.d.ts.map +1 -1
- package/lib/browser/scm-tree-model.js +27 -32
- package/lib/browser/scm-tree-model.js.map +1 -1
- package/lib/browser/scm-tree-widget.d.ts +4 -4
- package/lib/browser/scm-tree-widget.d.ts.map +1 -1
- package/lib/browser/scm-tree-widget.js +98 -122
- package/lib/browser/scm-tree-widget.js.map +1 -1
- package/lib/browser/scm-widget.d.ts +6 -6
- package/lib/browser/scm-widget.d.ts.map +1 -1
- package/lib/browser/scm-widget.js +49 -64
- package/lib/browser/scm-widget.js.map +1 -1
- package/lib/common/scm-preferences.js +21 -26
- package/lib/common/scm-preferences.js.map +1 -1
- package/lib/node/scm-backend-module.js +4 -6
- package/lib/node/scm-backend-module.js.map +1 -1
- package/package.json +16 -7
- package/src/browser/decorations/scm-decorations-service.ts +5 -5
- package/src/browser/dirty-diff/content-lines.spec.ts +3 -2
- package/src/browser/dirty-diff/diff-computer.spec.ts +4 -3
- package/src/browser/dirty-diff/diff-computer.ts +1 -1
- package/src/browser/dirty-diff/dirty-diff-decorator.ts +1 -1
- package/src/browser/dirty-diff/dirty-diff-module.ts +3 -3
- package/src/browser/dirty-diff/dirty-diff-navigator.ts +3 -3
- package/src/browser/dirty-diff/dirty-diff-widget.ts +2 -2
- package/src/browser/merge-editor/merge-editor-contribution.ts +2 -2
- package/src/browser/merge-editor/merge-editor-dev-contribution.ts +1 -1
- package/src/browser/merge-editor/merge-editor-module.ts +7 -7
- package/src/browser/merge-editor/merge-editor.ts +5 -5
- package/src/browser/merge-editor/model/live-diff.ts +2 -2
- package/src/browser/merge-editor/model/merge-editor-model.ts +8 -8
- package/src/browser/merge-editor/model/merge-range.ts +4 -4
- package/src/browser/merge-editor/model/range-editing.ts +1 -1
- package/src/browser/merge-editor/model/range-mapping.spec.ts +1 -1
- package/src/browser/merge-editor/model/range-mapping.ts +3 -3
- package/src/browser/merge-editor/view/diff-spacers.ts +1 -1
- package/src/browser/merge-editor/view/merge-editor-panes/index.ts +5 -5
- package/src/browser/merge-editor/view/merge-editor-panes/merge-editor-base-pane.ts +3 -3
- package/src/browser/merge-editor/view/merge-editor-panes/merge-editor-pane.ts +7 -7
- package/src/browser/merge-editor/view/merge-editor-panes/merge-editor-result-pane.ts +4 -4
- package/src/browser/merge-editor/view/merge-editor-panes/merge-editor-side-pane.ts +4 -4
- package/src/browser/merge-editor/view/merge-editor-scroll-sync.ts +2 -2
- package/src/browser/merge-editor/view/merge-editor-view-zones.ts +5 -5
- package/src/browser/merge-editor/view/merge-range-actions.ts +2 -2
- package/src/browser/multi-diff-editor/multi-diff-editor-module.ts +2 -2
- package/src/browser/multi-diff-editor/multi-diff-editor-widget-factory.ts +2 -2
- package/src/browser/multi-diff-editor/multi-diff-editor-widget.spec.ts +3 -3
- package/src/browser/multi-diff-editor/multi-diff-editor.spec.ts +1 -1
- package/src/browser/multi-diff-editor/multi-diff-editor.ts +1 -1
- package/src/browser/scm-action-button-widget.tsx +3 -3
- package/src/browser/scm-amend-component.tsx +3 -3
- package/src/browser/scm-amend-widget.tsx +3 -3
- package/src/browser/scm-commit-widget.tsx +2 -2
- package/src/browser/scm-context-key-service.spec.ts +3 -3
- package/src/browser/scm-contribution.ts +8 -8
- package/src/browser/scm-frontend-module.ts +23 -23
- package/src/browser/scm-groups-tree-model.ts +3 -3
- package/src/browser/scm-history-graph-contribution.spec.ts +3 -3
- package/src/browser/scm-history-graph-contribution.ts +6 -6
- package/src/browser/scm-history-graph-helpers.spec.ts +2 -2
- package/src/browser/scm-history-graph-helpers.ts +1 -1
- package/src/browser/scm-history-graph-lanes.spec.ts +1 -1
- package/src/browser/scm-history-graph-model.spec.ts +3 -3
- package/src/browser/scm-history-graph-model.ts +5 -5
- package/src/browser/scm-history-graph-tooltip.spec.ts +3 -3
- package/src/browser/scm-history-graph-tooltip.ts +3 -3
- package/src/browser/scm-history-graph-widget.spec.ts +4 -4
- package/src/browser/scm-history-graph-widget.tsx +8 -8
- package/src/browser/scm-layout-migrations.ts +1 -1
- package/src/browser/scm-quick-open-service.ts +1 -1
- package/src/browser/scm-repositories-widget.spec.ts +2 -2
- package/src/browser/scm-repositories-widget.tsx +4 -4
- package/src/browser/scm-repository.ts +2 -2
- package/src/browser/scm-service.spec.ts +2 -2
- package/src/browser/scm-service.ts +3 -3
- package/src/browser/scm-tree-label-provider.ts +1 -1
- package/src/browser/scm-tree-model.ts +2 -2
- package/src/browser/scm-tree-widget.tsx +4 -4
- package/src/browser/scm-widget.tsx +6 -6
- package/src/node/scm-backend-module.ts +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"diff-spacers.js","sourceRoot":"","sources":["../../../../src/browser/merge-editor/view/diff-spacers.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"diff-spacers.js","sourceRoot":"","sources":["../../../../src/browser/merge-editor/view/diff-spacers.ts"],"names":[],"mappings":"AAAA,gFAAgF;AAChF,6CAA6C;AAC7C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;AAEhF,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAgClC,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;IAE1B,kBAAkB,CAAC,OAAoC,EAAE,iBAAyB;QAC9E,MAAM,WAAW,GAAa,EAAE,CAAC;QACjC,MAAM,eAAe,GAAa,EAAE,CAAC;QACrC,MAAM,eAAe,GAAa,EAAE,CAAC;QACrC,IAAI,YAAY,GAAG,CAAC,CAAC;QACrB,IAAI,QAAQ,GAAG,CAAC,CAAC;QACjB,KAAK,MAAM,EAAE,aAAa,EAAE,aAAa,EAAE,IAAI,OAAO,EAAE,CAAC;YACrD,OAAO,YAAY,GAAG,aAAa,CAAC,eAAe,GAAG,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,SAAS,EAAE,aAAa,CAAC,SAAS,CAAC,EAAE,CAAC;gBAC/G,WAAW,CAAC,YAAY,CAAC,GAAG,YAAY,GAAG,QAAQ,CAAC;gBACpD,YAAY,EAAE,CAAC;YACnB,CAAC;YACD,MAAM,KAAK,GAAG,aAAa,CAAC,SAAS,GAAG,aAAa,CAAC,SAAS,CAAC;YAChE,QAAQ,IAAI,KAAK,CAAC;YAClB,IAAI,KAAK,GAAG,CAAC,EAAE,CAAC;gBACZ,eAAe,CAAC,YAAY,CAAC,GAAG,KAAK,CAAC;YAC1C,CAAC;YACD,IAAI,KAAK,GAAG,CAAC,EAAE,CAAC;gBACZ,eAAe,CAAC,aAAa,CAAC,sBAAsB,CAAC,GAAG,CAAC,KAAK,CAAC;gBAC/D,YAAY,IAAI,CAAC,KAAK,CAAC;YAC3B,CAAC;QACL,CAAC;QACD,OAAO,YAAY,IAAI,iBAAiB,EAAE,CAAC;YACvC,WAAW,CAAC,YAAY,CAAC,GAAG,YAAY,GAAG,QAAQ,CAAC;YACpD,YAAY,EAAE,CAAC;QACnB,CAAC;QACD,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,WAAW,EAAE,CAAC;IAC7D,CAAC;IAED;;;;;OAKG;IACH,uBAAuB,CAAC,gBAA+B;QACnD,IAAI,gBAAgB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC9B,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;QACvD,CAAC;QACD,IAAI,CAAC,gCAAgC,CAAC,gBAAgB,CAAC,CAAC;QACxD,MAAM,eAAe,GAAa,EAAE,CAAC;QACrC,MAAM,aAAa,GAA0B,EAAE,CAAC;QAChD,KAAK,MAAM,EAAE,eAAe,EAAE,WAAW,EAAE,IAAI,gBAAgB,EAAE,CAAC;YAC9D,MAAM,mBAAmB,GAAG,eAAe,CAAC,MAAM,EAAE,CAAC,CAAC,sEAAsE;YAC5H,aAAa,CAAC,IAAI,CAAC,EAAE,eAAe,EAAE,mBAAmB,EAAE,WAAW,EAAE,CAAC,CAAC;QAC9E,CAAC;QACD,MAAM,iBAAiB,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC;QAC9D,KAAK,IAAI,YAAY,GAAG,CAAC,EAAE,YAAY,GAAG,iBAAiB,EAAE,YAAY,EAAE,EAAE,CAAC;YAC1E,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,gBAAgB,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,CAAC,WAAW,CAAC,eAAe,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAC7G,IAAI,GAAG,GAAG,CAAC,EAAE,CAAC;gBACV,eAAe,CAAC,YAAY,CAAC,GAAG,GAAG,CAAC;gBACpC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,gBAAgB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;oBAC/C,MAAM,KAAK,GAAG,GAAG,GAAG,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC;oBAC7E,IAAI,KAAK,GAAG,CAAC,EAAE,CAAC;wBACZ,MAAM,EAAE,eAAe,EAAE,WAAW,EAAE,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC;wBAC1D,MAAM,YAAY,GAAG,IAAI,CAAC,WAAW,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC;wBACjE,eAAe,CAAC,YAAY,CAAC,GAAG,CAAC,eAAe,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,GAAG,KAAK,CAAC;oBACjF,CAAC;gBACL,CAAC;YACL,CAAC;QACL,CAAC;QACD,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,CAAC;IAC9C,CAAC;IAED;;;OAGG;IACH,mBAAmB,CAAC,EAAE,aAAa,EAA4B;QAC3D,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC3B,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC;QAChE,CAAC;QACD,IAAI,CAAC,gCAAgC,CAAC,aAAa,CAAC,CAAC;QACrD,MAAM,iBAAiB,GAAoC,EAAE,CAAC;QAC9D,KAAK,MAAM,EAAE,eAAe,EAAE,IAAI,aAAa,EAAE,CAAC;YAC9C,MAAM,mBAAmB,GAAG,eAAe,CAAC,MAAM,EAAE,CAAC,CAAC,sEAAsE;YAC5H,iBAAiB,CAAC,IAAI,CAAC,EAAE,eAAe,EAAE,mBAAmB,EAAE,CAAC,CAAC;QACrE,CAAC;QACD,wIAAwI;QACxI,MAAM,iBAAiB,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC;QAC9D,KAAK,IAAI,YAAY,GAAG,CAAC,EAAE,YAAY,GAAG,iBAAiB,EAAE,YAAY,EAAE,EAAE,CAAC;YAC1E,IAAI,aAAa,CAAC,KAAK,CAAC,CAAC,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC,WAAW,CAAC,YAAY,CAAC,KAAK,SAAS,CAAC,EAAE,CAAC;gBACpF,aAAa,CAAC,OAAO,CAAC,CAAC,EAAE,WAAW,EAAE,EAAE,KAAK,EAAE,EAAE;oBAC7C,MAAM,YAAY,GAAG,IAAI,CAAC,WAAW,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC;oBACjE,MAAM,EAAE,eAAe,EAAE,GAAG,iBAAiB,CAAC,KAAK,CAAC,CAAC;oBACrD,eAAe,CAAC,YAAY,CAAC,EAAE,CAAC;gBACpC,CAAC,CAAC,CAAC;YACP,CAAC;QACL,CAAC;QACD,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,CAAC;IAChD,CAAC;IAES,gCAAgC,CAAC,KAAkC;QACzE,IAAI,CAAC,UAAU,CAAC,kBAAkB,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,KAAK,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC;YACjH,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;QAC5D,CAAC;IACL,CAAC;IAES,WAAW,CAAC,YAAoB,EAAE,WAAqB;QAC7D,IAAI,YAAgC,CAAC;QACrC,MAAM,iBAAiB,GAAG,WAAW,CAAC,MAAM,CAAC;QAC7C,OAAO,YAAY,GAAG,iBAAiB,EAAE,CAAC;YACtC,YAAY,GAAG,WAAW,CAAC,YAAY,EAAE,CAAC,CAAC;YAC3C,IAAI,YAAY,KAAK,SAAS,EAAE,CAAC;gBAC7B,OAAO,YAAY,CAAC;YACxB,CAAC;QACL,CAAC;QACD,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;IACxC,CAAC;CACJ,CAAA;AA9GY,iBAAiB;IAD7B,UAAU,EAAE;GACA,iBAAiB,CA8G7B"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
export * from './merge-editor-pane';
|
|
2
|
-
export * from './merge-editor-pane-header';
|
|
3
|
-
export * from './merge-editor-base-pane';
|
|
4
|
-
export * from './merge-editor-side-pane';
|
|
5
|
-
export * from './merge-editor-result-pane';
|
|
1
|
+
export * from './merge-editor-pane.js';
|
|
2
|
+
export * from './merge-editor-pane-header.js';
|
|
3
|
+
export * from './merge-editor-base-pane.js';
|
|
4
|
+
export * from './merge-editor-side-pane.js';
|
|
5
|
+
export * from './merge-editor-result-pane.js';
|
|
6
6
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/browser/merge-editor/view/merge-editor-panes/index.ts"],"names":[],"mappings":"AAgBA,cAAc,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/browser/merge-editor/view/merge-editor-panes/index.ts"],"names":[],"mappings":"AAgBA,cAAc,wBAAwB,CAAC;AACvC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,+BAA+B,CAAC"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
// *****************************************************************************
|
|
3
2
|
// Copyright (C) 2025 1C-Soft LLC and others.
|
|
4
3
|
//
|
|
@@ -14,11 +13,9 @@
|
|
|
14
13
|
//
|
|
15
14
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
16
15
|
// *****************************************************************************
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
tslib_1.__exportStar(require("./merge-editor-side-pane"), exports);
|
|
23
|
-
tslib_1.__exportStar(require("./merge-editor-result-pane"), exports);
|
|
16
|
+
export * from './merge-editor-pane.js';
|
|
17
|
+
export * from './merge-editor-pane-header.js';
|
|
18
|
+
export * from './merge-editor-base-pane.js';
|
|
19
|
+
export * from './merge-editor-side-pane.js';
|
|
20
|
+
export * from './merge-editor-result-pane.js';
|
|
24
21
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/browser/merge-editor/view/merge-editor-panes/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/browser/merge-editor/view/merge-editor-panes/index.ts"],"names":[],"mappings":"AAAA,gFAAgF;AAChF,6CAA6C;AAC7C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;AAEhF,cAAc,wBAAwB,CAAC;AACvC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,+BAA+B,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { EditorDecoration, Range } from '@theia/editor/lib/browser';
|
|
2
|
-
import { MergeEditorPane } from './merge-editor-pane';
|
|
3
|
-
import { MergeRange } from '../../model/merge-range';
|
|
4
|
-
import { LineRange } from '../../model/line-range';
|
|
2
|
+
import { MergeEditorPane } from './merge-editor-pane.js';
|
|
3
|
+
import { MergeRange } from '../../model/merge-range.js';
|
|
4
|
+
import { LineRange } from '../../model/line-range.js';
|
|
5
5
|
export declare class MergeEditorBasePane extends MergeEditorPane {
|
|
6
6
|
constructor();
|
|
7
7
|
getLineRangeForMergeRange(mergeRange: MergeRange): LineRange;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"merge-editor-base-pane.d.ts","sourceRoot":"","sources":["../../../../../src/browser/merge-editor/view/merge-editor-panes/merge-editor-base-pane.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAE,gBAAgB,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,eAAe,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"merge-editor-base-pane.d.ts","sourceRoot":"","sources":["../../../../../src/browser/merge-editor/view/merge-editor-panes/merge-editor-base-pane.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAE,gBAAgB,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AACxD,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAEtD,qBACa,mBAAoB,SAAQ,eAAe;;IAO3C,yBAAyB,CAAC,UAAU,EAAE,UAAU,GAAG,SAAS;cAIlD,kBAAkB,CAAC,KAAK,EAAE,KAAK,GAAG,KAAK;cAIvC,qBAAqB,IAAI,IAAI;cAU7B,wBAAwB,IAAI,gBAAgB,EAAE;CAoBpE"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
// *****************************************************************************
|
|
3
2
|
// Copyright (C) 2025 1C-Soft LLC and others.
|
|
4
3
|
//
|
|
@@ -14,14 +13,12 @@
|
|
|
14
13
|
//
|
|
15
14
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
16
15
|
// *****************************************************************************
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
const merge_editor_pane_1 = require("./merge-editor-pane");
|
|
24
|
-
let MergeEditorBasePane = class MergeEditorBasePane extends merge_editor_pane_1.MergeEditorPane {
|
|
16
|
+
import { __decorate } from "tslib";
|
|
17
|
+
import { injectable } from '@theia/core/shared/inversify';
|
|
18
|
+
import { nls } from '@theia/core';
|
|
19
|
+
import { Autorun } from '@theia/core/lib/common/observable';
|
|
20
|
+
import { MergeEditorPane } from './merge-editor-pane.js';
|
|
21
|
+
let MergeEditorBasePane = class MergeEditorBasePane extends MergeEditorPane {
|
|
25
22
|
constructor() {
|
|
26
23
|
super();
|
|
27
24
|
this.addClass('base');
|
|
@@ -34,9 +31,9 @@ let MergeEditorBasePane = class MergeEditorBasePane extends merge_editor_pane_1.
|
|
|
34
31
|
}
|
|
35
32
|
onAfterMergeEditorSet() {
|
|
36
33
|
super.onAfterMergeEditorSet();
|
|
37
|
-
this.toDispose.push(
|
|
34
|
+
this.toDispose.push(Autorun.create(() => {
|
|
38
35
|
const { currentPane, side1Pane, side1Title, side2Pane, side2Title } = this.mergeEditor;
|
|
39
|
-
this.header.description = currentPane === this ? '' :
|
|
36
|
+
this.header.description = currentPane === this ? '' : nls.localizeByDefault('Comparing with {0}', currentPane === side1Pane ? side1Title : currentPane === side2Pane ? side2Title : nls.localizeByDefault('Result'));
|
|
40
37
|
}));
|
|
41
38
|
}
|
|
42
39
|
computeEditorDecorations() {
|
|
@@ -57,9 +54,8 @@ let MergeEditorBasePane = class MergeEditorBasePane extends merge_editor_pane_1.
|
|
|
57
54
|
return result;
|
|
58
55
|
}
|
|
59
56
|
};
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
(0, inversify_1.injectable)(),
|
|
63
|
-
tslib_1.__metadata("design:paramtypes", [])
|
|
57
|
+
MergeEditorBasePane = __decorate([
|
|
58
|
+
injectable()
|
|
64
59
|
], MergeEditorBasePane);
|
|
60
|
+
export { MergeEditorBasePane };
|
|
65
61
|
//# sourceMappingURL=merge-editor-base-pane.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"merge-editor-base-pane.js","sourceRoot":"","sources":["../../../../../src/browser/merge-editor/view/merge-editor-panes/merge-editor-base-pane.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"merge-editor-base-pane.js","sourceRoot":"","sources":["../../../../../src/browser/merge-editor/view/merge-editor-panes/merge-editor-base-pane.ts"],"names":[],"mappings":"AAAA,gFAAgF;AAChF,6CAA6C;AAC7C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;AAEhF,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAC1D,OAAO,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AAClC,OAAO,EAAE,OAAO,EAAE,MAAM,mCAAmC,CAAC;AAE5D,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAKlD,IAAM,mBAAmB,GAAzB,MAAM,mBAAoB,SAAQ,eAAe;IAEpD;QACI,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IAC1B,CAAC;IAEQ,yBAAyB,CAAC,UAAsB;QACrD,OAAO,UAAU,CAAC,SAAS,CAAC;IAChC,CAAC;IAEkB,kBAAkB,CAAC,KAAY;QAC9C,OAAO,KAAK,CAAC;IACjB,CAAC;IAEkB,qBAAqB;QACpC,KAAK,CAAC,qBAAqB,EAAE,CAAC;QAC9B,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE;YACpC,MAAM,EAAE,WAAW,EAAE,SAAS,EAAE,UAAU,EAAE,SAAS,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,WAAW,CAAC;YACvF,IAAI,CAAC,MAAM,CAAC,WAAW,GAAG,WAAW,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,iBAAiB,CAAC,oBAAoB,EAC5F,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CACpH,CAAC;QACN,CAAC,CAAC,CAAC,CAAC;IACR,CAAC;IAEkB,wBAAwB;QACvC,MAAM,MAAM,GAAuB,EAAE,CAAC;QAEtC,MAAM,EAAE,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,SAAS,EAAE,iBAAiB,EAAE,GAAG,IAAI,CAAC,WAAW,CAAC;QAEzF,KAAK,MAAM,UAAU,IAAI,KAAK,CAAC,WAAW,EAAE,CAAC;YACzC,MAAM,SAAS,GAAG,UAAU,CAAC,SAAS,CAAC;YACvC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,sBAAsB,CAAC,SAAS,EAAE;gBAC/C,SAAS,EAAE,KAAK,CAAC,mBAAmB,CAAC,UAAU,CAAC;gBAChD,SAAS,EAAE,UAAU,KAAK,iBAAiB;gBAC3C,UAAU,EAAE,SAAS,CAAC,eAAe,GAAG,KAAK,CAAC,YAAY,CAAC,SAAS;aACvE,CAAC,CAAC,CAAC;QACR,CAAC;QAED,IAAI,WAAW,KAAK,IAAI,EAAE,CAAC;YACvB,MAAM,OAAO,GAAG,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC;YACtI,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,mBAAmB,CAAC,OAAO,EAAE,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC;QAChF,CAAC;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ,CAAA;AA7CY,mBAAmB;IAD/B,UAAU,EAAE;GACA,mBAAmB,CA6C/B"}
|
|
@@ -1,8 +1,5 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
exports.MergeEditorPaneHeader = void 0;
|
|
4
|
-
const tslib_1 = require("tslib");
|
|
5
|
-
const jsx_runtime_1 = require("@theia/core/shared/react/jsx-runtime");
|
|
1
|
+
import { __decorate } from "tslib";
|
|
2
|
+
import { jsx as _jsx, jsxs as _jsxs } from "@theia/core/shared/react/jsx-runtime";
|
|
6
3
|
// *****************************************************************************
|
|
7
4
|
// Copyright (C) 2025 1C-Soft LLC and others.
|
|
8
5
|
//
|
|
@@ -18,11 +15,11 @@ const jsx_runtime_1 = require("@theia/core/shared/react/jsx-runtime");
|
|
|
18
15
|
//
|
|
19
16
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
20
17
|
// *****************************************************************************
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
let MergeEditorPaneHeader = class MergeEditorPaneHeader extends
|
|
18
|
+
import { inject, injectable, postConstruct } from '@theia/core/shared/inversify';
|
|
19
|
+
import * as React from '@theia/core/shared/react';
|
|
20
|
+
import { codicon, onDomEvent, ReactWidget } from '@theia/core/lib/browser';
|
|
21
|
+
import { LabelParser } from '@theia/core/lib/browser/label-parser';
|
|
22
|
+
let MergeEditorPaneHeader = class MergeEditorPaneHeader extends ReactWidget {
|
|
26
23
|
constructor() {
|
|
27
24
|
super(...arguments);
|
|
28
25
|
this._description = '';
|
|
@@ -54,7 +51,7 @@ let MergeEditorPaneHeader = class MergeEditorPaneHeader extends browser_1.ReactW
|
|
|
54
51
|
this.addClass('header');
|
|
55
52
|
this.scrollOptions = undefined;
|
|
56
53
|
this.node.tabIndex = -1;
|
|
57
|
-
this.toDispose.push(
|
|
54
|
+
this.toDispose.push(onDomEvent(this.node, 'click', () => this.activate()));
|
|
58
55
|
this.title.changed.connect(this.update, this);
|
|
59
56
|
}
|
|
60
57
|
onActivateRequest(msg) {
|
|
@@ -62,7 +59,7 @@ let MergeEditorPaneHeader = class MergeEditorPaneHeader extends browser_1.ReactW
|
|
|
62
59
|
this.parent?.activate();
|
|
63
60
|
}
|
|
64
61
|
render() {
|
|
65
|
-
return ((
|
|
62
|
+
return (_jsxs(React.Fragment, { children: [_jsx("span", { className: 'title', children: this.renderWithIcons(this.title.label) }), _jsx("span", { className: 'description', children: this.renderWithIcons(this.description) }), _jsx("span", { className: 'detail', children: this.renderWithIcons(this.detail) }), _jsx("span", { className: 'toolbar', onClick: this.handleToolbarClick, children: this.toolbarItems.map(toolbarItem => this.renderToolbarItem(toolbarItem)) })] }));
|
|
66
63
|
}
|
|
67
64
|
renderWithIcons(text) {
|
|
68
65
|
const result = [];
|
|
@@ -72,27 +69,23 @@ let MergeEditorPaneHeader = class MergeEditorPaneHeader extends browser_1.ReactW
|
|
|
72
69
|
result.push(labelPart);
|
|
73
70
|
}
|
|
74
71
|
else {
|
|
75
|
-
result.push((
|
|
72
|
+
result.push(_jsx("span", { className: codicon(labelPart.name) }, index));
|
|
76
73
|
}
|
|
77
74
|
});
|
|
78
75
|
return result;
|
|
79
76
|
}
|
|
80
77
|
renderToolbarItem({ id, label, tooltip, className, onClick }) {
|
|
81
|
-
return (
|
|
78
|
+
return _jsx("span", { title: tooltip, onClick: onClick, className: className, children: label }, id);
|
|
82
79
|
}
|
|
83
80
|
};
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
(0, inversify_1.inject)(label_parser_1.LabelParser),
|
|
87
|
-
tslib_1.__metadata("design:type", label_parser_1.LabelParser)
|
|
81
|
+
__decorate([
|
|
82
|
+
inject(LabelParser)
|
|
88
83
|
], MergeEditorPaneHeader.prototype, "labelParser", void 0);
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
tslib_1.__metadata("design:type", Function),
|
|
92
|
-
tslib_1.__metadata("design:paramtypes", []),
|
|
93
|
-
tslib_1.__metadata("design:returntype", void 0)
|
|
84
|
+
__decorate([
|
|
85
|
+
postConstruct()
|
|
94
86
|
], MergeEditorPaneHeader.prototype, "init", null);
|
|
95
|
-
|
|
96
|
-
|
|
87
|
+
MergeEditorPaneHeader = __decorate([
|
|
88
|
+
injectable()
|
|
97
89
|
], MergeEditorPaneHeader);
|
|
90
|
+
export { MergeEditorPaneHeader };
|
|
98
91
|
//# sourceMappingURL=merge-editor-pane-header.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"merge-editor-pane-header.js","sourceRoot":"","sources":["../../../../../src/browser/merge-editor/view/merge-editor-panes/merge-editor-pane-header.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"merge-editor-pane-header.js","sourceRoot":"","sources":["../../../../../src/browser/merge-editor/view/merge-editor-panes/merge-editor-pane-header.tsx"],"names":[],"mappings":";;AAAA,gFAAgF;AAChF,6CAA6C;AAC7C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;AAEhF,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AACjF,OAAO,KAAK,KAAK,MAAM,0BAA0B,CAAC;AAClD,OAAO,EAAE,OAAO,EAAW,UAAU,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACpF,OAAO,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AAG5D,IAAM,qBAAqB,GAA3B,MAAM,qBAAsB,SAAQ,WAAW;IAA/C;;QAKK,iBAAY,GAAG,EAAE,CAAC;QASlB,YAAO,GAAG,EAAE,CAAC;QA2CJ,uBAAkB,GAAG,CAAC,KAAuB,EAAE,EAAE,CAAC,KAAK,CAAC,WAAW,CAAC,wBAAwB,EAAE,CAAC;IAkBpH,CAAC;IArEG,IAAI,WAAW;QACX,OAAO,IAAI,CAAC,YAAY,CAAC;IAC7B,CAAC;IACD,IAAI,WAAW,CAAC,WAAmB;QAC/B,IAAI,CAAC,YAAY,GAAG,WAAW,CAAC;QAChC,IAAI,CAAC,MAAM,EAAE,CAAC;IAClB,CAAC;IAGD,IAAI,MAAM;QACN,OAAO,IAAI,CAAC,OAAO,CAAC;IACxB,CAAC;IACD,IAAI,MAAM,CAAC,MAAc;QACrB,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACtB,IAAI,CAAC,MAAM,EAAE,CAAC;IAClB,CAAC;IAGD,IAAI,YAAY;QACZ,OAAO,IAAI,CAAC,aAAa,CAAC;IAC9B,CAAC;IACD,IAAI,YAAY,CAAC,YAAmD;QAChE,IAAI,CAAC,aAAa,GAAG,YAAY,CAAC;QAClC,IAAI,CAAC,MAAM,EAAE,CAAC;IAClB,CAAC;IAGS,IAAI;QACV,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QACxB,IAAI,CAAC,aAAa,GAAG,SAAS,CAAC;QAC/B,IAAI,CAAC,IAAI,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC;QACxB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;QAC3E,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAClD,CAAC;IAEkB,iBAAiB,CAAC,GAAY;QAC7C,KAAK,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC;QAC7B,IAAI,CAAC,MAAM,EAAE,QAAQ,EAAE,CAAC;IAC5B,CAAC;IAEkB,MAAM;QACrB,OAAO,CACH,MAAC,KAAK,CAAC,QAAQ,eACX,eAAM,SAAS,EAAC,OAAO,YAAE,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,GAAQ,EACvE,eAAM,SAAS,EAAC,aAAa,YAAE,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,WAAW,CAAC,GAAQ,EAC7E,eAAM,SAAS,EAAC,QAAQ,YAAE,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC,GAAQ,EACnE,eAAM,SAAS,EAAC,SAAS,EAAC,OAAO,EAAE,IAAI,CAAC,kBAAkB,YAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,CAAC,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC,GAAQ,IACjI,CACpB,CAAC;IACN,CAAC;IAIS,eAAe,CAAC,IAAY;QAClC,MAAM,MAAM,GAAsB,EAAE,CAAC;QACrC,MAAM,UAAU,GAAG,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAChD,UAAU,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,KAAK,EAAE,EAAE;YACpC,IAAI,OAAO,SAAS,KAAK,QAAQ,EAAE,CAAC;gBAChC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAC3B,CAAC;iBAAM,CAAC;gBACJ,MAAM,CAAC,IAAI,CAAC,eAAkB,SAAS,EAAE,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,IAAzC,KAAK,CAA6C,CAAC,CAAC;YAC/E,CAAC;QACL,CAAC,CAAC,CAAC;QACH,OAAO,MAAM,CAAC;IAClB,CAAC;IAES,iBAAiB,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,OAAO,EAA8B;QAC9F,OAAO,eAAe,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,YAAG,KAAK,IAAlE,EAAE,CAAwE,CAAC;IACjG,CAAC;CACJ,CAAA;AAxEsB;IADlB,MAAM,CAAC,WAAW,CAAC;0DACwB;AA8BlC;IADT,aAAa,EAAE;iDAOf;AAvCQ,qBAAqB;IADjC,UAAU,EAAE;GACA,qBAAqB,CA2EjC"}
|
|
@@ -3,11 +3,11 @@ import { Observable } from '@theia/core/lib/common/observable';
|
|
|
3
3
|
import { BoxPanel, Message } from '@theia/core/lib/browser';
|
|
4
4
|
import { EditorDecoration, EditorWidget, Position, Range } from '@theia/editor/lib/browser';
|
|
5
5
|
import { MonacoEditor } from '@theia/monaco/lib/browser/monaco-editor';
|
|
6
|
-
import { MergeEditorPaneHeader, MergeEditorPaneToolbarItem } from './merge-editor-pane-header';
|
|
7
|
-
import { MergeEditor } from '../../merge-editor';
|
|
8
|
-
import { MergeRange } from '../../model/merge-range';
|
|
9
|
-
import { DetailedLineRangeMapping } from '../../model/range-mapping';
|
|
10
|
-
import { LineRange } from '../../model/line-range';
|
|
6
|
+
import { MergeEditorPaneHeader, MergeEditorPaneToolbarItem } from './merge-editor-pane-header.js';
|
|
7
|
+
import { MergeEditor } from '../../merge-editor.js';
|
|
8
|
+
import { MergeRange } from '../../model/merge-range.js';
|
|
9
|
+
import { DetailedLineRangeMapping } from '../../model/range-mapping.js';
|
|
10
|
+
import { LineRange } from '../../model/line-range.js';
|
|
11
11
|
export declare abstract class MergeEditorPane extends BoxPanel {
|
|
12
12
|
readonly header: MergeEditorPaneHeader;
|
|
13
13
|
readonly editorWidget: EditorWidget;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"merge-editor-pane.d.ts","sourceRoot":"","sources":["../../../../../src/browser/merge-editor/view/merge-editor-panes/merge-editor-pane.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAc,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAC/D,OAAO,EAA8B,UAAU,EAAuB,MAAM,mCAAmC,CAAC;AAChH,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAsC,QAAQ,EAAE,KAAK,EAA0B,MAAM,2BAA2B,CAAC;AACxJ,OAAO,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AAGvE,OAAO,EAAE,qBAAqB,EAAE,0BAA0B,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"merge-editor-pane.d.ts","sourceRoot":"","sources":["../../../../../src/browser/merge-editor/view/merge-editor-panes/merge-editor-pane.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAc,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAC/D,OAAO,EAA8B,UAAU,EAAuB,MAAM,mCAAmC,CAAC;AAChH,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAsC,QAAQ,EAAE,KAAK,EAA0B,MAAM,2BAA2B,CAAC;AACxJ,OAAO,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AAGvE,OAAO,EAAE,qBAAqB,EAAE,0BAA0B,EAAE,MAAM,+BAA+B,CAAC;AAClG,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AACxD,OAAO,EAAE,wBAAwB,EAAE,MAAM,8BAA8B,CAAC;AACxE,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAItD,8BACsB,eAAgB,SAAQ,QAAQ;IAGlD,QAAQ,CAAC,MAAM,EAAE,qBAAqB,CAAC;IAGvC,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;IAGpC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAA4B;IAEhD,IAAI,MAAM,IAAI,YAAY,CAEzB;IAED,SAAS,CAAC,YAAY,EAAE,WAAW,CAAC;IAEpC,SAAS,CAAC,wBAAwB,EAAE,UAAU,CAAC,QAAQ,CAAC,CAAC;IACzD,SAAS,CAAC,oBAAoB,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC;IACnD,SAAS,CAAC,mBAAmB,EAAE,UAAU,CAAC,KAAK,EAAE,GAAG,SAAS,CAAC,CAAC;IAE/D,SAAS,CAAC,QAAQ,CAAC,SAAS,uBAA8B;;IAQ1D,SAAS,CAAC,IAAI,IAAI,IAAI;IAeb,OAAO,IAAI,IAAI;IAKxB,IAAI,WAAW,IAAI,WAAW,CAE7B;IAED,IAAI,WAAW,CAAC,WAAW,EAAE,WAAW,EAMvC;IAED,SAAS,CAAC,qBAAqB,IAAI,IAAI;IAwBvC,IAAI,cAAc,IAAI,QAAQ,CAE7B;IAED,IAAI,UAAU,IAAI,MAAM,CAEvB;IAED,IAAI,SAAS,IAAI,KAAK,EAAE,GAAG,SAAS,CAEnC;IAED,cAAc,CAAC,UAAU,EAAE,UAAU,EAAE,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,IAAI;IAU5E,QAAQ,CAAC,yBAAyB,CAAC,UAAU,EAAE,UAAU,GAAG,SAAS;IAErE,SAAS,CAAC,QAAQ,CAAC,kBAAkB,CAAC,KAAK,EAAE,KAAK,GAAG,KAAK;IAE1D,SAAS,CAAC,eAAe,IAAI,0BAA0B,EAAE;IAIzD,SAAS,CAAC,wBAAwB,IAAI,gBAAgB,EAAE;IAIxD,SAAS,CAAC,sBAAsB,CAAC,SAAS,EAAE,SAAS,EACjD,EAAE,SAAS,EAAE,SAAS,EAAE,UAAU,EAAE,EAAE;QAAE,SAAS,EAAE,OAAO,CAAC;QAAC,SAAS,EAAE,OAAO,CAAC;QAAC,UAAU,EAAE,OAAO,CAAA;KAAE,GACtG,gBAAgB;IA8BnB,SAAS,CAAC,mBAAmB,CAAC,OAAO,EAAE,SAAS,wBAAwB,EAAE,EACtE,EAAE,QAAQ,EAAE,EAAE;QAAE,QAAQ,EAAE,UAAU,GAAG,UAAU,CAAA;KAAE,GACpD,gBAAgB,EAAE;IA8BrB,SAAS,CAAC,eAAe,IAAI,IAAI;IAOjC,SAAS,CAAC,yBAAyB,IAAI,IAAI;cAkBxB,iBAAiB,CAAC,GAAG,EAAE,OAAO,GAAG,IAAI;CAI3D"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
// *****************************************************************************
|
|
3
2
|
// Copyright (C) 2025 1C-Soft LLC and others.
|
|
4
3
|
//
|
|
@@ -14,38 +13,36 @@
|
|
|
14
13
|
//
|
|
15
14
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
16
15
|
// *****************************************************************************
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
const scm_colors_1 = require("../../../scm-colors");
|
|
31
|
-
let MergeEditorPane = class MergeEditorPane extends browser_1.BoxPanel {
|
|
16
|
+
import { __decorate } from "tslib";
|
|
17
|
+
import { inject, injectable, postConstruct } from '@theia/core/shared/inversify';
|
|
18
|
+
import { Disposable, DisposableCollection } from '@theia/core';
|
|
19
|
+
import { Autorun, DerivedObservable, ObservableFromEvent } from '@theia/core/lib/common/observable';
|
|
20
|
+
import { BoxPanel } from '@theia/core/lib/browser';
|
|
21
|
+
import { EditorWidget, MinimapPosition, OverviewRulerLane, TrackedRangeStickiness } from '@theia/editor/lib/browser';
|
|
22
|
+
import { MonacoEditor } from '@theia/monaco/lib/browser/monaco-editor';
|
|
23
|
+
import { MonacoToProtocolConverter } from '@theia/monaco/lib/browser/monaco-to-protocol-converter';
|
|
24
|
+
import { Selection } from '@theia/monaco-editor-core';
|
|
25
|
+
import { MergeEditorPaneHeader } from './merge-editor-pane-header.js';
|
|
26
|
+
import { RangeUtils } from '../../model/range-utils.js';
|
|
27
|
+
import { ScmColors } from '../../../scm-colors.js';
|
|
28
|
+
let MergeEditorPane = class MergeEditorPane extends BoxPanel {
|
|
32
29
|
get editor() {
|
|
33
|
-
return
|
|
30
|
+
return MonacoEditor.get(this.editorWidget);
|
|
34
31
|
}
|
|
35
32
|
constructor() {
|
|
36
33
|
super({ spacing: 0 });
|
|
37
|
-
this.toDispose = new
|
|
34
|
+
this.toDispose = new DisposableCollection();
|
|
38
35
|
this.addClass('editor-pane');
|
|
39
36
|
}
|
|
40
37
|
init() {
|
|
41
|
-
this.cursorPositionObservable =
|
|
42
|
-
this.cursorLineObservable =
|
|
43
|
-
this.selectionObservable =
|
|
38
|
+
this.cursorPositionObservable = ObservableFromEvent.create(this.editor.onCursorPositionChanged, () => this.editor.cursor);
|
|
39
|
+
this.cursorLineObservable = DerivedObservable.create(() => this.cursorPositionObservable.get().line);
|
|
40
|
+
this.selectionObservable = ObservableFromEvent.create(this.editor.getControl().onDidChangeCursorSelection, () => {
|
|
44
41
|
const selections = this.editor.getControl().getSelections();
|
|
45
42
|
return selections?.map(selection => this.m2p.asRange(selection));
|
|
46
43
|
});
|
|
47
|
-
|
|
48
|
-
|
|
44
|
+
BoxPanel.setStretch(this.header, 0);
|
|
45
|
+
BoxPanel.setStretch(this.editorWidget, 1);
|
|
49
46
|
this.addWidget(this.header);
|
|
50
47
|
this.addWidget(this.editorWidget);
|
|
51
48
|
}
|
|
@@ -65,20 +62,20 @@ let MergeEditorPane = class MergeEditorPane extends browser_1.BoxPanel {
|
|
|
65
62
|
}
|
|
66
63
|
onAfterMergeEditorSet() {
|
|
67
64
|
this.initContextKeys();
|
|
68
|
-
const toolbarItems =
|
|
69
|
-
this.toDispose.push(
|
|
65
|
+
const toolbarItems = DerivedObservable.create(() => this.getToolbarItems());
|
|
66
|
+
this.toDispose.push(Autorun.create(() => {
|
|
70
67
|
this.header.toolbarItems = toolbarItems.get();
|
|
71
68
|
}));
|
|
72
69
|
this.initSelectionSynchronizer();
|
|
73
70
|
let decorationIds = [];
|
|
74
|
-
const decorations =
|
|
75
|
-
const isVisible =
|
|
76
|
-
this.toDispose.push(
|
|
71
|
+
const decorations = DerivedObservable.create(() => this.computeEditorDecorations());
|
|
72
|
+
const isVisible = ObservableFromEvent.create(this.editorWidget.onDidChangeVisibility, () => this.editorWidget.isVisible);
|
|
73
|
+
this.toDispose.push(Autorun.create(() => {
|
|
77
74
|
if (this.mergeEditor.isShown && isVisible.get()) {
|
|
78
75
|
decorationIds = this.editor.deltaDecorations({ oldDecorations: decorationIds, newDecorations: decorations.get() });
|
|
79
76
|
}
|
|
80
77
|
}));
|
|
81
|
-
this.toDispose.push(
|
|
78
|
+
this.toDispose.push(Disposable.create(() => decorationIds = this.editor.deltaDecorations({ oldDecorations: decorationIds, newDecorations: [] })));
|
|
82
79
|
}
|
|
83
80
|
get cursorPosition() {
|
|
84
81
|
return this.cursorPositionObservable.get();
|
|
@@ -121,15 +118,15 @@ let MergeEditorPane = class MergeEditorPane extends browser_1.BoxPanel {
|
|
|
121
118
|
blockPadding,
|
|
122
119
|
blockIsAfterEnd: isAfterEnd,
|
|
123
120
|
minimap: {
|
|
124
|
-
position:
|
|
125
|
-
color: { id: isHandled ?
|
|
121
|
+
position: MinimapPosition.Gutter,
|
|
122
|
+
color: { id: isHandled ? ScmColors.handledConflictMinimapOverviewRulerColor : ScmColors.unhandledConflictMinimapOverviewRulerColor },
|
|
126
123
|
},
|
|
127
124
|
overviewRuler: {
|
|
128
|
-
position:
|
|
129
|
-
color: { id: isHandled ?
|
|
125
|
+
position: OverviewRulerLane.Center,
|
|
126
|
+
color: { id: isHandled ? ScmColors.handledConflictMinimapOverviewRulerColor : ScmColors.unhandledConflictMinimapOverviewRulerColor },
|
|
130
127
|
},
|
|
131
128
|
showIfCollapsed: true,
|
|
132
|
-
stickiness:
|
|
129
|
+
stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
|
|
133
130
|
}
|
|
134
131
|
};
|
|
135
132
|
}
|
|
@@ -143,7 +140,7 @@ let MergeEditorPane = class MergeEditorPane extends browser_1.BoxPanel {
|
|
|
143
140
|
options: {
|
|
144
141
|
className: 'diff',
|
|
145
142
|
isWholeLine: true,
|
|
146
|
-
stickiness:
|
|
143
|
+
stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
|
|
147
144
|
}
|
|
148
145
|
});
|
|
149
146
|
}
|
|
@@ -152,9 +149,9 @@ let MergeEditorPane = class MergeEditorPane extends browser_1.BoxPanel {
|
|
|
152
149
|
result.push({
|
|
153
150
|
range,
|
|
154
151
|
options: {
|
|
155
|
-
className:
|
|
152
|
+
className: RangeUtils.isEmpty(range) ? 'diff-empty-word' : 'diff-word',
|
|
156
153
|
showIfCollapsed: true,
|
|
157
|
-
stickiness:
|
|
154
|
+
stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
|
|
158
155
|
},
|
|
159
156
|
});
|
|
160
157
|
}
|
|
@@ -168,17 +165,17 @@ let MergeEditorPane = class MergeEditorPane extends browser_1.BoxPanel {
|
|
|
168
165
|
editor.createContextKey('mergeEditorResultUri', this.mergeEditor.resultUri.toString());
|
|
169
166
|
}
|
|
170
167
|
initSelectionSynchronizer() {
|
|
171
|
-
const selectionObservable =
|
|
168
|
+
const selectionObservable = DerivedObservable.create(() => {
|
|
172
169
|
const { selectionInBase, currentPane } = this.mergeEditor;
|
|
173
170
|
if (!selectionInBase || currentPane === this) {
|
|
174
171
|
return [];
|
|
175
172
|
}
|
|
176
173
|
return selectionInBase.map(range => this.translateBaseRange(range));
|
|
177
174
|
});
|
|
178
|
-
this.toDispose.push(
|
|
175
|
+
this.toDispose.push(Autorun.create(() => {
|
|
179
176
|
const selection = selectionObservable.get();
|
|
180
177
|
if (selection.length) {
|
|
181
|
-
this.editor.getControl().setSelections(selection.map(({ start, end }) => new
|
|
178
|
+
this.editor.getControl().setSelections(selection.map(({ start, end }) => new Selection(start.line + 1, start.character + 1, end.line + 1, end.character + 1)));
|
|
182
179
|
}
|
|
183
180
|
}));
|
|
184
181
|
}
|
|
@@ -187,27 +184,20 @@ let MergeEditorPane = class MergeEditorPane extends browser_1.BoxPanel {
|
|
|
187
184
|
this.editorWidget.editor.focus();
|
|
188
185
|
}
|
|
189
186
|
};
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
(0, inversify_1.inject)(merge_editor_pane_header_1.MergeEditorPaneHeader),
|
|
193
|
-
tslib_1.__metadata("design:type", merge_editor_pane_header_1.MergeEditorPaneHeader)
|
|
187
|
+
__decorate([
|
|
188
|
+
inject(MergeEditorPaneHeader)
|
|
194
189
|
], MergeEditorPane.prototype, "header", void 0);
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
tslib_1.__metadata("design:type", browser_2.EditorWidget)
|
|
190
|
+
__decorate([
|
|
191
|
+
inject(EditorWidget)
|
|
198
192
|
], MergeEditorPane.prototype, "editorWidget", void 0);
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
tslib_1.__metadata("design:type", monaco_to_protocol_converter_1.MonacoToProtocolConverter)
|
|
193
|
+
__decorate([
|
|
194
|
+
inject(MonacoToProtocolConverter)
|
|
202
195
|
], MergeEditorPane.prototype, "m2p", void 0);
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
tslib_1.__metadata("design:type", Function),
|
|
206
|
-
tslib_1.__metadata("design:paramtypes", []),
|
|
207
|
-
tslib_1.__metadata("design:returntype", void 0)
|
|
196
|
+
__decorate([
|
|
197
|
+
postConstruct()
|
|
208
198
|
], MergeEditorPane.prototype, "init", null);
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
tslib_1.__metadata("design:paramtypes", [])
|
|
199
|
+
MergeEditorPane = __decorate([
|
|
200
|
+
injectable()
|
|
212
201
|
], MergeEditorPane);
|
|
202
|
+
export { MergeEditorPane };
|
|
213
203
|
//# sourceMappingURL=merge-editor-pane.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"merge-editor-pane.js","sourceRoot":"","sources":["../../../../../src/browser/merge-editor/view/merge-editor-panes/merge-editor-pane.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"merge-editor-pane.js","sourceRoot":"","sources":["../../../../../src/browser/merge-editor/view/merge-editor-panes/merge-editor-pane.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { ILogger } from '@theia/core';
|
|
2
2
|
import { EditorDecoration, Range } from '@theia/editor/lib/browser';
|
|
3
3
|
import { NavigationLocationService } from '@theia/editor/lib/browser/navigation/navigation-location-service';
|
|
4
|
-
import { MergeEditorPane } from './merge-editor-pane';
|
|
5
|
-
import { MergeEditorPaneToolbarItem } from './merge-editor-pane-header';
|
|
6
|
-
import { LineRange } from '../../model/line-range';
|
|
7
|
-
import { MergeRange } from '../../model/merge-range';
|
|
4
|
+
import { MergeEditorPane } from './merge-editor-pane.js';
|
|
5
|
+
import { MergeEditorPaneToolbarItem } from './merge-editor-pane-header.js';
|
|
6
|
+
import { LineRange } from '../../model/line-range.js';
|
|
7
|
+
import { MergeRange } from '../../model/merge-range.js';
|
|
8
8
|
export declare class MergeEditorResultPane extends MergeEditorPane {
|
|
9
9
|
protected readonly logger: ILogger;
|
|
10
10
|
protected readonly navigationLocationService: NavigationLocationService;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"merge-editor-result-pane.d.ts","sourceRoot":"","sources":["../../../../../src/browser/merge-editor/view/merge-editor-panes/merge-editor-result-pane.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAO,OAAO,EAAE,MAAM,aAAa,CAAC;AAG3C,OAAO,EAAE,gBAAgB,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAC;AAEpE,OAAO,EAAE,yBAAyB,EAAE,MAAM,kEAAkE,CAAC;AAC7G,OAAO,EAAE,eAAe,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"merge-editor-result-pane.d.ts","sourceRoot":"","sources":["../../../../../src/browser/merge-editor/view/merge-editor-panes/merge-editor-result-pane.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAO,OAAO,EAAE,MAAM,aAAa,CAAC;AAG3C,OAAO,EAAE,gBAAgB,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAC;AAEpE,OAAO,EAAE,yBAAyB,EAAE,MAAM,kEAAkE,CAAC;AAC7G,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,0BAA0B,EAAE,MAAM,+BAA+B,CAAC;AAC3E,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAExD,qBACa,qBAAsB,SAAQ,eAAe;IAGtD,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IAGnC,SAAS,CAAC,QAAQ,CAAC,yBAAyB,EAAE,yBAAyB,CAAC;;cAOrD,eAAe,IAAI,IAAI;cAKvB,yBAAyB,IAAI,IAAI;IAU3C,yBAAyB,CAAC,UAAU,EAAE,UAAU,GAAG,SAAS;cAIlD,kBAAkB,CAAC,KAAK,EAAE,KAAK,GAAG,KAAK;IAI1D,SAAS,CAAC,2BAA2B,IAAI,IAAI;IAK7C,KAAK,IAAI,IAAI;cAiBM,eAAe,IAAI,0BAA0B,EAAE;cA0B/C,wBAAwB,IAAI,gBAAgB,EAAE;CAmBpE"}
|