@theia/scm 1.77.0-next.99 → 1.78.0-next.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,4 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
// *****************************************************************************
|
|
3
2
|
// Copyright (C) 2025 1C-Soft LLC and others.
|
|
4
3
|
//
|
|
@@ -15,18 +14,16 @@
|
|
|
15
14
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
16
15
|
// *****************************************************************************
|
|
17
16
|
var MergeEditorSettings_1, MergeEditorOpenHandler_1;
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
const merge_editor_scroll_sync_1 = require("./view/merge-editor-scroll-sync");
|
|
29
|
-
var MergeEditorUri;
|
|
17
|
+
import { __decorate } from "tslib";
|
|
18
|
+
import { inject, injectable, postConstruct } from '@theia/core/shared/inversify';
|
|
19
|
+
import { ArrayUtils, Disposable, DisposableCollection, nls, URI } from '@theia/core';
|
|
20
|
+
import { BaseWidget, FocusTracker, LabelProvider, NavigatableWidgetOpenHandler, PanelLayout, SplitPanel, StorageService } from '@theia/core/lib/browser';
|
|
21
|
+
import { Autorun, DerivedObservable, Observable, SettableObservable } from '@theia/core/lib/common/observable';
|
|
22
|
+
import { MergeEditorModel } from './model/merge-editor-model.js';
|
|
23
|
+
import { MergeEditorBasePane, MergeEditorResultPane, MergeEditorSide1Pane, MergeEditorSide2Pane } from './view/merge-editor-panes/index.js';
|
|
24
|
+
import { MergeEditorViewZoneComputer } from './view/merge-editor-view-zones.js';
|
|
25
|
+
import { MergeEditorScrollSync } from './view/merge-editor-scroll-sync.js';
|
|
26
|
+
export var MergeEditorUri;
|
|
30
27
|
(function (MergeEditorUri) {
|
|
31
28
|
const SCHEME = 'merge-editor';
|
|
32
29
|
function isMergeEditorUri(uri) {
|
|
@@ -34,7 +31,7 @@ var MergeEditorUri;
|
|
|
34
31
|
}
|
|
35
32
|
MergeEditorUri.isMergeEditorUri = isMergeEditorUri;
|
|
36
33
|
function encode({ baseUri, side1Uri, side2Uri, resultUri }) {
|
|
37
|
-
return new
|
|
34
|
+
return new URI().withScheme(SCHEME).withQuery(JSON.stringify([baseUri.toString(), side1Uri.toString(), side2Uri.toString(), resultUri.toString()]));
|
|
38
35
|
}
|
|
39
36
|
MergeEditorUri.encode = encode;
|
|
40
37
|
function decode(uri) {
|
|
@@ -46,18 +43,18 @@ var MergeEditorUri;
|
|
|
46
43
|
throw new Error(`The URI ${uri} is not a valid URI for scheme ${SCHEME}`);
|
|
47
44
|
}
|
|
48
45
|
return {
|
|
49
|
-
baseUri: new
|
|
50
|
-
side1Uri: new
|
|
51
|
-
side2Uri: new
|
|
52
|
-
resultUri: new
|
|
46
|
+
baseUri: new URI(mergeUris[0]),
|
|
47
|
+
side1Uri: new URI(mergeUris[1]),
|
|
48
|
+
side2Uri: new URI(mergeUris[2]),
|
|
49
|
+
resultUri: new URI(mergeUris[3])
|
|
53
50
|
};
|
|
54
51
|
}
|
|
55
52
|
MergeEditorUri.decode = decode;
|
|
56
|
-
})(MergeEditorUri || (
|
|
57
|
-
var MergeEditorLayoutMode;
|
|
53
|
+
})(MergeEditorUri || (MergeEditorUri = {}));
|
|
54
|
+
export var MergeEditorLayoutMode;
|
|
58
55
|
(function (MergeEditorLayoutMode) {
|
|
59
56
|
MergeEditorLayoutMode.DEFAULT = { kind: 'mixed', showBase: true, showBaseAtTop: false };
|
|
60
|
-
})(MergeEditorLayoutMode || (
|
|
57
|
+
})(MergeEditorLayoutMode || (MergeEditorLayoutMode = {}));
|
|
61
58
|
let MergeEditorSettings = class MergeEditorSettings {
|
|
62
59
|
constructor() {
|
|
63
60
|
this.layoutMode = MergeEditorLayoutMode.DEFAULT;
|
|
@@ -75,20 +72,19 @@ let MergeEditorSettings = class MergeEditorSettings {
|
|
|
75
72
|
]);
|
|
76
73
|
}
|
|
77
74
|
};
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
(0, inversify_1.inject)(browser_1.StorageService),
|
|
81
|
-
tslib_1.__metadata("design:type", Object)
|
|
75
|
+
__decorate([
|
|
76
|
+
inject(StorageService)
|
|
82
77
|
], MergeEditorSettings.prototype, "storageService", void 0);
|
|
83
|
-
|
|
84
|
-
|
|
78
|
+
MergeEditorSettings = MergeEditorSettings_1 = __decorate([
|
|
79
|
+
injectable()
|
|
85
80
|
], MergeEditorSettings);
|
|
86
|
-
|
|
81
|
+
export { MergeEditorSettings };
|
|
82
|
+
let MergeEditor = class MergeEditor extends BaseWidget {
|
|
87
83
|
constructor() {
|
|
88
84
|
super(...arguments);
|
|
89
|
-
this.visibilityObservable =
|
|
90
|
-
this.currentPaneObservable =
|
|
91
|
-
this.layoutModeObservable =
|
|
85
|
+
this.visibilityObservable = SettableObservable.create(true);
|
|
86
|
+
this.currentPaneObservable = SettableObservable.create(undefined);
|
|
87
|
+
this.layoutModeObservable = SettableObservable.create(MergeEditorLayoutMode.DEFAULT, {
|
|
92
88
|
isEqual: (a, b) => JSON.stringify(a) === JSON.stringify(b)
|
|
93
89
|
});
|
|
94
90
|
this.currentMergeRangeObservable = this.createCurrentMergeRangeObservable();
|
|
@@ -100,7 +96,7 @@ let MergeEditor = class MergeEditor extends browser_1.BaseWidget {
|
|
|
100
96
|
const { baseUri, side1Uri, side2Uri, resultUri } = this;
|
|
101
97
|
this.id = MergeEditorUri.encode({ baseUri, side1Uri, side2Uri, resultUri }).toString();
|
|
102
98
|
const setLabels = () => {
|
|
103
|
-
this.title.label =
|
|
99
|
+
this.title.label = nls.localizeByDefault('Merging: {0}', this.labelProvider.getName(resultUri));
|
|
104
100
|
this.title.iconClass = this.labelProvider.getIcon(resultUri) + ' file-icon';
|
|
105
101
|
this.resultPane.header.description = this.labelProvider.getLongName(resultUri);
|
|
106
102
|
};
|
|
@@ -112,18 +108,18 @@ let MergeEditor = class MergeEditor extends browser_1.BaseWidget {
|
|
|
112
108
|
}));
|
|
113
109
|
this.title.caption = resultUri.path.fsPath();
|
|
114
110
|
this.title.closable = true;
|
|
115
|
-
this.basePane.header.title.label =
|
|
116
|
-
this.side1Pane.header.title.label =
|
|
117
|
-
this.side2Pane.header.title.label =
|
|
118
|
-
this.resultPane.header.title.label =
|
|
111
|
+
this.basePane.header.title.label = nls.localizeByDefault('Base');
|
|
112
|
+
this.side1Pane.header.title.label = nls.localizeByDefault('Input 1');
|
|
113
|
+
this.side2Pane.header.title.label = nls.localizeByDefault('Input 2');
|
|
114
|
+
this.resultPane.header.title.label = nls.localizeByDefault('Result');
|
|
119
115
|
this.panes.forEach(pane => pane.mergeEditor = this);
|
|
120
|
-
const layout = this.layout = new
|
|
121
|
-
this.verticalSplitPanel = new
|
|
116
|
+
const layout = this.layout = new PanelLayout();
|
|
117
|
+
this.verticalSplitPanel = new SplitPanel({
|
|
122
118
|
spacing: 1, // --theia-border-width
|
|
123
119
|
orientation: 'vertical'
|
|
124
120
|
});
|
|
125
121
|
layout.addWidget(this.verticalSplitPanel);
|
|
126
|
-
this.horizontalSplitPanel = new
|
|
122
|
+
this.horizontalSplitPanel = new SplitPanel({
|
|
127
123
|
spacing: 1, // --theia-border-width
|
|
128
124
|
orientation: 'horizontal'
|
|
129
125
|
});
|
|
@@ -133,10 +129,10 @@ let MergeEditor = class MergeEditor extends browser_1.BaseWidget {
|
|
|
133
129
|
this.initCurrentPaneTracker();
|
|
134
130
|
}
|
|
135
131
|
createScrollSynchronizer() {
|
|
136
|
-
return new
|
|
132
|
+
return new MergeEditorScrollSync(this);
|
|
137
133
|
}
|
|
138
134
|
initCurrentPaneTracker() {
|
|
139
|
-
const focusTracker = new
|
|
135
|
+
const focusTracker = new FocusTracker();
|
|
140
136
|
this.toDispose.push(focusTracker);
|
|
141
137
|
focusTracker.currentChanged.connect((_, { oldValue, newValue }) => {
|
|
142
138
|
oldValue?.removeClass('focused');
|
|
@@ -153,9 +149,9 @@ let MergeEditor = class MergeEditor extends browser_1.BaseWidget {
|
|
|
153
149
|
}
|
|
154
150
|
}
|
|
155
151
|
doInitializeLayout() {
|
|
156
|
-
this.toDispose.push(
|
|
152
|
+
this.toDispose.push(Autorun.create(({ isFirstRun }) => {
|
|
157
153
|
const { layoutMode } = this;
|
|
158
|
-
|
|
154
|
+
Observable.noAutoTracking(() => {
|
|
159
155
|
const scrollState = this.scrollSync.storeScrollState();
|
|
160
156
|
const { currentPane } = this;
|
|
161
157
|
this.applyLayoutMode(layoutMode);
|
|
@@ -169,16 +165,16 @@ let MergeEditor = class MergeEditor extends browser_1.BaseWidget {
|
|
|
169
165
|
}));
|
|
170
166
|
let storedState;
|
|
171
167
|
let viewZones;
|
|
172
|
-
this.toDispose.push(
|
|
173
|
-
this.toDispose.push(
|
|
168
|
+
this.toDispose.push(Disposable.create(() => viewZones?.dispose()));
|
|
169
|
+
this.toDispose.push(Autorun.create(() => {
|
|
174
170
|
if (this.isShown) {
|
|
175
171
|
let scrollState;
|
|
176
|
-
|
|
172
|
+
Observable.noAutoTracking(() => {
|
|
177
173
|
scrollState = storedState?.scrollState ?? this.scrollSync.storeScrollState();
|
|
178
174
|
viewZones?.dispose();
|
|
179
175
|
});
|
|
180
176
|
viewZones = this.createViewZones();
|
|
181
|
-
|
|
177
|
+
Observable.noAutoTracking(() => {
|
|
182
178
|
if (storedState) {
|
|
183
179
|
const { currentPane } = storedState;
|
|
184
180
|
storedState = undefined;
|
|
@@ -189,7 +185,7 @@ let MergeEditor = class MergeEditor extends browser_1.BaseWidget {
|
|
|
189
185
|
});
|
|
190
186
|
}
|
|
191
187
|
else {
|
|
192
|
-
|
|
188
|
+
Observable.noAutoTracking(() => {
|
|
193
189
|
storedState = {
|
|
194
190
|
scrollState: this.scrollSync.storeScrollState(),
|
|
195
191
|
currentPane: this.currentPane
|
|
@@ -228,7 +224,7 @@ let MergeEditor = class MergeEditor extends browser_1.BaseWidget {
|
|
|
228
224
|
return this.currentPaneObservable.get();
|
|
229
225
|
}
|
|
230
226
|
createCurrentMergeRangeObservable() {
|
|
231
|
-
return
|
|
227
|
+
return DerivedObservable.create(() => {
|
|
232
228
|
const { currentPane } = this;
|
|
233
229
|
if (!currentPane) {
|
|
234
230
|
return undefined;
|
|
@@ -244,7 +240,7 @@ let MergeEditor = class MergeEditor extends browser_1.BaseWidget {
|
|
|
244
240
|
return this.currentMergeRangeObservable.get();
|
|
245
241
|
}
|
|
246
242
|
createSelectionInBaseObservable() {
|
|
247
|
-
return
|
|
243
|
+
return DerivedObservable.create(() => {
|
|
248
244
|
const { currentPane } = this;
|
|
249
245
|
return currentPane?.selection?.map(range => {
|
|
250
246
|
if (currentPane === this.side1Pane) {
|
|
@@ -356,8 +352,8 @@ let MergeEditor = class MergeEditor extends browser_1.BaseWidget {
|
|
|
356
352
|
const lineRange = pane.getLineRangeForMergeRange(mergeRange);
|
|
357
353
|
return lineRange.isEmpty ? lineRange.startLineNumber < cursorLine : lineRange.endLineNumberExclusive <= cursorLine;
|
|
358
354
|
};
|
|
359
|
-
const previousMergeRange =
|
|
360
|
-
|
|
355
|
+
const previousMergeRange = ArrayUtils.findLast(this.model.mergeRanges, mergeRange => predicate(mergeRange) && isBeforeCursorLine(mergeRange)) ||
|
|
356
|
+
ArrayUtils.findLast(this.model.mergeRanges, mergeRange => predicate(mergeRange));
|
|
361
357
|
if (previousMergeRange) {
|
|
362
358
|
pane.goToMergeRange(previousMergeRange);
|
|
363
359
|
}
|
|
@@ -451,17 +447,17 @@ let MergeEditor = class MergeEditor extends browser_1.BaseWidget {
|
|
|
451
447
|
}
|
|
452
448
|
this.horizontalSplitPanel.setRelativeSizes(horizontalSplitRatio);
|
|
453
449
|
// Keep the existing vertical split ratio if the layout mode change has not affected the vertical split layout.
|
|
454
|
-
if (!
|
|
450
|
+
if (!ArrayUtils.equals(oldVerticalSplitWidgets, this.verticalSplitPanel.widgets)) {
|
|
455
451
|
this.verticalSplitPanel.setRelativeSizes(verticalSplitRatio);
|
|
456
452
|
}
|
|
457
453
|
}
|
|
458
454
|
createViewZones() {
|
|
459
455
|
const { baseViewZones, side1ViewZones, side2ViewZones, resultViewZones } = this.viewZoneComputer.computeViewZones(this);
|
|
460
|
-
const toDispose = new
|
|
456
|
+
const toDispose = new DisposableCollection();
|
|
461
457
|
const addViewZones = (pane, viewZones) => {
|
|
462
458
|
const editor = pane.editor.getControl();
|
|
463
459
|
const viewZoneIds = [];
|
|
464
|
-
toDispose.push(
|
|
460
|
+
toDispose.push(Disposable.create(() => {
|
|
465
461
|
editor.changeViewZones(accessor => {
|
|
466
462
|
for (const viewZoneId of viewZoneIds) {
|
|
467
463
|
accessor.removeZone(viewZoneId);
|
|
@@ -501,53 +497,42 @@ let MergeEditor = class MergeEditor extends browser_1.BaseWidget {
|
|
|
501
497
|
}
|
|
502
498
|
}
|
|
503
499
|
};
|
|
504
|
-
|
|
505
|
-
|
|
506
|
-
(0, inversify_1.inject)(merge_editor_model_1.MergeEditorModel),
|
|
507
|
-
tslib_1.__metadata("design:type", merge_editor_model_1.MergeEditorModel)
|
|
500
|
+
__decorate([
|
|
501
|
+
inject(MergeEditorModel)
|
|
508
502
|
], MergeEditor.prototype, "model", void 0);
|
|
509
|
-
|
|
510
|
-
|
|
511
|
-
tslib_1.__metadata("design:type", merge_editor_panes_1.MergeEditorBasePane)
|
|
503
|
+
__decorate([
|
|
504
|
+
inject(MergeEditorBasePane)
|
|
512
505
|
], MergeEditor.prototype, "basePane", void 0);
|
|
513
|
-
|
|
514
|
-
|
|
515
|
-
tslib_1.__metadata("design:type", merge_editor_panes_1.MergeEditorSide1Pane)
|
|
506
|
+
__decorate([
|
|
507
|
+
inject(MergeEditorSide1Pane)
|
|
516
508
|
], MergeEditor.prototype, "side1Pane", void 0);
|
|
517
|
-
|
|
518
|
-
|
|
519
|
-
tslib_1.__metadata("design:type", merge_editor_panes_1.MergeEditorSide2Pane)
|
|
509
|
+
__decorate([
|
|
510
|
+
inject(MergeEditorSide2Pane)
|
|
520
511
|
], MergeEditor.prototype, "side2Pane", void 0);
|
|
521
|
-
|
|
522
|
-
|
|
523
|
-
tslib_1.__metadata("design:type", merge_editor_panes_1.MergeEditorResultPane)
|
|
512
|
+
__decorate([
|
|
513
|
+
inject(MergeEditorResultPane)
|
|
524
514
|
], MergeEditor.prototype, "resultPane", void 0);
|
|
525
|
-
|
|
526
|
-
|
|
527
|
-
tslib_1.__metadata("design:type", merge_editor_view_zones_1.MergeEditorViewZoneComputer)
|
|
515
|
+
__decorate([
|
|
516
|
+
inject(MergeEditorViewZoneComputer)
|
|
528
517
|
], MergeEditor.prototype, "viewZoneComputer", void 0);
|
|
529
|
-
|
|
530
|
-
|
|
531
|
-
tslib_1.__metadata("design:type", MergeEditorSettings)
|
|
518
|
+
__decorate([
|
|
519
|
+
inject(MergeEditorSettings)
|
|
532
520
|
], MergeEditor.prototype, "settings", void 0);
|
|
533
|
-
|
|
534
|
-
|
|
535
|
-
tslib_1.__metadata("design:type", browser_1.LabelProvider)
|
|
521
|
+
__decorate([
|
|
522
|
+
inject(LabelProvider)
|
|
536
523
|
], MergeEditor.prototype, "labelProvider", void 0);
|
|
537
|
-
|
|
538
|
-
|
|
539
|
-
tslib_1.__metadata("design:type", Function),
|
|
540
|
-
tslib_1.__metadata("design:paramtypes", []),
|
|
541
|
-
tslib_1.__metadata("design:returntype", void 0)
|
|
524
|
+
__decorate([
|
|
525
|
+
postConstruct()
|
|
542
526
|
], MergeEditor.prototype, "init", null);
|
|
543
|
-
|
|
544
|
-
|
|
527
|
+
MergeEditor = __decorate([
|
|
528
|
+
injectable()
|
|
545
529
|
], MergeEditor);
|
|
546
|
-
|
|
530
|
+
export { MergeEditor };
|
|
531
|
+
let MergeEditorOpenHandler = class MergeEditorOpenHandler extends NavigatableWidgetOpenHandler {
|
|
547
532
|
constructor() {
|
|
548
533
|
super(...arguments);
|
|
549
534
|
this.id = MergeEditorOpenHandler_1.ID;
|
|
550
|
-
this.label =
|
|
535
|
+
this.label = nls.localizeByDefault('Merge Editor');
|
|
551
536
|
}
|
|
552
537
|
static { MergeEditorOpenHandler_1 = this; }
|
|
553
538
|
static { this.ID = 'merge-editor-opener'; }
|
|
@@ -565,8 +550,8 @@ let MergeEditorOpenHandler = class MergeEditorOpenHandler extends browser_1.Navi
|
|
|
565
550
|
return widget;
|
|
566
551
|
}
|
|
567
552
|
};
|
|
568
|
-
|
|
569
|
-
|
|
570
|
-
(0, inversify_1.injectable)()
|
|
553
|
+
MergeEditorOpenHandler = MergeEditorOpenHandler_1 = __decorate([
|
|
554
|
+
injectable()
|
|
571
555
|
], MergeEditorOpenHandler);
|
|
556
|
+
export { MergeEditorOpenHandler };
|
|
572
557
|
//# sourceMappingURL=merge-editor.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"merge-editor.js","sourceRoot":"","sources":["../../../src/browser/merge-editor/merge-editor.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"merge-editor.js","sourceRoot":"","sources":["../../../src/browser/merge-editor/merge-editor.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
// *****************************************************************************
|
|
3
2
|
// Copyright (C) 2025 1C-Soft LLC and others.
|
|
4
3
|
//
|
|
@@ -19,13 +18,11 @@
|
|
|
19
18
|
* Licensed under the MIT License. See License.txt in the project root for license information.
|
|
20
19
|
*--------------------------------------------------------------------------------------------*/
|
|
21
20
|
// copied and modified from https://github.com/microsoft/vscode/blob/1.96.3/src/vs/workbench/contrib/mergeEditor/browser/model/lineRange.ts
|
|
22
|
-
|
|
23
|
-
exports.LineRange = void 0;
|
|
24
|
-
const vscode_languageserver_protocol_1 = require("@theia/core/shared/vscode-languageserver-protocol");
|
|
21
|
+
import { Range, uinteger } from '@theia/core/shared/vscode-languageserver-protocol';
|
|
25
22
|
/**
|
|
26
23
|
* Represents a range of whole lines of text. Line numbers are zero-based.
|
|
27
24
|
*/
|
|
28
|
-
class LineRange {
|
|
25
|
+
export class LineRange {
|
|
29
26
|
static compareByStart(a, b) {
|
|
30
27
|
return a.startLineNumber - b.startLineNumber;
|
|
31
28
|
}
|
|
@@ -92,20 +89,19 @@ class LineRange {
|
|
|
92
89
|
return result;
|
|
93
90
|
}
|
|
94
91
|
toRange() {
|
|
95
|
-
return
|
|
92
|
+
return Range.create(this.startLineNumber, 0, this.endLineNumberExclusive, 0);
|
|
96
93
|
}
|
|
97
94
|
toInclusiveRange() {
|
|
98
95
|
if (this.isEmpty) {
|
|
99
96
|
return undefined;
|
|
100
97
|
}
|
|
101
|
-
return
|
|
98
|
+
return Range.create(this.startLineNumber, 0, this.endLineNumberExclusive - 1, uinteger.MAX_VALUE);
|
|
102
99
|
}
|
|
103
100
|
toInclusiveRangeOrEmpty() {
|
|
104
101
|
if (this.isEmpty) {
|
|
105
|
-
return
|
|
102
|
+
return Range.create(this.startLineNumber, 0, this.startLineNumber, 0);
|
|
106
103
|
}
|
|
107
|
-
return
|
|
104
|
+
return Range.create(this.startLineNumber, 0, this.endLineNumberExclusive - 1, uinteger.MAX_VALUE);
|
|
108
105
|
}
|
|
109
106
|
}
|
|
110
|
-
exports.LineRange = LineRange;
|
|
111
107
|
//# sourceMappingURL=line-range.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"line-range.js","sourceRoot":"","sources":["../../../../src/browser/merge-editor/model/line-range.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"line-range.js","sourceRoot":"","sources":["../../../../src/browser/merge-editor/model/line-range.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@ import { Disposable, DisposableCollection } from '@theia/core';
|
|
|
2
2
|
import { Observable } from '@theia/core/lib/common/observable';
|
|
3
3
|
import { DiffComputer } from '@theia/core/lib/common/diff';
|
|
4
4
|
import { MonacoEditorModel } from '@theia/monaco/lib/browser/monaco-editor-model';
|
|
5
|
-
import { DetailedLineRangeMapping } from './range-mapping';
|
|
5
|
+
import { DetailedLineRangeMapping } from './range-mapping.js';
|
|
6
6
|
export declare class LiveDiff implements Disposable {
|
|
7
7
|
protected readonly originalDocument: MonacoEditorModel;
|
|
8
8
|
protected readonly modifiedDocument: MonacoEditorModel;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"live-diff.d.ts","sourceRoot":"","sources":["../../../../src/browser/merge-editor/model/live-diff.ts"],"names":[],"mappings":"AAqBA,OAAO,EAAE,UAAU,EAAE,oBAAoB,EAAO,MAAM,aAAa,CAAC;AACpE,OAAO,EAAW,UAAU,EAAwC,MAAM,mCAAmC,CAAC;AAC9G,OAAO,EAAE,YAAY,EAA8B,MAAM,6BAA6B,CAAC;AACvF,OAAO,EAAE,iBAAiB,EAAE,MAAM,+CAA+C,CAAC;AAClF,OAAO,EAAE,wBAAwB,EAAgB,MAAM,
|
|
1
|
+
{"version":3,"file":"live-diff.d.ts","sourceRoot":"","sources":["../../../../src/browser/merge-editor/model/live-diff.ts"],"names":[],"mappings":"AAqBA,OAAO,EAAE,UAAU,EAAE,oBAAoB,EAAO,MAAM,aAAa,CAAC;AACpE,OAAO,EAAW,UAAU,EAAwC,MAAM,mCAAmC,CAAC;AAC9G,OAAO,EAAE,YAAY,EAA8B,MAAM,6BAA6B,CAAC;AACvF,OAAO,EAAE,iBAAiB,EAAE,MAAM,+CAA+C,CAAC;AAClF,OAAO,EAAE,wBAAwB,EAAgB,MAAM,oBAAoB,CAAC;AAG5E,qBAAa,QAAS,YAAW,UAAU;IAQnC,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,iBAAiB;IACtD,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,iBAAiB;IACtD,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,YAAY;IARjD,SAAS,CAAC,cAAc,SAAK;IAC7B,SAAS,CAAC,QAAQ,CAAC,eAAe,2CAAyD;IAC3F,SAAS,CAAC,QAAQ,CAAC,iBAAiB,iEAAsE;IAC1G,SAAS,CAAC,QAAQ,CAAC,SAAS,uBAA8B;gBAGnC,gBAAgB,EAAE,iBAAiB,EACnC,gBAAgB,EAAE,iBAAiB,EACnC,YAAY,EAAE,YAAY;IAiBjD,OAAO,IAAI,IAAI;IAIf,IAAI,KAAK,IAAI,aAAa,CAEzB;IAED,IAAI,OAAO,IAAI,SAAS,wBAAwB,EAAE,CAEjD;IAED,SAAS,CAAC,SAAS,IAAI,IAAI;CAoC9B;AAED,0BAAkB,aAAa;IAC3B,YAAY,IAAA;IACZ,QAAQ,IAAA;IACR,QAAQ,IAAA;IACR,KAAK,IAAA;CACR"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
// *****************************************************************************
|
|
3
2
|
// Copyright (C) 2025 1C-Soft LLC and others.
|
|
4
3
|
//
|
|
@@ -19,23 +18,21 @@
|
|
|
19
18
|
* Licensed under the MIT License. See License.txt in the project root for license information.
|
|
20
19
|
*--------------------------------------------------------------------------------------------*/
|
|
21
20
|
// copied and modified from https://github.com/microsoft/vscode/blob/1.96.3/src/vs/workbench/contrib/mergeEditor/browser/model/textModelDiffs.ts
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
const line_range_1 = require("./line-range");
|
|
28
|
-
class LiveDiff {
|
|
21
|
+
import { DisposableCollection, URI } from '@theia/core';
|
|
22
|
+
import { Autorun, Observable, ObservableSignal, SettableObservable } from '@theia/core/lib/common/observable';
|
|
23
|
+
import { DetailedLineRangeMapping, RangeMapping } from './range-mapping.js';
|
|
24
|
+
import { LineRange } from './line-range.js';
|
|
25
|
+
export class LiveDiff {
|
|
29
26
|
constructor(originalDocument, modifiedDocument, diffComputer) {
|
|
30
27
|
this.originalDocument = originalDocument;
|
|
31
28
|
this.modifiedDocument = modifiedDocument;
|
|
32
29
|
this.diffComputer = diffComputer;
|
|
33
30
|
this.recomputeCount = 0;
|
|
34
|
-
this.stateObservable =
|
|
35
|
-
this.changesObservable =
|
|
36
|
-
this.toDispose = new
|
|
37
|
-
const recomputeSignal =
|
|
38
|
-
this.toDispose.push(
|
|
31
|
+
this.stateObservable = SettableObservable.create(0 /* LiveDiffState.Initializing */);
|
|
32
|
+
this.changesObservable = SettableObservable.create([]);
|
|
33
|
+
this.toDispose = new DisposableCollection();
|
|
34
|
+
const recomputeSignal = ObservableSignal.create();
|
|
35
|
+
this.toDispose.push(Autorun.create(() => {
|
|
39
36
|
recomputeSignal.get();
|
|
40
37
|
this.recompute();
|
|
41
38
|
}));
|
|
@@ -56,7 +53,7 @@ class LiveDiff {
|
|
|
56
53
|
if (this.stateObservable.getUntracked() !== 0 /* LiveDiffState.Initializing */) { // untracked to avoid an infinite change loop in the autorun
|
|
57
54
|
this.stateObservable.set(2 /* LiveDiffState.Updating */);
|
|
58
55
|
}
|
|
59
|
-
this.diffComputer.computeDiff(new
|
|
56
|
+
this.diffComputer.computeDiff(new URI(this.originalDocument.uri), new URI(this.modifiedDocument.uri)).then(diff => {
|
|
60
57
|
if (this.toDispose.disposed || this.originalDocument.isDisposed() || this.modifiedDocument.isDisposed()) {
|
|
61
58
|
return;
|
|
62
59
|
}
|
|
@@ -64,9 +61,9 @@ class LiveDiff {
|
|
|
64
61
|
// There is a newer recompute call
|
|
65
62
|
return;
|
|
66
63
|
}
|
|
67
|
-
const toLineRange = (r) => new
|
|
68
|
-
const changes = diff?.changes.map(change => new
|
|
69
|
-
|
|
64
|
+
const toLineRange = (r) => new LineRange(r.start, r.end - r.start);
|
|
65
|
+
const changes = diff?.changes.map(change => new DetailedLineRangeMapping(toLineRange(change.left), this.originalDocument, toLineRange(change.right), this.modifiedDocument, change.innerChanges?.map(innerChange => new RangeMapping(innerChange.left, innerChange.right))));
|
|
66
|
+
Observable.update(() => {
|
|
70
67
|
if (changes) {
|
|
71
68
|
this.stateObservable.set(1 /* LiveDiffState.UpToDate */);
|
|
72
69
|
this.changesObservable.set(changes);
|
|
@@ -78,5 +75,4 @@ class LiveDiff {
|
|
|
78
75
|
});
|
|
79
76
|
}
|
|
80
77
|
}
|
|
81
|
-
exports.LiveDiff = LiveDiff;
|
|
82
78
|
//# sourceMappingURL=live-diff.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"live-diff.js","sourceRoot":"","sources":["../../../../src/browser/merge-editor/model/live-diff.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"live-diff.js","sourceRoot":"","sources":["../../../../src/browser/merge-editor/model/live-diff.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,10 +4,10 @@ import { DiffComputer } from '@theia/core/lib/common/diff';
|
|
|
4
4
|
import { Range } from '@theia/core/shared/vscode-languageserver-protocol';
|
|
5
5
|
import { MonacoEditor } from '@theia/monaco/lib/browser/monaco-editor';
|
|
6
6
|
import { MonacoEditorModel } from '@theia/monaco/lib/browser/monaco-editor-model';
|
|
7
|
-
import { MergeRange, MergeRangeAcceptedState, MergeRangeResultState, MergeSide } from './merge-range';
|
|
8
|
-
import { DetailedLineRangeMapping, DocumentLineRangeMap, DocumentRangeMap, LineRangeMapping, RangeMapping } from './range-mapping';
|
|
9
|
-
import { LiveDiff } from './live-diff';
|
|
10
|
-
import { LineRange } from './line-range';
|
|
7
|
+
import { MergeRange, MergeRangeAcceptedState, MergeRangeResultState, MergeSide } from './merge-range.js';
|
|
8
|
+
import { DetailedLineRangeMapping, DocumentLineRangeMap, DocumentRangeMap, LineRangeMapping, RangeMapping } from './range-mapping.js';
|
|
9
|
+
import { LiveDiff } from './live-diff.js';
|
|
10
|
+
import { LineRange } from './line-range.js';
|
|
11
11
|
export declare const MergeEditorModelProps: unique symbol;
|
|
12
12
|
export interface MergeEditorModelProps {
|
|
13
13
|
readonly baseEditor: MonacoEditor;
|