@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,4 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
// *****************************************************************************
|
|
3
2
|
// Copyright (C) 2018 TypeFox and others.
|
|
4
3
|
//
|
|
@@ -14,16 +13,15 @@
|
|
|
14
13
|
//
|
|
15
14
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
16
15
|
// *****************************************************************************
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
const content_lines_1 = require("./content-lines");
|
|
16
|
+
import * as chai from 'chai';
|
|
17
|
+
import { expect } from 'chai';
|
|
18
|
+
chai.use(chaiString);
|
|
19
|
+
import { DiffComputer } from './diff-computer.js';
|
|
20
|
+
import { ContentLines } from './content-lines.js';
|
|
21
|
+
import chaiString from 'chai-string';
|
|
24
22
|
let diffComputer;
|
|
25
23
|
before(() => {
|
|
26
|
-
diffComputer = new
|
|
24
|
+
diffComputer = new DiffComputer();
|
|
27
25
|
});
|
|
28
26
|
describe('dirty-diff-computer', () => {
|
|
29
27
|
it('remove single line', () => {
|
|
@@ -35,7 +33,7 @@ describe('dirty-diff-computer', () => {
|
|
|
35
33
|
'FIRST',
|
|
36
34
|
'THIRD'
|
|
37
35
|
]);
|
|
38
|
-
|
|
36
|
+
expect(dirtyDiff).to.be.deep.equal({
|
|
39
37
|
changes: [
|
|
40
38
|
{
|
|
41
39
|
previousRange: { start: 1, end: 2 },
|
|
@@ -48,7 +46,7 @@ describe('dirty-diff-computer', () => {
|
|
|
48
46
|
it(`remove ${formatLines(lines)} at the end`, () => {
|
|
49
47
|
const dirtyDiff = computeDirtyDiff(sequenceOfN(2)
|
|
50
48
|
.concat(sequenceOfN(lines, () => 'TO-BE-REMOVED')), sequenceOfN(2));
|
|
51
|
-
|
|
49
|
+
expect(dirtyDiff).to.be.deep.equal({
|
|
52
50
|
changes: [
|
|
53
51
|
{
|
|
54
52
|
previousRange: { start: 2, end: 2 + lines },
|
|
@@ -61,7 +59,7 @@ describe('dirty-diff-computer', () => {
|
|
|
61
59
|
it('remove all lines', () => {
|
|
62
60
|
const numberOfLines = 10;
|
|
63
61
|
const dirtyDiff = computeDirtyDiff(sequenceOfN(numberOfLines, () => 'TO-BE-REMOVED'), ['']);
|
|
64
|
-
|
|
62
|
+
expect(dirtyDiff).to.be.deep.equal({
|
|
65
63
|
changes: [
|
|
66
64
|
{
|
|
67
65
|
previousRange: { start: 0, end: numberOfLines },
|
|
@@ -74,7 +72,7 @@ describe('dirty-diff-computer', () => {
|
|
|
74
72
|
it(`remove ${formatLines(lines)} at the beginning`, () => {
|
|
75
73
|
const dirtyDiff = computeDirtyDiff(sequenceOfN(lines, () => 'TO-BE-REMOVED')
|
|
76
74
|
.concat(sequenceOfN(2)), sequenceOfN(2));
|
|
77
|
-
|
|
75
|
+
expect(dirtyDiff).to.be.deep.equal({
|
|
78
76
|
changes: [
|
|
79
77
|
{
|
|
80
78
|
previousRange: { start: 0, end: lines },
|
|
@@ -89,7 +87,7 @@ describe('dirty-diff-computer', () => {
|
|
|
89
87
|
const previous = sequenceOfN(3);
|
|
90
88
|
const modified = insertIntoArray(previous, 2, ...sequenceOfN(lines, () => 'ADDED LINE'));
|
|
91
89
|
const dirtyDiff = computeDirtyDiff(previous, modified);
|
|
92
|
-
|
|
90
|
+
expect(dirtyDiff).to.be.deep.equal({
|
|
93
91
|
changes: [
|
|
94
92
|
{
|
|
95
93
|
previousRange: { start: 2, end: 2 },
|
|
@@ -103,7 +101,7 @@ describe('dirty-diff-computer', () => {
|
|
|
103
101
|
it(`add ${formatLines(lines)} at the beginning`, () => {
|
|
104
102
|
const dirtyDiff = computeDirtyDiff(sequenceOfN(2), sequenceOfN(lines, () => 'ADDED LINE')
|
|
105
103
|
.concat(sequenceOfN(2)));
|
|
106
|
-
|
|
104
|
+
expect(dirtyDiff).to.be.deep.equal({
|
|
107
105
|
changes: [
|
|
108
106
|
{
|
|
109
107
|
previousRange: { start: 0, end: 0 },
|
|
@@ -116,7 +114,7 @@ describe('dirty-diff-computer', () => {
|
|
|
116
114
|
it('add lines to empty file', () => {
|
|
117
115
|
const numberOfLines = 3;
|
|
118
116
|
const dirtyDiff = computeDirtyDiff([''], sequenceOfN(numberOfLines, () => 'ADDED LINE'));
|
|
119
|
-
|
|
117
|
+
expect(dirtyDiff).to.be.deep.equal({
|
|
120
118
|
changes: [
|
|
121
119
|
{
|
|
122
120
|
previousRange: { start: 0, end: 0 },
|
|
@@ -135,7 +133,7 @@ describe('dirty-diff-computer', () => {
|
|
|
135
133
|
'',
|
|
136
134
|
'2'
|
|
137
135
|
]);
|
|
138
|
-
|
|
136
|
+
expect(dirtyDiff).to.be.deep.equal({
|
|
139
137
|
changes: [
|
|
140
138
|
{
|
|
141
139
|
previousRange: { start: 1, end: 1 },
|
|
@@ -151,7 +149,7 @@ describe('dirty-diff-computer', () => {
|
|
|
151
149
|
'1',
|
|
152
150
|
''
|
|
153
151
|
]);
|
|
154
|
-
|
|
152
|
+
expect(dirtyDiff).to.be.deep.equal({
|
|
155
153
|
changes: [
|
|
156
154
|
{
|
|
157
155
|
previousRange: { start: 1, end: 1 },
|
|
@@ -164,7 +162,7 @@ describe('dirty-diff-computer', () => {
|
|
|
164
162
|
it(`add ${formatLines(lines)} (empty) at the end`, () => {
|
|
165
163
|
const dirtyDiff = computeDirtyDiff(sequenceOfN(2), sequenceOfN(2)
|
|
166
164
|
.concat(new Array(lines).map(() => '')));
|
|
167
|
-
|
|
165
|
+
expect(dirtyDiff).to.be.deep.equal({
|
|
168
166
|
changes: [
|
|
169
167
|
{
|
|
170
168
|
previousRange: { start: 2, end: 2 },
|
|
@@ -187,7 +185,7 @@ describe('dirty-diff-computer', () => {
|
|
|
187
185
|
'5. ADDED',
|
|
188
186
|
'LAST'
|
|
189
187
|
]);
|
|
190
|
-
|
|
188
|
+
expect(dirtyDiff).to.be.deep.equal({
|
|
191
189
|
changes: [
|
|
192
190
|
{
|
|
193
191
|
previousRange: { start: 1, end: 1 },
|
|
@@ -199,7 +197,7 @@ describe('dirty-diff-computer', () => {
|
|
|
199
197
|
[1, 2, 3, 4, 5].forEach(lines => {
|
|
200
198
|
it(`add ${formatLines(lines)} after single line`, () => {
|
|
201
199
|
const dirtyDiff = computeDirtyDiff(['0'], ['0'].concat(sequenceOfN(lines, () => 'ADDED LINE')));
|
|
202
|
-
|
|
200
|
+
expect(dirtyDiff).to.be.deep.equal({
|
|
203
201
|
changes: [
|
|
204
202
|
{
|
|
205
203
|
previousRange: { start: 1, end: 1 },
|
|
@@ -219,7 +217,7 @@ describe('dirty-diff-computer', () => {
|
|
|
219
217
|
'MODIFIED',
|
|
220
218
|
'LAST'
|
|
221
219
|
]);
|
|
222
|
-
|
|
220
|
+
expect(dirtyDiff).to.be.deep.equal({
|
|
223
221
|
changes: [
|
|
224
222
|
{
|
|
225
223
|
previousRange: { start: 1, end: 2 },
|
|
@@ -231,7 +229,7 @@ describe('dirty-diff-computer', () => {
|
|
|
231
229
|
it('modify all lines', () => {
|
|
232
230
|
const numberOfLines = 10;
|
|
233
231
|
const dirtyDiff = computeDirtyDiff(sequenceOfN(numberOfLines, () => 'TO-BE-MODIFIED'), sequenceOfN(numberOfLines, () => 'MODIFIED'));
|
|
234
|
-
|
|
232
|
+
expect(dirtyDiff).to.be.deep.equal({
|
|
235
233
|
changes: [
|
|
236
234
|
{
|
|
237
235
|
previousRange: { start: 0, end: numberOfLines },
|
|
@@ -251,7 +249,7 @@ describe('dirty-diff-computer', () => {
|
|
|
251
249
|
'2-changed',
|
|
252
250
|
'3-changed'
|
|
253
251
|
]);
|
|
254
|
-
|
|
252
|
+
expect(dirtyDiff).to.be.deep.equal({
|
|
255
253
|
changes: [
|
|
256
254
|
{
|
|
257
255
|
previousRange: { start: 1, end: 4 },
|
|
@@ -287,7 +285,7 @@ describe('dirty-diff-computer', () => {
|
|
|
287
285
|
'ADDED',
|
|
288
286
|
''
|
|
289
287
|
]);
|
|
290
|
-
|
|
288
|
+
expect(dirtyDiff).to.be.deep.equal({
|
|
291
289
|
changes: [
|
|
292
290
|
{
|
|
293
291
|
previousRange: { start: 0, end: 1 },
|
|
@@ -330,7 +328,7 @@ describe('dirty-diff-computer', () => {
|
|
|
330
328
|
'',
|
|
331
329
|
''
|
|
332
330
|
]);
|
|
333
|
-
|
|
331
|
+
expect(dirtyDiff).to.be.deep.equal({
|
|
334
332
|
changes: [
|
|
335
333
|
{
|
|
336
334
|
previousRange: { start: 5, end: 5 },
|
|
@@ -349,7 +347,7 @@ describe('dirty-diff-computer', () => {
|
|
|
349
347
|
});
|
|
350
348
|
});
|
|
351
349
|
function computeDirtyDiff(previous, modified) {
|
|
352
|
-
const a =
|
|
350
|
+
const a = ContentLines.arrayLike({
|
|
353
351
|
length: previous.length,
|
|
354
352
|
getLineContent: line => {
|
|
355
353
|
const value = previous[line];
|
|
@@ -359,7 +357,7 @@ function computeDirtyDiff(previous, modified) {
|
|
|
359
357
|
return value;
|
|
360
358
|
},
|
|
361
359
|
});
|
|
362
|
-
const b =
|
|
360
|
+
const b = ContentLines.arrayLike({
|
|
363
361
|
length: modified.length,
|
|
364
362
|
getLineContent: line => {
|
|
365
363
|
const value = modified[line];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"diff-computer.spec.js","sourceRoot":"","sources":["../../../src/browser/dirty-diff/diff-computer.spec.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"diff-computer.spec.js","sourceRoot":"","sources":["../../../src/browser/dirty-diff/diff-computer.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { EditorDecoration, EditorDecorator, TextEditor } from '@theia/editor/lib/browser';
|
|
2
|
-
import { DirtyDiff, Change } from './diff-computer';
|
|
2
|
+
import { DirtyDiff, Change } from './diff-computer.js';
|
|
3
3
|
import { URI } from '@theia/core';
|
|
4
4
|
export declare enum DirtyDiffDecorationType {
|
|
5
5
|
AddedLine = "dirty-diff-added-line",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dirty-diff-decorator.d.ts","sourceRoot":"","sources":["../../../src/browser/dirty-diff/dirty-diff-decorator.ts"],"names":[],"mappings":"AAiBA,OAAO,EACH,gBAAgB,EAGhB,eAAe,EACf,UAAU,EAEb,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,SAAS,EAAa,MAAM,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"dirty-diff-decorator.d.ts","sourceRoot":"","sources":["../../../src/browser/dirty-diff/dirty-diff-decorator.ts"],"names":[],"mappings":"AAiBA,OAAO,EACH,gBAAgB,EAGhB,eAAe,EACf,UAAU,EAEb,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,SAAS,EAAa,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAClE,OAAO,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AAElC,oBAAY,uBAAuB;IAC/B,SAAS,0BAA0B;IACnC,WAAW,4BAA4B;IACvC,YAAY,6BAA6B;CAC5C;AA+DD,MAAM,WAAW,eAAgB,SAAQ,SAAS;IAC9C,QAAQ,CAAC,MAAM,EAAE,UAAU,CAAC;IAC5B,QAAQ,CAAC,mBAAmB,CAAC,EAAE,GAAG,CAAC;CACtC;AAED,qBACa,kBAAmB,SAAQ,eAAe;IAEnD,gBAAgB,CAAC,MAAM,EAAE,eAAe,GAAG,IAAI;IAK/C,SAAS,CAAC,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,gBAAgB;CAKhE"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
// *****************************************************************************
|
|
3
2
|
// Copyright (C) 2018 TypeFox and others.
|
|
4
3
|
//
|
|
@@ -14,31 +13,29 @@
|
|
|
14
13
|
//
|
|
15
14
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
16
15
|
// *****************************************************************************
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
const diff_computer_1 = require("./diff-computer");
|
|
23
|
-
var DirtyDiffDecorationType;
|
|
16
|
+
import { __decorate } from "tslib";
|
|
17
|
+
import { injectable } from '@theia/core/shared/inversify';
|
|
18
|
+
import { OverviewRulerLane, EditorDecorator, MinimapPosition } from '@theia/editor/lib/browser';
|
|
19
|
+
import { LineRange, Change } from './diff-computer.js';
|
|
20
|
+
export var DirtyDiffDecorationType;
|
|
24
21
|
(function (DirtyDiffDecorationType) {
|
|
25
22
|
DirtyDiffDecorationType["AddedLine"] = "dirty-diff-added-line";
|
|
26
23
|
DirtyDiffDecorationType["RemovedLine"] = "dirty-diff-removed-line";
|
|
27
24
|
DirtyDiffDecorationType["ModifiedLine"] = "dirty-diff-modified-line";
|
|
28
|
-
})(DirtyDiffDecorationType || (
|
|
25
|
+
})(DirtyDiffDecorationType || (DirtyDiffDecorationType = {}));
|
|
29
26
|
const AddedLineDecoration = {
|
|
30
27
|
linesDecorationsClassName: 'dirty-diff-glyph dirty-diff-added-line',
|
|
31
28
|
overviewRuler: {
|
|
32
29
|
color: {
|
|
33
30
|
id: 'editorOverviewRuler.addedForeground'
|
|
34
31
|
},
|
|
35
|
-
position:
|
|
32
|
+
position: OverviewRulerLane.Left,
|
|
36
33
|
},
|
|
37
34
|
minimap: {
|
|
38
35
|
color: {
|
|
39
36
|
id: 'minimapGutter.addedBackground'
|
|
40
37
|
},
|
|
41
|
-
position:
|
|
38
|
+
position: MinimapPosition.Gutter
|
|
42
39
|
},
|
|
43
40
|
isWholeLine: true
|
|
44
41
|
};
|
|
@@ -48,13 +45,13 @@ const RemovedLineDecoration = {
|
|
|
48
45
|
color: {
|
|
49
46
|
id: 'editorOverviewRuler.deletedForeground'
|
|
50
47
|
},
|
|
51
|
-
position:
|
|
48
|
+
position: OverviewRulerLane.Left,
|
|
52
49
|
},
|
|
53
50
|
minimap: {
|
|
54
51
|
color: {
|
|
55
52
|
id: 'minimapGutter.deletedBackground'
|
|
56
53
|
},
|
|
57
|
-
position:
|
|
54
|
+
position: MinimapPosition.Gutter
|
|
58
55
|
},
|
|
59
56
|
isWholeLine: false
|
|
60
57
|
};
|
|
@@ -64,38 +61,38 @@ const ModifiedLineDecoration = {
|
|
|
64
61
|
color: {
|
|
65
62
|
id: 'editorOverviewRuler.modifiedForeground'
|
|
66
63
|
},
|
|
67
|
-
position:
|
|
64
|
+
position: OverviewRulerLane.Left,
|
|
68
65
|
},
|
|
69
66
|
minimap: {
|
|
70
67
|
color: {
|
|
71
68
|
id: 'minimapGutter.modifiedBackground'
|
|
72
69
|
},
|
|
73
|
-
position:
|
|
70
|
+
position: MinimapPosition.Gutter
|
|
74
71
|
},
|
|
75
72
|
isWholeLine: true
|
|
76
73
|
};
|
|
77
74
|
function getEditorDecorationOptions(change) {
|
|
78
|
-
if (
|
|
75
|
+
if (Change.isAddition(change)) {
|
|
79
76
|
return AddedLineDecoration;
|
|
80
77
|
}
|
|
81
|
-
if (
|
|
78
|
+
if (Change.isRemoval(change)) {
|
|
82
79
|
return RemovedLineDecoration;
|
|
83
80
|
}
|
|
84
81
|
return ModifiedLineDecoration;
|
|
85
82
|
}
|
|
86
|
-
let DirtyDiffDecorator = class DirtyDiffDecorator extends
|
|
83
|
+
let DirtyDiffDecorator = class DirtyDiffDecorator extends EditorDecorator {
|
|
87
84
|
applyDecorations(update) {
|
|
88
85
|
const decorations = update.changes.map(change => this.toDeltaDecoration(change));
|
|
89
86
|
this.setDecorations(update.editor, decorations);
|
|
90
87
|
}
|
|
91
88
|
toDeltaDecoration(change) {
|
|
92
|
-
const range =
|
|
89
|
+
const range = LineRange.toRange(change.currentRange);
|
|
93
90
|
const options = getEditorDecorationOptions(change);
|
|
94
91
|
return { range, options };
|
|
95
92
|
}
|
|
96
93
|
};
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
(0, inversify_1.injectable)()
|
|
94
|
+
DirtyDiffDecorator = __decorate([
|
|
95
|
+
injectable()
|
|
100
96
|
], DirtyDiffDecorator);
|
|
97
|
+
export { DirtyDiffDecorator };
|
|
101
98
|
//# sourceMappingURL=dirty-diff-decorator.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dirty-diff-decorator.js","sourceRoot":"","sources":["../../../src/browser/dirty-diff/dirty-diff-decorator.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"dirty-diff-decorator.js","sourceRoot":"","sources":["../../../src/browser/dirty-diff/dirty-diff-decorator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
// *****************************************************************************
|
|
3
2
|
// Copyright (C) 2018 TypeFox and others.
|
|
4
3
|
//
|
|
@@ -14,20 +13,18 @@
|
|
|
14
13
|
//
|
|
15
14
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
16
15
|
// *****************************************************************************
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
bind(
|
|
25
|
-
bind(dirty_diff_navigator_1.DirtyDiffNavigator).toSelf().inSingletonScope();
|
|
26
|
-
bind(dirty_diff_widget_1.DirtyDiffWidgetFactory).toFactory(({ container }) => props => {
|
|
16
|
+
import { DirtyDiffDecorator } from './dirty-diff-decorator.js';
|
|
17
|
+
import { DirtyDiffNavigator } from './dirty-diff-navigator.js';
|
|
18
|
+
import { DirtyDiffWidget, DirtyDiffWidgetFactory, DirtyDiffWidgetProps } from './dirty-diff-widget.js';
|
|
19
|
+
import '../../../src/browser/style/dirty-diff.css';
|
|
20
|
+
export function bindDirtyDiff(bind) {
|
|
21
|
+
bind(DirtyDiffDecorator).toSelf().inSingletonScope();
|
|
22
|
+
bind(DirtyDiffNavigator).toSelf().inSingletonScope();
|
|
23
|
+
bind(DirtyDiffWidgetFactory).toFactory(({ container }) => props => {
|
|
27
24
|
const child = container.createChild();
|
|
28
|
-
child.bind(
|
|
29
|
-
child.bind(
|
|
30
|
-
return child.get(
|
|
25
|
+
child.bind(DirtyDiffWidgetProps).toConstantValue(props);
|
|
26
|
+
child.bind(DirtyDiffWidget).toSelf();
|
|
27
|
+
return child.get(DirtyDiffWidget);
|
|
31
28
|
});
|
|
32
29
|
}
|
|
33
30
|
//# sourceMappingURL=dirty-diff-module.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dirty-diff-module.js","sourceRoot":"","sources":["../../../src/browser/dirty-diff/dirty-diff-module.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"dirty-diff-module.js","sourceRoot":"","sources":["../../../src/browser/dirty-diff/dirty-diff-module.ts"],"names":[],"mappings":"AAAA,gFAAgF;AAChF,yCAAyC;AACzC,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;AAGhF,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EAAE,eAAe,EAAE,sBAAsB,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAEvG,OAAO,2CAA2C,CAAC;AAEnD,MAAM,UAAU,aAAa,CAAC,IAAqB;IAC/C,IAAI,CAAC,kBAAkB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACrD,IAAI,CAAC,kBAAkB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACrD,IAAI,CAAC,sBAAsB,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE;QAC9D,MAAM,KAAK,GAAG,SAAS,CAAC,WAAW,EAAE,CAAC;QACtC,KAAK,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;QACxD,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,MAAM,EAAE,CAAC;QACrC,OAAO,KAAK,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;IACtC,CAAC,CAAC,CAAC;AACP,CAAC"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { Disposable, DisposableCollection, URI } from '@theia/core';
|
|
2
2
|
import { ContextKeyService } from '@theia/core/lib/browser/context-key-service';
|
|
3
3
|
import { EditorManager, EditorMouseEvent, TextEditor } from '@theia/editor/lib/browser';
|
|
4
|
-
import { Change } from './diff-computer';
|
|
5
|
-
import { DirtyDiffUpdate } from './dirty-diff-decorator';
|
|
6
|
-
import { DirtyDiffWidget, DirtyDiffWidgetFactory } from './dirty-diff-widget';
|
|
4
|
+
import { Change } from './diff-computer.js';
|
|
5
|
+
import { DirtyDiffUpdate } from './dirty-diff-decorator.js';
|
|
6
|
+
import { DirtyDiffWidget, DirtyDiffWidgetFactory } from './dirty-diff-widget.js';
|
|
7
7
|
export declare class DirtyDiffNavigator {
|
|
8
8
|
protected readonly controllers: Map<TextEditor, DirtyDiffController>;
|
|
9
9
|
protected readonly contextKeyService: ContextKeyService;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dirty-diff-navigator.d.ts","sourceRoot":"","sources":["../../../src/browser/dirty-diff/dirty-diff-navigator.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,UAAU,EAAE,oBAAoB,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AACpE,OAAO,EAAc,iBAAiB,EAAE,MAAM,6CAA6C,CAAC;AAC5F,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAmB,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAEzG,OAAO,EAAE,MAAM,EAAa,MAAM,
|
|
1
|
+
{"version":3,"file":"dirty-diff-navigator.d.ts","sourceRoot":"","sources":["../../../src/browser/dirty-diff/dirty-diff-navigator.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,UAAU,EAAE,oBAAoB,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AACpE,OAAO,EAAc,iBAAiB,EAAE,MAAM,6CAA6C,CAAC;AAC5F,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAmB,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAEzG,OAAO,EAAE,MAAM,EAAa,MAAM,oBAAoB,CAAC;AACvD,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;AAEjF,qBACa,kBAAkB;IAE3B,SAAS,CAAC,QAAQ,CAAC,WAAW,uCAA8C;IAG5E,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAGxD,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;IAGhD,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,sBAAsB,CAAC;IAGzD,SAAS,CAAC,IAAI,IAAI,IAAI;IA+BtB,qBAAqB,CAAC,MAAM,EAAE,eAAe,GAAG,IAAI;IAKpD,WAAW,IAAI,OAAO;IAItB,cAAc,IAAI,IAAI;IAItB,kBAAkB,IAAI,IAAI;IAI1B,aAAa,IAAI,OAAO;IAIxB,cAAc,IAAI,IAAI;IAItB,kBAAkB,IAAI,IAAI;IAI1B,eAAe,IAAI,OAAO;IAI1B,mBAAmB,IAAI,IAAI;IAI3B,SAAS,KAAK,gBAAgB,IAAI,mBAAmB,GAAG,SAAS,CAGhE;IAED,SAAS,CAAC,gBAAgB,CAAC,MAAM,EAAE,UAAU,GAAG,mBAAmB;CAGtE;AAED,qBAAa,mBAAoB,YAAW,UAAU;IAQtC,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,UAAU;IANjD,SAAS,CAAC,QAAQ,CAAC,SAAS,uBAA8B;IAE1D,aAAa,CAAC,EAAE,sBAAsB,CAAC;IACvC,SAAS,CAAC,MAAM,CAAC,EAAE,eAAe,CAAC;IACnC,SAAS,CAAC,SAAS,CAAC,EAAE,eAAe,CAAC;gBAEP,MAAM,EAAE,UAAU;IAIjD,OAAO,IAAI,IAAI;IAKf,qBAAqB,CAAC,SAAS,EAAE,eAAe,GAAG,IAAI;IASvD,WAAW,IAAI,OAAO;IAItB,cAAc,IAAI,IAAI;IAWtB,kBAAkB,IAAI,IAAI;IAW1B,aAAa,IAAI,OAAO;IAIxB,cAAc,IAAI,IAAI;IAStB,kBAAkB,IAAI,IAAI;IAS1B,eAAe,IAAI,OAAO;IAI1B,WAAW,IAAI,IAAI;IAOnB,SAAS,KAAK,OAAO,IAAI,SAAS,MAAM,EAAE,GAAG,SAAS,CAErD;IAED,SAAS,KAAK,mBAAmB,IAAI,GAAG,GAAG,SAAS,CAEnD;IAED,SAAS,CAAC,YAAY,IAAI,eAAe,GAAG,SAAS;IAYrD,SAAS,CAAC,qBAAqB,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,GAAG,MAAM;IAqBzE,SAAS,CAAC,yBAAyB,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,GAAG,MAAM;IAqB7E,SAAS,CAAC,qBAAqB,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,gBAAgB,GAAG,IAAI;CAyB7E"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
// *****************************************************************************
|
|
3
2
|
// Copyright (C) 2023 1C-Soft LLC and others.
|
|
4
3
|
//
|
|
@@ -14,16 +13,14 @@
|
|
|
14
13
|
//
|
|
15
14
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
16
15
|
// *****************************************************************************
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
const diff_computer_1 = require("./diff-computer");
|
|
26
|
-
const dirty_diff_widget_1 = require("./dirty-diff-widget");
|
|
16
|
+
import { __decorate } from "tslib";
|
|
17
|
+
import { inject, injectable, postConstruct } from '@theia/core/shared/inversify';
|
|
18
|
+
import { DisposableCollection } from '@theia/core';
|
|
19
|
+
import { ContextKeyService } from '@theia/core/lib/browser/context-key-service';
|
|
20
|
+
import { EditorManager, MouseTargetType } from '@theia/editor/lib/browser';
|
|
21
|
+
import { MonacoEditor } from '@theia/monaco/lib/browser/monaco-editor';
|
|
22
|
+
import { LineRange } from './diff-computer.js';
|
|
23
|
+
import { DirtyDiffWidgetFactory } from './dirty-diff-widget.js';
|
|
27
24
|
let DirtyDiffNavigator = class DirtyDiffNavigator {
|
|
28
25
|
constructor() {
|
|
29
26
|
this.controllers = new Map();
|
|
@@ -94,32 +91,26 @@ let DirtyDiffNavigator = class DirtyDiffNavigator {
|
|
|
94
91
|
return new DirtyDiffController(editor);
|
|
95
92
|
}
|
|
96
93
|
};
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
(0, inversify_1.inject)(context_key_service_1.ContextKeyService),
|
|
100
|
-
tslib_1.__metadata("design:type", Object)
|
|
94
|
+
__decorate([
|
|
95
|
+
inject(ContextKeyService)
|
|
101
96
|
], DirtyDiffNavigator.prototype, "contextKeyService", void 0);
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
tslib_1.__metadata("design:type", browser_1.EditorManager)
|
|
97
|
+
__decorate([
|
|
98
|
+
inject(EditorManager)
|
|
105
99
|
], DirtyDiffNavigator.prototype, "editorManager", void 0);
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
tslib_1.__metadata("design:type", Function)
|
|
100
|
+
__decorate([
|
|
101
|
+
inject(DirtyDiffWidgetFactory)
|
|
109
102
|
], DirtyDiffNavigator.prototype, "widgetFactory", void 0);
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
tslib_1.__metadata("design:type", Function),
|
|
113
|
-
tslib_1.__metadata("design:paramtypes", []),
|
|
114
|
-
tslib_1.__metadata("design:returntype", void 0)
|
|
103
|
+
__decorate([
|
|
104
|
+
postConstruct()
|
|
115
105
|
], DirtyDiffNavigator.prototype, "init", null);
|
|
116
|
-
|
|
117
|
-
|
|
106
|
+
DirtyDiffNavigator = __decorate([
|
|
107
|
+
injectable()
|
|
118
108
|
], DirtyDiffNavigator);
|
|
119
|
-
|
|
109
|
+
export { DirtyDiffNavigator };
|
|
110
|
+
export class DirtyDiffController {
|
|
120
111
|
constructor(editor) {
|
|
121
112
|
this.editor = editor;
|
|
122
|
-
this.toDispose = new
|
|
113
|
+
this.toDispose = new DisposableCollection();
|
|
123
114
|
editor.onMouseDown(this.handleEditorMouseDown, this, this.toDispose);
|
|
124
115
|
}
|
|
125
116
|
dispose() {
|
|
@@ -142,7 +133,7 @@ class DirtyDiffController {
|
|
|
142
133
|
const index = this.findNextClosestChange(editor.cursor.line, false);
|
|
143
134
|
const change = this.changes?.[index];
|
|
144
135
|
if (change) {
|
|
145
|
-
const position =
|
|
136
|
+
const position = LineRange.getStartPosition(change.currentRange);
|
|
146
137
|
editor.cursor = position;
|
|
147
138
|
editor.revealPosition(position, { vertical: 'auto' });
|
|
148
139
|
}
|
|
@@ -152,13 +143,13 @@ class DirtyDiffController {
|
|
|
152
143
|
const index = this.findPreviousClosestChange(editor.cursor.line, false);
|
|
153
144
|
const change = this.changes?.[index];
|
|
154
145
|
if (change) {
|
|
155
|
-
const position =
|
|
146
|
+
const position = LineRange.getStartPosition(change.currentRange);
|
|
156
147
|
editor.cursor = position;
|
|
157
148
|
editor.revealPosition(position, { vertical: 'auto' });
|
|
158
149
|
}
|
|
159
150
|
}
|
|
160
151
|
canShowChange() {
|
|
161
|
-
return !!(this.widget || this.widgetFactory && this.editor instanceof
|
|
152
|
+
return !!(this.widget || this.widgetFactory && this.editor instanceof MonacoEditor && this.changes?.length && this.previousRevisionUri);
|
|
162
153
|
}
|
|
163
154
|
showNextChange() {
|
|
164
155
|
if (this.widget) {
|
|
@@ -193,7 +184,7 @@ class DirtyDiffController {
|
|
|
193
184
|
}
|
|
194
185
|
createWidget() {
|
|
195
186
|
const { widgetFactory, editor, changes, previousRevisionUri } = this;
|
|
196
|
-
if (widgetFactory && editor instanceof
|
|
187
|
+
if (widgetFactory && editor instanceof MonacoEditor && changes?.length && previousRevisionUri) {
|
|
197
188
|
const widget = widgetFactory({ editor, previousRevisionUri });
|
|
198
189
|
widget.changes = changes;
|
|
199
190
|
widget.onDidClose(() => {
|
|
@@ -210,12 +201,12 @@ class DirtyDiffController {
|
|
|
210
201
|
for (let i = 0; i < length; i++) {
|
|
211
202
|
const { currentRange } = this.changes[i];
|
|
212
203
|
if (inclusive) {
|
|
213
|
-
if (
|
|
204
|
+
if (LineRange.getEndPosition(currentRange).line >= line) {
|
|
214
205
|
return i;
|
|
215
206
|
}
|
|
216
207
|
}
|
|
217
208
|
else {
|
|
218
|
-
if (
|
|
209
|
+
if (LineRange.getStartPosition(currentRange).line > line) {
|
|
219
210
|
return i;
|
|
220
211
|
}
|
|
221
212
|
}
|
|
@@ -230,12 +221,12 @@ class DirtyDiffController {
|
|
|
230
221
|
for (let i = length - 1; i >= 0; i--) {
|
|
231
222
|
const { currentRange } = this.changes[i];
|
|
232
223
|
if (inclusive) {
|
|
233
|
-
if (
|
|
224
|
+
if (LineRange.getStartPosition(currentRange).line <= line) {
|
|
234
225
|
return i;
|
|
235
226
|
}
|
|
236
227
|
}
|
|
237
228
|
else {
|
|
238
|
-
if (
|
|
229
|
+
if (LineRange.getEndPosition(currentRange).line < line) {
|
|
239
230
|
return i;
|
|
240
231
|
}
|
|
241
232
|
}
|
|
@@ -247,7 +238,7 @@ class DirtyDiffController {
|
|
|
247
238
|
return;
|
|
248
239
|
}
|
|
249
240
|
const { range, type, element } = target;
|
|
250
|
-
if (!range || type !==
|
|
241
|
+
if (!range || type !== MouseTargetType.GUTTER_LINE_DECORATIONS || !element || element.className.indexOf('dirty-diff-glyph') < 0) {
|
|
251
242
|
return;
|
|
252
243
|
}
|
|
253
244
|
const gutterOffsetX = target.detail.offsetX - element.offsetLeft;
|
|
@@ -268,5 +259,4 @@ class DirtyDiffController {
|
|
|
268
259
|
this.widget?.showChange(index);
|
|
269
260
|
}
|
|
270
261
|
}
|
|
271
|
-
exports.DirtyDiffController = DirtyDiffController;
|
|
272
262
|
//# sourceMappingURL=dirty-diff-navigator.js.map
|