@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":"merge-range.js","sourceRoot":"","sources":["../../../../src/browser/merge-editor/model/merge-range.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"merge-range.js","sourceRoot":"","sources":["../../../../src/browser/merge-editor/model/merge-range.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Range } from '@theia/core/shared/vscode-languageserver-protocol';
|
|
2
|
-
import { LineRange } from './line-range';
|
|
2
|
+
import { LineRange } from './line-range.js';
|
|
3
3
|
import * as monaco from '@theia/monaco-editor-core';
|
|
4
4
|
/**
|
|
5
5
|
* Represents an edit, expressed in whole lines:
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"range-editing.d.ts","sourceRoot":"","sources":["../../../../src/browser/merge-editor/model/range-editing.ts"],"names":[],"mappings":"AAsBA,OAAO,EAAE,KAAK,EAAY,MAAM,mDAAmD,CAAC;AACpF,OAAO,EAAE,SAAS,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"range-editing.d.ts","sourceRoot":"","sources":["../../../../src/browser/merge-editor/model/range-editing.ts"],"names":[],"mappings":"AAsBA,OAAO,EAAE,KAAK,EAAY,MAAM,mDAAmD,CAAC;AACpF,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,KAAK,MAAM,MAAM,2BAA2B,CAAC;AAEpD;;;GAGG;AACH,qBAAa,aAAa;IAElB,QAAQ,CAAC,KAAK,EAAE,SAAS;IACzB,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE;gBADlB,KAAK,EAAE,SAAS,EAChB,QAAQ,EAAE,MAAM,EAAE;IAG/B,MAAM,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO;IAIrC,WAAW,CAAC,iBAAiB,EAAE,MAAM,GAAG,SAAS;CAoBpD;AAED,qBAAa,SAAS;IAEd,QAAQ,CAAC,KAAK,EAAE,KAAK;IACrB,QAAQ,CAAC,OAAO,EAAE,MAAM;gBADf,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,MAAM;IAG5B,YAAY,IAAI,MAAM,CAAC,MAAM,CAAC,oBAAoB;CAYrD"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
// *****************************************************************************
|
|
3
2
|
// Copyright (C) 2025 1C-Soft LLC and others.
|
|
4
3
|
//
|
|
@@ -19,34 +18,31 @@
|
|
|
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/editing.ts
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
const core_1 = require("@theia/core");
|
|
25
|
-
const vscode_languageserver_protocol_1 = require("@theia/core/shared/vscode-languageserver-protocol");
|
|
21
|
+
import { ArrayUtils } from '@theia/core';
|
|
22
|
+
import { Range, uinteger } from '@theia/core/shared/vscode-languageserver-protocol';
|
|
26
23
|
/**
|
|
27
24
|
* Represents an edit, expressed in whole lines:
|
|
28
25
|
* At (before) {@link LineRange.startLineNumber}, delete {@link LineRange.lineCount} many lines and insert {@link newLines}.
|
|
29
26
|
*/
|
|
30
|
-
class LineRangeEdit {
|
|
27
|
+
export class LineRangeEdit {
|
|
31
28
|
constructor(range, newLines) {
|
|
32
29
|
this.range = range;
|
|
33
30
|
this.newLines = newLines;
|
|
34
31
|
}
|
|
35
32
|
equals(other) {
|
|
36
|
-
return this.range.equals(other.range) &&
|
|
33
|
+
return this.range.equals(other.range) && ArrayUtils.equals(this.newLines, other.newLines);
|
|
37
34
|
}
|
|
38
35
|
toRangeEdit(documentLineCount) {
|
|
39
36
|
if (this.range.endLineNumberExclusive < documentLineCount) {
|
|
40
|
-
return new RangeEdit(
|
|
37
|
+
return new RangeEdit(Range.create(this.range.startLineNumber, 0, this.range.endLineNumberExclusive, 0), this.newLines.map(s => s + '\n').join(''));
|
|
41
38
|
}
|
|
42
39
|
if (this.range.startLineNumber === 0) {
|
|
43
|
-
return new RangeEdit(
|
|
40
|
+
return new RangeEdit(Range.create(0, 0, documentLineCount - 1, uinteger.MAX_VALUE), this.newLines.join('\n'));
|
|
44
41
|
}
|
|
45
|
-
return new RangeEdit(
|
|
42
|
+
return new RangeEdit(Range.create(this.range.startLineNumber - 1, uinteger.MAX_VALUE, documentLineCount - 1, uinteger.MAX_VALUE), this.newLines.map(s => '\n' + s).join(''));
|
|
46
43
|
}
|
|
47
44
|
}
|
|
48
|
-
|
|
49
|
-
class RangeEdit {
|
|
45
|
+
export class RangeEdit {
|
|
50
46
|
constructor(range, newText) {
|
|
51
47
|
this.range = range;
|
|
52
48
|
this.newText = newText;
|
|
@@ -64,5 +60,4 @@ class RangeEdit {
|
|
|
64
60
|
};
|
|
65
61
|
}
|
|
66
62
|
}
|
|
67
|
-
exports.RangeEdit = RangeEdit;
|
|
68
63
|
//# sourceMappingURL=range-editing.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"range-editing.js","sourceRoot":"","sources":["../../../../src/browser/merge-editor/model/range-editing.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"range-editing.js","sourceRoot":"","sources":["../../../../src/browser/merge-editor/model/range-editing.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;AAChF;;;gGAGgG;AAChG,yIAAyI;AAEzI,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,mDAAmD,CAAC;AAIpF;;;GAGG;AACH,MAAM,OAAO,aAAa;IACtB,YACa,KAAgB,EAChB,QAAkB;QADlB,UAAK,GAAL,KAAK,CAAW;QAChB,aAAQ,GAAR,QAAQ,CAAU;IAC3B,CAAC;IAEL,MAAM,CAAC,KAAoB;QACvB,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC;IAC9F,CAAC;IAED,WAAW,CAAC,iBAAyB;QACjC,IAAI,IAAI,CAAC,KAAK,CAAC,sBAAsB,GAAG,iBAAiB,EAAE,CAAC;YACxD,OAAO,IAAI,SAAS,CAChB,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,eAAe,EAAE,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,sBAAsB,EAAE,CAAC,CAAC,EACjF,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAC5C,CAAC;QACN,CAAC;QAED,IAAI,IAAI,CAAC,KAAK,CAAC,eAAe,KAAK,CAAC,EAAE,CAAC;YACnC,OAAO,IAAI,SAAS,CAChB,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,iBAAiB,GAAG,CAAC,EAAE,QAAQ,CAAC,SAAS,CAAC,EAC7D,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAC3B,CAAC;QACN,CAAC;QAED,OAAO,IAAI,SAAS,CAChB,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,eAAe,GAAG,CAAC,EAAE,QAAQ,CAAC,SAAS,EAAE,iBAAiB,GAAG,CAAC,EAAE,QAAQ,CAAC,SAAS,CAAC,EAC3G,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAC5C,CAAC;IACN,CAAC;CACJ;AAED,MAAM,OAAO,SAAS;IAClB,YACa,KAAY,EACZ,OAAe;QADf,UAAK,GAAL,KAAK,CAAO;QACZ,YAAO,GAAP,OAAO,CAAQ;IACxB,CAAC;IAEL,YAAY;QACR,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QAClC,OAAO;YACH,KAAK,EAAE;gBACH,eAAe,EAAE,KAAK,CAAC,IAAI,GAAG,CAAC;gBAC/B,WAAW,EAAE,KAAK,CAAC,SAAS,GAAG,CAAC;gBAChC,aAAa,EAAE,GAAG,CAAC,IAAI,GAAG,CAAC;gBAC3B,SAAS,EAAE,GAAG,CAAC,SAAS,GAAG,CAAC;aAC/B;YACD,IAAI,EAAE,IAAI,CAAC,OAAO;SACrB,CAAC;IACN,CAAC;CACJ"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Position, Range, TextEditorDocument } from '@theia/editor/lib/browser/editor';
|
|
2
|
-
import { LineRange } from './line-range';
|
|
3
|
-
import { LineRangeEdit } from './range-editing';
|
|
2
|
+
import { LineRange } from './line-range.js';
|
|
3
|
+
import { LineRangeEdit } from './range-editing.js';
|
|
4
4
|
/**
|
|
5
5
|
* Maps a line range in the original text document to a line range in the modified text document.
|
|
6
6
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"range-mapping.d.ts","sourceRoot":"","sources":["../../../../src/browser/merge-editor/model/range-mapping.ts"],"names":[],"mappings":"AAsBA,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AACvF,OAAO,EAAE,SAAS,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"range-mapping.d.ts","sourceRoot":"","sources":["../../../../src/browser/merge-editor/model/range-mapping.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,17 +18,15 @@
|
|
|
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/mapping.ts
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
const range_editing_1 = require("./range-editing");
|
|
28
|
-
const range_utils_1 = require("./range-utils");
|
|
21
|
+
import { ArrayUtils } from '@theia/core';
|
|
22
|
+
import { Range } from '@theia/editor/lib/browser/editor';
|
|
23
|
+
import { LineRange } from './line-range.js';
|
|
24
|
+
import { LineRangeEdit } from './range-editing.js';
|
|
25
|
+
import { PositionUtils, RangeUtils } from './range-utils.js';
|
|
29
26
|
/**
|
|
30
27
|
* Maps a line range in the original text document to a line range in the modified text document.
|
|
31
28
|
*/
|
|
32
|
-
class LineRangeMapping {
|
|
29
|
+
export class LineRangeMapping {
|
|
33
30
|
static join(mappings) {
|
|
34
31
|
return mappings.reduce((acc, cur) => acc ? acc.join(cur) : cur, undefined);
|
|
35
32
|
}
|
|
@@ -53,11 +50,10 @@ class LineRangeMapping {
|
|
|
53
50
|
return new LineRangeMapping(this.modifiedRange, this.originalRange);
|
|
54
51
|
}
|
|
55
52
|
}
|
|
56
|
-
exports.LineRangeMapping = LineRangeMapping;
|
|
57
53
|
/**
|
|
58
54
|
* Represents a total monotonous mapping of line ranges in one document to another document.
|
|
59
55
|
*/
|
|
60
|
-
class DocumentLineRangeMap {
|
|
56
|
+
export class DocumentLineRangeMap {
|
|
61
57
|
static betweenModifiedSides(side1Diff, side2Diff) {
|
|
62
58
|
const alignments = MappingAlignment.computeAlignments(side1Diff, side2Diff);
|
|
63
59
|
const mappings = alignments.map(alignment => new LineRangeMapping(alignment.side1Range, alignment.side2Range));
|
|
@@ -70,7 +66,7 @@ class DocumentLineRangeMap {
|
|
|
70
66
|
*/
|
|
71
67
|
lineRangeMappings) {
|
|
72
68
|
this.lineRangeMappings = lineRangeMappings;
|
|
73
|
-
if (!
|
|
69
|
+
if (!ArrayUtils.checkAdjacentItems(lineRangeMappings, (m1, m2) => m1.originalRange.isBefore(m2.originalRange) && m1.modifiedRange.isBefore(m2.modifiedRange) &&
|
|
74
70
|
m2.originalRange.startLineNumber - m1.originalRange.endLineNumberExclusive === m2.modifiedRange.startLineNumber - m1.modifiedRange.endLineNumberExclusive)) {
|
|
75
71
|
throw new Error('Illegal line range mappings');
|
|
76
72
|
}
|
|
@@ -81,7 +77,7 @@ class DocumentLineRangeMap {
|
|
|
81
77
|
* or the line range mapping for the affecting change otherwise
|
|
82
78
|
*/
|
|
83
79
|
projectLine(lineNumber) {
|
|
84
|
-
const lastBefore =
|
|
80
|
+
const lastBefore = ArrayUtils.findLast(this.lineRangeMappings, m => m.originalRange.startLineNumber <= lineNumber);
|
|
85
81
|
if (!lastBefore) {
|
|
86
82
|
return lineNumber;
|
|
87
83
|
}
|
|
@@ -94,13 +90,12 @@ class DocumentLineRangeMap {
|
|
|
94
90
|
return new DocumentLineRangeMap(this.lineRangeMappings.map(m => m.reverse()));
|
|
95
91
|
}
|
|
96
92
|
}
|
|
97
|
-
exports.DocumentLineRangeMap = DocumentLineRangeMap;
|
|
98
93
|
/**
|
|
99
94
|
* Aligns mappings for two modified sides with a common base range.
|
|
100
95
|
*/
|
|
101
|
-
class MappingAlignment {
|
|
96
|
+
export class MappingAlignment {
|
|
102
97
|
static computeAlignments(side1Mappings, side2Mappings) {
|
|
103
|
-
const combinedMappings = side1Mappings.map(mapping => ({ source: 0, mapping })).concat(side2Mappings.map(mapping => ({ source: 1, mapping }))).sort((a, b) =>
|
|
98
|
+
const combinedMappings = side1Mappings.map(mapping => ({ source: 0, mapping })).concat(side2Mappings.map(mapping => ({ source: 1, mapping }))).sort((a, b) => LineRange.compareByStart(a.mapping.originalRange, b.mapping.originalRange));
|
|
104
99
|
const currentMappings = [new Array(), new Array()];
|
|
105
100
|
const currentDelta = [0, 0];
|
|
106
101
|
const alignments = new Array();
|
|
@@ -110,7 +105,7 @@ class MappingAlignment {
|
|
|
110
105
|
function getAlignedModifiedRange(m) {
|
|
111
106
|
const startDelta = baseRange.startLineNumber - m.originalRange.startLineNumber;
|
|
112
107
|
const endDelta = baseRange.endLineNumberExclusive - m.originalRange.endLineNumberExclusive;
|
|
113
|
-
return new
|
|
108
|
+
return new LineRange(m.modifiedRange.startLineNumber + startDelta, m.modifiedRange.lineCount - startDelta + endDelta);
|
|
114
109
|
}
|
|
115
110
|
alignments.push(new MappingAlignment(baseRange, getAlignedModifiedRange(mapping1), currentMappings[0], getAlignedModifiedRange(mapping2), currentMappings[1]));
|
|
116
111
|
currentMappings[0] = [];
|
|
@@ -143,11 +138,10 @@ class MappingAlignment {
|
|
|
143
138
|
return `${this.side1Range} <- ${this.baseRange} -> ${this.side2Range}`;
|
|
144
139
|
}
|
|
145
140
|
}
|
|
146
|
-
exports.MappingAlignment = MappingAlignment;
|
|
147
141
|
/**
|
|
148
142
|
* A line range mapping with inner range mappings.
|
|
149
143
|
*/
|
|
150
|
-
class DetailedLineRangeMapping extends LineRangeMapping {
|
|
144
|
+
export class DetailedLineRangeMapping extends LineRangeMapping {
|
|
151
145
|
static join(mappings) {
|
|
152
146
|
return mappings.reduce((acc, cur) => acc ? acc.join(cur) : cur, undefined);
|
|
153
147
|
}
|
|
@@ -170,10 +164,10 @@ class DetailedLineRangeMapping extends LineRangeMapping {
|
|
|
170
164
|
return new DetailedLineRangeMapping(this.modifiedRange, this.modifiedDocument, this.originalRange, this.originalDocument, this.rangeMappings.map(m => m.reverse()));
|
|
171
165
|
}
|
|
172
166
|
getLineEdit() {
|
|
173
|
-
return new
|
|
167
|
+
return new LineRangeEdit(this.originalRange, this.getModifiedLines());
|
|
174
168
|
}
|
|
175
169
|
getReverseLineEdit() {
|
|
176
|
-
return new
|
|
170
|
+
return new LineRangeEdit(this.modifiedRange, this.getOriginalLines());
|
|
177
171
|
}
|
|
178
172
|
getModifiedLines() {
|
|
179
173
|
return this.modifiedRange.getLines(this.modifiedDocument);
|
|
@@ -182,11 +176,10 @@ class DetailedLineRangeMapping extends LineRangeMapping {
|
|
|
182
176
|
return this.originalRange.getLines(this.originalDocument);
|
|
183
177
|
}
|
|
184
178
|
}
|
|
185
|
-
exports.DetailedLineRangeMapping = DetailedLineRangeMapping;
|
|
186
179
|
/**
|
|
187
180
|
* Maps a range in the original text document to a range in the modified text document.
|
|
188
181
|
*/
|
|
189
|
-
class RangeMapping {
|
|
182
|
+
export class RangeMapping {
|
|
190
183
|
constructor(originalRange, modifiedRange) {
|
|
191
184
|
this.originalRange = originalRange;
|
|
192
185
|
this.modifiedRange = modifiedRange;
|
|
@@ -198,28 +191,27 @@ class RangeMapping {
|
|
|
198
191
|
return `${rangeToString(this.originalRange)} -> ${rangeToString(this.modifiedRange)}`;
|
|
199
192
|
}
|
|
200
193
|
addModifiedLineDelta(deltaLines) {
|
|
201
|
-
return new RangeMapping(this.originalRange,
|
|
194
|
+
return new RangeMapping(this.originalRange, Range.create(this.modifiedRange.start.line + deltaLines, this.modifiedRange.start.character, this.modifiedRange.end.line + deltaLines, this.modifiedRange.end.character));
|
|
202
195
|
}
|
|
203
196
|
addOriginalLineDelta(deltaLines) {
|
|
204
|
-
return new RangeMapping(
|
|
197
|
+
return new RangeMapping(Range.create(this.originalRange.start.line + deltaLines, this.originalRange.start.character, this.originalRange.end.line + deltaLines, this.originalRange.end.character), this.modifiedRange);
|
|
205
198
|
}
|
|
206
199
|
reverse() {
|
|
207
200
|
return new RangeMapping(this.modifiedRange, this.originalRange);
|
|
208
201
|
}
|
|
209
202
|
}
|
|
210
|
-
exports.RangeMapping = RangeMapping;
|
|
211
203
|
/**
|
|
212
204
|
* Represents a total monotonous mapping of ranges in one document to another document.
|
|
213
205
|
*/
|
|
214
|
-
class DocumentRangeMap {
|
|
206
|
+
export class DocumentRangeMap {
|
|
215
207
|
constructor(
|
|
216
208
|
/**
|
|
217
209
|
* The range mappings that define this document mapping.
|
|
218
210
|
*/
|
|
219
211
|
rangeMappings) {
|
|
220
212
|
this.rangeMappings = rangeMappings;
|
|
221
|
-
if (!
|
|
222
|
-
|
|
213
|
+
if (!ArrayUtils.checkAdjacentItems(rangeMappings, (m1, m2) => RangeUtils.isBefore(m1.originalRange, m2.originalRange) &&
|
|
214
|
+
RangeUtils.isBefore(m1.modifiedRange, m2.modifiedRange))) {
|
|
223
215
|
throw new Error('Illegal range mappings');
|
|
224
216
|
}
|
|
225
217
|
}
|
|
@@ -227,16 +219,16 @@ class DocumentRangeMap {
|
|
|
227
219
|
* @param position position in the original text document
|
|
228
220
|
*/
|
|
229
221
|
projectPosition(position) {
|
|
230
|
-
const lastBefore =
|
|
222
|
+
const lastBefore = ArrayUtils.findLast(this.rangeMappings, m => PositionUtils.isBeforeOrEqual(m.originalRange.start, position));
|
|
231
223
|
if (!lastBefore) {
|
|
232
|
-
return new RangeMapping(
|
|
224
|
+
return new RangeMapping(Range.create(position, position), Range.create(position, position));
|
|
233
225
|
}
|
|
234
|
-
if (
|
|
226
|
+
if (RangeUtils.containsPosition(lastBefore.originalRange, position)) {
|
|
235
227
|
return lastBefore;
|
|
236
228
|
}
|
|
237
|
-
const relativePosition =
|
|
238
|
-
const modifiedRangePosition =
|
|
239
|
-
return new RangeMapping(
|
|
229
|
+
const relativePosition = PositionUtils.relativize(lastBefore.originalRange.end, position);
|
|
230
|
+
const modifiedRangePosition = PositionUtils.resolve(lastBefore.modifiedRange.end, relativePosition);
|
|
231
|
+
return new RangeMapping(Range.create(position, position), Range.create(modifiedRangePosition, modifiedRangePosition));
|
|
240
232
|
}
|
|
241
233
|
/**
|
|
242
234
|
* @param range range in the original text document
|
|
@@ -244,11 +236,10 @@ class DocumentRangeMap {
|
|
|
244
236
|
projectRange(range) {
|
|
245
237
|
const start = this.projectPosition(range.start);
|
|
246
238
|
const end = this.projectPosition(range.end);
|
|
247
|
-
return new RangeMapping(
|
|
239
|
+
return new RangeMapping(RangeUtils.union(start.originalRange, end.originalRange), RangeUtils.union(start.modifiedRange, end.modifiedRange));
|
|
248
240
|
}
|
|
249
241
|
reverse() {
|
|
250
242
|
return new DocumentRangeMap(this.rangeMappings.map(m => m.reverse()));
|
|
251
243
|
}
|
|
252
244
|
}
|
|
253
|
-
exports.DocumentRangeMap = DocumentRangeMap;
|
|
254
245
|
//# sourceMappingURL=range-mapping.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"range-mapping.js","sourceRoot":"","sources":["../../../../src/browser/merge-editor/model/range-mapping.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"range-mapping.js","sourceRoot":"","sources":["../../../../src/browser/merge-editor/model/range-mapping.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,30 +18,29 @@
|
|
|
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/test/browser/mapping.test.ts
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
const range_mapping_1 = require("./range-mapping");
|
|
21
|
+
import { expect } from 'chai';
|
|
22
|
+
import { Range } from '@theia/core/shared/vscode-languageserver-protocol';
|
|
23
|
+
import { DocumentRangeMap, RangeMapping } from './range-mapping.js';
|
|
26
24
|
describe('document-range-map', () => {
|
|
27
25
|
it('project', () => {
|
|
28
|
-
const documentRangeMap = new
|
|
29
|
-
new
|
|
30
|
-
new
|
|
31
|
-
new
|
|
26
|
+
const documentRangeMap = new DocumentRangeMap([
|
|
27
|
+
new RangeMapping(Range.create(2, 4, 2, 6), Range.create(2, 4, 2, 7)),
|
|
28
|
+
new RangeMapping(Range.create(3, 2, 4, 3), Range.create(3, 2, 6, 4)),
|
|
29
|
+
new RangeMapping(Range.create(4, 5, 4, 7), Range.create(6, 6, 6, 9)),
|
|
32
30
|
]);
|
|
33
31
|
const project = (line, character) => documentRangeMap.projectPosition({ line, character }).toString();
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
32
|
+
expect(project(1, 1)).to.be.equal('[1:1, 1:1) -> [1:1, 1:1)');
|
|
33
|
+
expect(project(2, 3)).to.be.equal('[2:3, 2:3) -> [2:3, 2:3)');
|
|
34
|
+
expect(project(2, 4)).to.be.equal('[2:4, 2:6) -> [2:4, 2:7)');
|
|
35
|
+
expect(project(2, 5)).to.be.equal('[2:4, 2:6) -> [2:4, 2:7)');
|
|
36
|
+
expect(project(2, 6)).to.be.equal('[2:6, 2:6) -> [2:7, 2:7)');
|
|
37
|
+
expect(project(2, 7)).to.be.equal('[2:7, 2:7) -> [2:8, 2:8)');
|
|
38
|
+
expect(project(3, 1)).to.be.equal('[3:1, 3:1) -> [3:1, 3:1)');
|
|
39
|
+
expect(project(3, 2)).to.be.equal('[3:2, 4:3) -> [3:2, 6:4)');
|
|
40
|
+
expect(project(4, 2)).to.be.equal('[3:2, 4:3) -> [3:2, 6:4)');
|
|
41
|
+
expect(project(4, 3)).to.be.equal('[4:3, 4:3) -> [6:4, 6:4)');
|
|
42
|
+
expect(project(4, 4)).to.be.equal('[4:4, 4:4) -> [6:5, 6:5)');
|
|
43
|
+
expect(project(4, 5)).to.be.equal('[4:5, 4:7) -> [6:6, 6:9)');
|
|
46
44
|
});
|
|
47
45
|
});
|
|
48
46
|
//# sourceMappingURL=range-mapping.spec.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"range-mapping.spec.js","sourceRoot":"","sources":["../../../../src/browser/merge-editor/model/range-mapping.spec.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"range-mapping.spec.js","sourceRoot":"","sources":["../../../../src/browser/merge-editor/model/range-mapping.spec.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;AAChF;;;gGAGgG;AAChG,6IAA6I;AAE7I,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAC9B,OAAO,EAAE,KAAK,EAAE,MAAM,mDAAmD,CAAC;AAC1E,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAEpE,QAAQ,CAAC,oBAAoB,EAAE,GAAG,EAAE;IAEhC,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE;QACf,MAAM,gBAAgB,GAAG,IAAI,gBAAgB,CAAC;YAC1C,IAAI,YAAY,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;YACpE,IAAI,YAAY,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;YACpE,IAAI,YAAY,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;SACvE,CAAC,CAAC;QAEH,MAAM,OAAO,GAAG,CAAC,IAAY,EAAE,SAAiB,EAAE,EAAE,CAChD,gBAAgB,CAAC,eAAe,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC;QAErE,MAAM,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC;QAC9D,MAAM,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC;QAC9D,MAAM,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC;QAC9D,MAAM,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC;QAC9D,MAAM,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC;QAC9D,MAAM,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC;QAC9D,MAAM,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC;QAC9D,MAAM,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC;QAC9D,MAAM,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC;QAC9D,MAAM,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC;QAC9D,MAAM,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC;QAC9D,MAAM,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC;IAClE,CAAC,CAAC,CAAC;AAEP,CAAC,CAAC,CAAC"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
// *****************************************************************************
|
|
3
2
|
// Copyright (C) 2025 1C-Soft LLC and others.
|
|
4
3
|
//
|
|
@@ -22,10 +21,8 @@
|
|
|
22
21
|
// https://github.com/microsoft/vscode/blob/1.96.3/src/vs/editor/common/core/range.ts,
|
|
23
22
|
// https://github.com/microsoft/vscode/blob/1.96.3/src/vs/editor/common/core/position.ts,
|
|
24
23
|
// https://github.com/microsoft/vscode/blob/1.96.3/src/vs/editor/common/core/textLength.ts
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
const vscode_languageserver_protocol_1 = require("@theia/core/shared/vscode-languageserver-protocol");
|
|
28
|
-
var RangeUtils;
|
|
24
|
+
import { Position } from '@theia/core/shared/vscode-languageserver-protocol';
|
|
25
|
+
export var RangeUtils;
|
|
29
26
|
(function (RangeUtils) {
|
|
30
27
|
function isEmpty(range) {
|
|
31
28
|
return range.start.line === range.end.line && range.start.character === range.end.character;
|
|
@@ -80,8 +77,8 @@ var RangeUtils;
|
|
|
80
77
|
return range.start.line - other.start.line;
|
|
81
78
|
}
|
|
82
79
|
RangeUtils.compareUsingStarts = compareUsingStarts;
|
|
83
|
-
})(RangeUtils || (
|
|
84
|
-
var PositionUtils;
|
|
80
|
+
})(RangeUtils || (RangeUtils = {}));
|
|
81
|
+
export var PositionUtils;
|
|
85
82
|
(function (PositionUtils) {
|
|
86
83
|
function isBeforeOrEqual(position, other) {
|
|
87
84
|
return compare(position, other) <= 0;
|
|
@@ -102,10 +99,10 @@ var PositionUtils;
|
|
|
102
99
|
[position, other] = [other, position];
|
|
103
100
|
}
|
|
104
101
|
if (position.line === other.line) {
|
|
105
|
-
return
|
|
102
|
+
return Position.create(0, other.character - position.character);
|
|
106
103
|
}
|
|
107
104
|
else {
|
|
108
|
-
return
|
|
105
|
+
return Position.create(other.line - position.line, other.character);
|
|
109
106
|
}
|
|
110
107
|
}
|
|
111
108
|
PositionUtils.relativize = relativize;
|
|
@@ -114,12 +111,12 @@ var PositionUtils;
|
|
|
114
111
|
*/
|
|
115
112
|
function resolve(position, relativePosition) {
|
|
116
113
|
if (relativePosition.line === 0) {
|
|
117
|
-
return
|
|
114
|
+
return Position.create(position.line, position.character + relativePosition.character);
|
|
118
115
|
}
|
|
119
116
|
else {
|
|
120
|
-
return
|
|
117
|
+
return Position.create(position.line + relativePosition.line, relativePosition.character);
|
|
121
118
|
}
|
|
122
119
|
}
|
|
123
120
|
PositionUtils.resolve = resolve;
|
|
124
|
-
})(PositionUtils || (
|
|
121
|
+
})(PositionUtils || (PositionUtils = {}));
|
|
125
122
|
//# sourceMappingURL=range-utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"range-utils.js","sourceRoot":"","sources":["../../../../src/browser/merge-editor/model/range-utils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"range-utils.js","sourceRoot":"","sources":["../../../../src/browser/merge-editor/model/range-utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"diff-spacers.d.ts","sourceRoot":"","sources":["../../../../src/browser/merge-editor/view/diff-spacers.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAE,gBAAgB,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"diff-spacers.d.ts","sourceRoot":"","sources":["../../../../src/browser/merge-editor/view/diff-spacers.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAE7D,MAAM,WAAW,WAAW;IACxB;;;;OAIG;IACH,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B;;;;OAIG;IACH,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B;;;;OAIG;IACH,WAAW,EAAE,MAAM,EAAE,CAAC;CACzB;AAED,MAAM,MAAM,mBAAmB,GAAG,IAAI,CAAC,WAAW,EAAE,iBAAiB,CAAC,CAAC;AAEvE,MAAM,WAAW,wBAAwB;IACrC,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,aAAa,EAAE,mBAAmB,EAAE,CAAC;CACxC;AAED,qBACa,iBAAiB;IAE1B,kBAAkB,CAAC,OAAO,EAAE,SAAS,gBAAgB,EAAE,EAAE,iBAAiB,EAAE,MAAM,GAAG,WAAW;IA4BhG;;;;;OAKG;IACH,uBAAuB,CAAC,gBAAgB,EAAE,WAAW,EAAE,GAAG,wBAAwB;IA6BlF;;;OAGG;IACH,mBAAmB,CAAC,EAAE,aAAa,EAAE,EAAE,wBAAwB,GAAG;QAAE,aAAa,EAAE;YAAE,eAAe,EAAE,MAAM,EAAE,CAAA;SAAE,EAAE,CAAA;KAAE;IAwBpH,SAAS,CAAC,gCAAgC,CAAC,KAAK,EAAE;QAAE,WAAW,EAAE,MAAM,EAAE,CAAA;KAAE,EAAE,GAAG,IAAI;IAMpF,SAAS,CAAC,WAAW,CAAC,YAAY,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,MAAM;CAW7E"}
|
|
@@ -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
|
-
const inversify_1 = require("@theia/core/shared/inversify");
|
|
21
|
-
const core_1 = require("@theia/core");
|
|
16
|
+
import { __decorate } from "tslib";
|
|
17
|
+
import { injectable } from '@theia/core/shared/inversify';
|
|
18
|
+
import { ArrayUtils } from '@theia/core';
|
|
22
19
|
let DiffSpacerService = class DiffSpacerService {
|
|
23
20
|
computeDiffSpacers(changes, originalLineCount) {
|
|
24
21
|
const lineMapping = [];
|
|
@@ -109,7 +106,7 @@ let DiffSpacerService = class DiffSpacerService {
|
|
|
109
106
|
return { modifiedSides: modifiedSidesCopy };
|
|
110
107
|
}
|
|
111
108
|
checkLineMappingsHaveEqualLength(items) {
|
|
112
|
-
if (!
|
|
109
|
+
if (!ArrayUtils.checkAdjacentItems(items, (item1, item2) => item1.lineMapping.length === item2.lineMapping.length)) {
|
|
113
110
|
throw new Error('Line mappings must have equal length');
|
|
114
111
|
}
|
|
115
112
|
}
|
|
@@ -125,8 +122,8 @@ let DiffSpacerService = class DiffSpacerService {
|
|
|
125
122
|
throw new Error('Assertion failed');
|
|
126
123
|
}
|
|
127
124
|
};
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
(0, inversify_1.injectable)()
|
|
125
|
+
DiffSpacerService = __decorate([
|
|
126
|
+
injectable()
|
|
131
127
|
], DiffSpacerService);
|
|
128
|
+
export { DiffSpacerService };
|
|
132
129
|
//# sourceMappingURL=diff-spacers.js.map
|