@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
|
@@ -22,10 +22,10 @@
|
|
|
22
22
|
import { ArrayUtils } from '@theia/core';
|
|
23
23
|
import { uinteger, Position, Range } from '@theia/core/shared/vscode-languageserver-protocol';
|
|
24
24
|
import { TextEditorDocument } from '@theia/editor/lib/browser/editor';
|
|
25
|
-
import { DetailedLineRangeMapping, MappingAlignment } from './range-mapping';
|
|
26
|
-
import { LineRange } from './line-range';
|
|
27
|
-
import { LineRangeEdit, RangeEdit } from './range-editing';
|
|
28
|
-
import { PositionUtils, RangeUtils } from './range-utils';
|
|
25
|
+
import { DetailedLineRangeMapping, MappingAlignment } from './range-mapping.js';
|
|
26
|
+
import { LineRange } from './line-range.js';
|
|
27
|
+
import { LineRangeEdit, RangeEdit } from './range-editing.js';
|
|
28
|
+
import { PositionUtils, RangeUtils } from './range-utils.js';
|
|
29
29
|
|
|
30
30
|
/**
|
|
31
31
|
* Describes modifications in side 1 and side 2 for a specific range in base.
|
|
@@ -21,7 +21,7 @@
|
|
|
21
21
|
|
|
22
22
|
import { ArrayUtils } from '@theia/core';
|
|
23
23
|
import { Range, uinteger } from '@theia/core/shared/vscode-languageserver-protocol';
|
|
24
|
-
import { LineRange } from './line-range';
|
|
24
|
+
import { LineRange } from './line-range.js';
|
|
25
25
|
import * as monaco from '@theia/monaco-editor-core';
|
|
26
26
|
|
|
27
27
|
/**
|
|
@@ -21,7 +21,7 @@
|
|
|
21
21
|
|
|
22
22
|
import { expect } from 'chai';
|
|
23
23
|
import { Range } from '@theia/core/shared/vscode-languageserver-protocol';
|
|
24
|
-
import { DocumentRangeMap, RangeMapping } from './range-mapping';
|
|
24
|
+
import { DocumentRangeMap, RangeMapping } from './range-mapping.js';
|
|
25
25
|
|
|
26
26
|
describe('document-range-map', () => {
|
|
27
27
|
|
|
@@ -21,9 +21,9 @@
|
|
|
21
21
|
|
|
22
22
|
import { ArrayUtils } from '@theia/core';
|
|
23
23
|
import { Position, Range, TextEditorDocument } from '@theia/editor/lib/browser/editor';
|
|
24
|
-
import { LineRange } from './line-range';
|
|
25
|
-
import { LineRangeEdit } from './range-editing';
|
|
26
|
-
import { PositionUtils, RangeUtils } from './range-utils';
|
|
24
|
+
import { LineRange } from './line-range.js';
|
|
25
|
+
import { LineRangeEdit } from './range-editing.js';
|
|
26
|
+
import { PositionUtils, RangeUtils } from './range-utils.js';
|
|
27
27
|
|
|
28
28
|
/**
|
|
29
29
|
* Maps a line range in the original text document to a line range in the modified text document.
|
|
@@ -16,7 +16,7 @@
|
|
|
16
16
|
|
|
17
17
|
import { injectable } from '@theia/core/shared/inversify';
|
|
18
18
|
import { ArrayUtils } from '@theia/core';
|
|
19
|
-
import { LineRangeMapping } from '../model/range-mapping';
|
|
19
|
+
import { LineRangeMapping } from '../model/range-mapping.js';
|
|
20
20
|
|
|
21
21
|
export interface DiffSpacers {
|
|
22
22
|
/**
|
|
@@ -14,8 +14,8 @@
|
|
|
14
14
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
15
15
|
// *****************************************************************************
|
|
16
16
|
|
|
17
|
-
export * from './merge-editor-pane';
|
|
18
|
-
export * from './merge-editor-pane-header';
|
|
19
|
-
export * from './merge-editor-base-pane';
|
|
20
|
-
export * from './merge-editor-side-pane';
|
|
21
|
-
export * from './merge-editor-result-pane';
|
|
17
|
+
export * from './merge-editor-pane.js';
|
|
18
|
+
export * from './merge-editor-pane-header.js';
|
|
19
|
+
export * from './merge-editor-base-pane.js';
|
|
20
|
+
export * from './merge-editor-side-pane.js';
|
|
21
|
+
export * from './merge-editor-result-pane.js';
|
|
@@ -18,9 +18,9 @@ import { injectable } from '@theia/core/shared/inversify';
|
|
|
18
18
|
import { nls } from '@theia/core';
|
|
19
19
|
import { Autorun } from '@theia/core/lib/common/observable';
|
|
20
20
|
import { EditorDecoration, Range } from '@theia/editor/lib/browser';
|
|
21
|
-
import { MergeEditorPane } from './merge-editor-pane';
|
|
22
|
-
import { MergeRange } from '../../model/merge-range';
|
|
23
|
-
import { LineRange } from '../../model/line-range';
|
|
21
|
+
import { MergeEditorPane } from './merge-editor-pane.js';
|
|
22
|
+
import { MergeRange } from '../../model/merge-range.js';
|
|
23
|
+
import { LineRange } from '../../model/line-range.js';
|
|
24
24
|
|
|
25
25
|
@injectable()
|
|
26
26
|
export class MergeEditorBasePane extends MergeEditorPane {
|
|
@@ -22,13 +22,13 @@ import { EditorDecoration, EditorWidget, MinimapPosition, OverviewRulerLane, Pos
|
|
|
22
22
|
import { MonacoEditor } from '@theia/monaco/lib/browser/monaco-editor';
|
|
23
23
|
import { MonacoToProtocolConverter } from '@theia/monaco/lib/browser/monaco-to-protocol-converter';
|
|
24
24
|
import { Selection } from '@theia/monaco-editor-core';
|
|
25
|
-
import { MergeEditorPaneHeader, MergeEditorPaneToolbarItem } from './merge-editor-pane-header';
|
|
26
|
-
import { MergeEditor } from '../../merge-editor';
|
|
27
|
-
import { MergeRange } from '../../model/merge-range';
|
|
28
|
-
import { DetailedLineRangeMapping } from '../../model/range-mapping';
|
|
29
|
-
import { LineRange } from '../../model/line-range';
|
|
30
|
-
import { RangeUtils } from '../../model/range-utils';
|
|
31
|
-
import { ScmColors } from '../../../scm-colors';
|
|
25
|
+
import { MergeEditorPaneHeader, MergeEditorPaneToolbarItem } from './merge-editor-pane-header.js';
|
|
26
|
+
import { MergeEditor } from '../../merge-editor.js';
|
|
27
|
+
import { MergeRange } from '../../model/merge-range.js';
|
|
28
|
+
import { DetailedLineRangeMapping } from '../../model/range-mapping.js';
|
|
29
|
+
import { LineRange } from '../../model/line-range.js';
|
|
30
|
+
import { RangeUtils } from '../../model/range-utils.js';
|
|
31
|
+
import { ScmColors } from '../../../scm-colors.js';
|
|
32
32
|
|
|
33
33
|
@injectable()
|
|
34
34
|
export abstract class MergeEditorPane extends BoxPanel {
|
|
@@ -21,10 +21,10 @@ import { Autorun, ObservableUtils } from '@theia/core/lib/common/observable';
|
|
|
21
21
|
import { EditorDecoration, Range } from '@theia/editor/lib/browser';
|
|
22
22
|
import { NavigationLocation } from '@theia/editor/lib/browser/navigation/navigation-location';
|
|
23
23
|
import { NavigationLocationService } from '@theia/editor/lib/browser/navigation/navigation-location-service';
|
|
24
|
-
import { MergeEditorPane } from './merge-editor-pane';
|
|
25
|
-
import { MergeEditorPaneToolbarItem } from './merge-editor-pane-header';
|
|
26
|
-
import { LineRange } from '../../model/line-range';
|
|
27
|
-
import { MergeRange } from '../../model/merge-range';
|
|
24
|
+
import { MergeEditorPane } from './merge-editor-pane.js';
|
|
25
|
+
import { MergeEditorPaneToolbarItem } from './merge-editor-pane-header.js';
|
|
26
|
+
import { LineRange } from '../../model/line-range.js';
|
|
27
|
+
import { MergeRange } from '../../model/merge-range.js';
|
|
28
28
|
|
|
29
29
|
@injectable()
|
|
30
30
|
export class MergeEditorResultPane extends MergeEditorPane {
|
|
@@ -19,10 +19,10 @@ import { nls, ILogger } from '@theia/core';
|
|
|
19
19
|
import { ObservableUtils } from '@theia/core/lib/common/observable';
|
|
20
20
|
import { codicon, DiffUris, LabelProvider, open, OpenerService } from '@theia/core/lib/browser';
|
|
21
21
|
import { EditorDecoration, EditorOpenerOptions, Range } from '@theia/editor/lib/browser';
|
|
22
|
-
import { MergeRange, MergeRangeAcceptedState, MergeSide } from '../../model/merge-range';
|
|
23
|
-
import { MergeEditorPane } from './merge-editor-pane';
|
|
24
|
-
import { MergeEditorPaneToolbarItem } from './merge-editor-pane-header';
|
|
25
|
-
import { LineRange } from '../../model/line-range';
|
|
22
|
+
import { MergeRange, MergeRangeAcceptedState, MergeSide } from '../../model/merge-range.js';
|
|
23
|
+
import { MergeEditorPane } from './merge-editor-pane.js';
|
|
24
|
+
import { MergeEditorPaneToolbarItem } from './merge-editor-pane-header.js';
|
|
25
|
+
import { LineRange } from '../../model/line-range.js';
|
|
26
26
|
|
|
27
27
|
@injectable()
|
|
28
28
|
export abstract class MergeEditorSidePane extends MergeEditorPane {
|
|
@@ -21,8 +21,8 @@
|
|
|
21
21
|
|
|
22
22
|
import { Disposable, DisposableCollection } from '@theia/core';
|
|
23
23
|
import { MonacoEditor } from '@theia/monaco/lib/browser/monaco-editor';
|
|
24
|
-
import { MergeEditor } from '../merge-editor';
|
|
25
|
-
import { DocumentLineRangeMap } from '../model/range-mapping';
|
|
24
|
+
import { MergeEditor } from '../merge-editor.js';
|
|
25
|
+
import { DocumentLineRangeMap } from '../model/range-mapping.js';
|
|
26
26
|
|
|
27
27
|
export class MergeEditorScrollSync implements Disposable {
|
|
28
28
|
|
|
@@ -19,11 +19,11 @@ import { Disposable } from '@theia/core';
|
|
|
19
19
|
import { Autorun, Observable } from '@theia/core/lib/common/observable';
|
|
20
20
|
import * as monaco from '@theia/monaco-editor-core';
|
|
21
21
|
import { MonacoEditorViewZone } from '@theia/monaco/lib/browser/monaco-editor-zone-widget';
|
|
22
|
-
import { MergeEditor } from '../merge-editor';
|
|
23
|
-
import { MergeRange } from '../model/merge-range';
|
|
24
|
-
import { MergeRangeAction, MergeRangeActions } from './merge-range-actions';
|
|
25
|
-
import { MergeEditorPane } from './merge-editor-panes';
|
|
26
|
-
import { DiffSpacers, DiffSpacerService } from './diff-spacers';
|
|
22
|
+
import { MergeEditor } from '../merge-editor.js';
|
|
23
|
+
import { MergeRange } from '../model/merge-range.js';
|
|
24
|
+
import { MergeRangeAction, MergeRangeActions } from './merge-range-actions.js';
|
|
25
|
+
import { MergeEditorPane } from './merge-editor-panes/index.js';
|
|
26
|
+
import { DiffSpacers, DiffSpacerService } from './diff-spacers.js';
|
|
27
27
|
|
|
28
28
|
export interface MergeEditorViewZone {
|
|
29
29
|
create(ctx: MergeEditorViewZone.CreationContext): void;
|
|
@@ -20,8 +20,8 @@
|
|
|
20
20
|
// copied and modified from https://github.com/microsoft/vscode/blob/1.96.3/src/vs/workbench/contrib/mergeEditor/browser/view/conflictActions.ts
|
|
21
21
|
|
|
22
22
|
import { DerivedObservable, ObservableUtils } from '@theia/core/lib/common/observable';
|
|
23
|
-
import { MergeRange, MergeRangeAcceptedState, MergeSide } from '../model/merge-range';
|
|
24
|
-
import { MergeEditor } from '../merge-editor';
|
|
23
|
+
import { MergeRange, MergeRangeAcceptedState, MergeSide } from '../model/merge-range.js';
|
|
24
|
+
import { MergeEditor } from '../merge-editor.js';
|
|
25
25
|
import { nls } from '@theia/core';
|
|
26
26
|
|
|
27
27
|
export interface MergeRangeAction {
|
|
@@ -19,8 +19,8 @@ import '../../../src/browser/style/multi-diff-editor.css';
|
|
|
19
19
|
import { interfaces } from '@theia/core/shared/inversify';
|
|
20
20
|
import { URI } from '@theia/core';
|
|
21
21
|
import { LabelProviderContribution, NavigatableWidgetOptions, OpenHandler, WidgetFactory } from '@theia/core/lib/browser';
|
|
22
|
-
import { MultiDiffEditorOpenHandler, MultiDiffEditorLabelProvider } from './multi-diff-editor';
|
|
23
|
-
import { MultiDiffEditorWidgetFactory } from './multi-diff-editor-widget-factory';
|
|
22
|
+
import { MultiDiffEditorOpenHandler, MultiDiffEditorLabelProvider } from './multi-diff-editor.js';
|
|
23
|
+
import { MultiDiffEditorWidgetFactory } from './multi-diff-editor-widget-factory.js';
|
|
24
24
|
|
|
25
25
|
export function bindMultiDiffEditor(bind: interfaces.Bind): void {
|
|
26
26
|
bind(MultiDiffEditorWidgetFactory).toDynamicValue(ctx => new MultiDiffEditorWidgetFactory(ctx.container)).inSingletonScope();
|
|
@@ -21,8 +21,8 @@ import { EditorManager, EditorWidget } from '@theia/editor/lib/browser';
|
|
|
21
21
|
import * as monaco from '@theia/monaco-editor-core';
|
|
22
22
|
import { MonacoEditor } from '@theia/monaco/lib/browser/monaco-editor';
|
|
23
23
|
import { MonacoDiffEditor } from '@theia/monaco/lib/browser/monaco-diff-editor';
|
|
24
|
-
import { DiffEntryHeaderWidget, MultiDiffEditor, MultiDiffEditorData, MultiDiffEditorUri } from './multi-diff-editor';
|
|
25
|
-
import { MultiDiffEditorResourcePair, MultiDiffEditorUriData } from './multi-diff-editor-uri';
|
|
24
|
+
import { DiffEntryHeaderWidget, MultiDiffEditor, MultiDiffEditorData, MultiDiffEditorUri } from './multi-diff-editor.js';
|
|
25
|
+
import { MultiDiffEditorResourcePair, MultiDiffEditorUriData } from './multi-diff-editor-uri.js';
|
|
26
26
|
|
|
27
27
|
/** Options shared by embedded diff and code editors. */
|
|
28
28
|
const EMBEDDED_EDITOR_OPTIONS: monaco.editor.IEditorOptions = {
|
|
@@ -24,7 +24,7 @@ import * as sinon from 'sinon';
|
|
|
24
24
|
import { EditorManager, EditorWidget } from '@theia/editor/lib/browser';
|
|
25
25
|
import { MonacoEditor } from '@theia/monaco/lib/browser/monaco-editor';
|
|
26
26
|
import { MonacoDiffEditor } from '@theia/monaco/lib/browser/monaco-diff-editor';
|
|
27
|
-
import { MultiDiffEditorWidgetFactory } from './multi-diff-editor-widget-factory';
|
|
27
|
+
import { MultiDiffEditorWidgetFactory } from './multi-diff-editor-widget-factory.js';
|
|
28
28
|
import { Emitter, URI } from '@theia/core';
|
|
29
29
|
import { LabelProvider, MessageLoop, Widget } from '@theia/core/lib/browser';
|
|
30
30
|
import { Container } from '@theia/core/shared/inversify';
|
|
@@ -39,8 +39,8 @@ import {
|
|
|
39
39
|
MultiDiffEditorData,
|
|
40
40
|
MultiDiffEditorLabelProvider,
|
|
41
41
|
MultiDiffEditorOpenHandler
|
|
42
|
-
} from './multi-diff-editor';
|
|
43
|
-
import { MultiDiffEditorResourcePair, MultiDiffEditorUri } from './multi-diff-editor-uri';
|
|
42
|
+
} from './multi-diff-editor.js';
|
|
43
|
+
import { MultiDiffEditorResourcePair, MultiDiffEditorUri } from './multi-diff-editor-uri.js';
|
|
44
44
|
|
|
45
45
|
disableJSDOM();
|
|
46
46
|
|
|
@@ -16,7 +16,7 @@
|
|
|
16
16
|
|
|
17
17
|
import { expect } from 'chai';
|
|
18
18
|
import { URI } from '@theia/core';
|
|
19
|
-
import { MultiDiffEditorUri, MultiDiffEditorUriData } from './multi-diff-editor-uri';
|
|
19
|
+
import { MultiDiffEditorUri, MultiDiffEditorUriData } from './multi-diff-editor-uri.js';
|
|
20
20
|
|
|
21
21
|
describe('MultiDiffEditorUri', () => {
|
|
22
22
|
|
|
@@ -24,7 +24,7 @@ import {
|
|
|
24
24
|
import { EditorWidget } from '@theia/editor/lib/browser';
|
|
25
25
|
import { MonacoEditor } from '@theia/monaco/lib/browser/monaco-editor';
|
|
26
26
|
import { MonacoDiffEditor } from '@theia/monaco/lib/browser/monaco-diff-editor';
|
|
27
|
-
import { MultiDiffEditorUri, MultiDiffEditorResourcePair, MultiDiffEditorUriData } from './multi-diff-editor-uri';
|
|
27
|
+
import { MultiDiffEditorUri, MultiDiffEditorResourcePair, MultiDiffEditorUriData } from './multi-diff-editor-uri.js';
|
|
28
28
|
|
|
29
29
|
export { MultiDiffEditorUri, MultiDiffEditorResourcePair, MultiDiffEditorUriData };
|
|
30
30
|
|
|
@@ -19,9 +19,9 @@ import { CommandService, DisposableCollection, MenuNode, CommandMenu, nls } from
|
|
|
19
19
|
import { Message } from '@theia/core/shared/@lumino/messaging';
|
|
20
20
|
import * as React from '@theia/core/shared/react';
|
|
21
21
|
import { codicon, ContextMenuRenderer, ReactWidget } from '@theia/core/lib/browser';
|
|
22
|
-
import { ScmService } from './scm-service';
|
|
23
|
-
import { ScmRepository } from './scm-repository';
|
|
24
|
-
import { ScmActionButton, ScmCommand, ScmProvider } from './scm-provider';
|
|
22
|
+
import { ScmService } from './scm-service.js';
|
|
23
|
+
import { ScmRepository } from './scm-repository.js';
|
|
24
|
+
import { ScmActionButton, ScmCommand, ScmProvider } from './scm-provider.js';
|
|
25
25
|
import { LabelParser } from '@theia/core/lib/browser/label-parser';
|
|
26
26
|
import { BrowserMenuNodeFactory } from '@theia/core/lib/browser/menu/browser-menu-node-factory';
|
|
27
27
|
|
|
@@ -17,12 +17,12 @@
|
|
|
17
17
|
import '../../src/browser/style/scm-amend-component.css';
|
|
18
18
|
|
|
19
19
|
import * as React from '@theia/core/shared/react';
|
|
20
|
-
import { ScmAvatarService } from './scm-avatar-service';
|
|
20
|
+
import { ScmAvatarService } from './scm-avatar-service.js';
|
|
21
21
|
import { codicon, StorageService } from '@theia/core/lib/browser';
|
|
22
22
|
import { Disposable, DisposableCollection } from '@theia/core';
|
|
23
23
|
|
|
24
|
-
import { ScmRepository } from './scm-repository';
|
|
25
|
-
import { ScmAmendSupport, ScmCommit } from './scm-provider';
|
|
24
|
+
import { ScmRepository } from './scm-repository.js';
|
|
25
|
+
import { ScmAmendSupport, ScmCommit } from './scm-provider.js';
|
|
26
26
|
import { nls } from '@theia/core/lib/common/nls';
|
|
27
27
|
|
|
28
28
|
export interface ScmAmendComponentProps {
|
|
@@ -20,9 +20,9 @@ import * as React from '@theia/core/shared/react';
|
|
|
20
20
|
import {
|
|
21
21
|
ContextMenuRenderer, ReactWidget, LabelProvider, KeybindingRegistry, StorageService
|
|
22
22
|
} from '@theia/core/lib/browser';
|
|
23
|
-
import { ScmService } from './scm-service';
|
|
24
|
-
import { ScmAvatarService } from './scm-avatar-service';
|
|
25
|
-
import { ScmAmendComponent } from './scm-amend-component';
|
|
23
|
+
import { ScmService } from './scm-service.js';
|
|
24
|
+
import { ScmAvatarService } from './scm-avatar-service.js';
|
|
25
|
+
import { ScmAmendComponent } from './scm-amend-component.js';
|
|
26
26
|
|
|
27
27
|
@injectable()
|
|
28
28
|
export class ScmAmendWidget extends ReactWidget {
|
|
@@ -19,11 +19,11 @@ import { DisposableCollection } from '@theia/core';
|
|
|
19
19
|
import { Message } from '@theia/core/shared/@lumino/messaging';
|
|
20
20
|
import * as React from '@theia/core/shared/react';
|
|
21
21
|
import TextareaAutosize from 'react-textarea-autosize';
|
|
22
|
-
import { ScmInput, ScmInputIssueType } from './scm-input';
|
|
22
|
+
import { ScmInput, ScmInputIssueType } from './scm-input.js';
|
|
23
23
|
import {
|
|
24
24
|
ContextMenuRenderer, ReactWidget, KeybindingRegistry, StatefulWidget
|
|
25
25
|
} from '@theia/core/lib/browser';
|
|
26
|
-
import { ScmService } from './scm-service';
|
|
26
|
+
import { ScmService } from './scm-service.js';
|
|
27
27
|
|
|
28
28
|
@injectable()
|
|
29
29
|
export class ScmCommitWidget extends ReactWidget implements StatefulWidget {
|
|
@@ -20,9 +20,9 @@ const disableJSDOM = enableJSDOM();
|
|
|
20
20
|
import { expect } from 'chai';
|
|
21
21
|
import { ContextKey, ContextKeyServiceDummyImpl, ContextKeyValue } from '@theia/core/lib/browser/context-key-service';
|
|
22
22
|
import { Emitter } from '@theia/core/lib/common/event';
|
|
23
|
-
import { ScmContextKeyService } from './scm-context-key-service';
|
|
24
|
-
import { ScmContribution } from './scm-contribution';
|
|
25
|
-
import { ScmRepository } from './scm-repository';
|
|
23
|
+
import { ScmContextKeyService } from './scm-context-key-service.js';
|
|
24
|
+
import { ScmContribution } from './scm-contribution.js';
|
|
25
|
+
import { ScmRepository } from './scm-repository.js';
|
|
26
26
|
|
|
27
27
|
disableJSDOM();
|
|
28
28
|
|
|
@@ -31,21 +31,21 @@ import {
|
|
|
31
31
|
import { TabBarToolbarContribution, TabBarToolbarRegistry, TabBarToolbarAction } from '@theia/core/lib/browser/shell/tab-bar-toolbar';
|
|
32
32
|
import { CommandRegistry, Command, Disposable, DisposableCollection, CommandService, MenuModelRegistry } from '@theia/core/lib/common';
|
|
33
33
|
import { ContextKeyService, ContextKey } from '@theia/core/lib/browser/context-key-service';
|
|
34
|
-
import { ScmService } from './scm-service';
|
|
35
|
-
import { ScmContextKeyService } from './scm-context-key-service';
|
|
36
|
-
import { ScmWidget } from '../browser/scm-widget';
|
|
34
|
+
import { ScmService } from './scm-service.js';
|
|
35
|
+
import { ScmContextKeyService } from './scm-context-key-service.js';
|
|
36
|
+
import { ScmWidget } from '../browser/scm-widget.js';
|
|
37
37
|
import URI from '@theia/core/lib/common/uri';
|
|
38
|
-
import { ScmQuickOpenService } from './scm-quick-open-service';
|
|
38
|
+
import { ScmQuickOpenService } from './scm-quick-open-service.js';
|
|
39
39
|
import { ColorContribution } from '@theia/core/lib/browser/color-application-contribution';
|
|
40
40
|
import { ColorRegistry } from '@theia/core/lib/browser/color-registry';
|
|
41
41
|
import { Color } from '@theia/core/lib/common/color';
|
|
42
|
-
import { ScmColors } from './scm-colors';
|
|
43
|
-
import { ScmCommand } from './scm-provider';
|
|
44
|
-
import { ScmDecorationsService } from '../browser/decorations/scm-decorations-service';
|
|
42
|
+
import { ScmColors } from './scm-colors.js';
|
|
43
|
+
import { ScmCommand } from './scm-provider.js';
|
|
44
|
+
import { ScmDecorationsService } from '../browser/decorations/scm-decorations-service.js';
|
|
45
45
|
import { nls } from '@theia/core/lib/common/nls';
|
|
46
46
|
import { isHighContrast } from '@theia/core/lib/common/theme';
|
|
47
47
|
import { EditorMainMenu, EditorWidget } from '@theia/editor/lib/browser';
|
|
48
|
-
import { DirtyDiffNavigator } from './dirty-diff/dirty-diff-navigator';
|
|
48
|
+
import { DirtyDiffNavigator } from './dirty-diff/dirty-diff-navigator.js';
|
|
49
49
|
import { MonacoDiffEditor } from '@theia/monaco/lib/browser/monaco-diff-editor';
|
|
50
50
|
|
|
51
51
|
export const SCM_WIDGET_FACTORY_ID = ScmWidget.ID;
|
|
@@ -23,32 +23,32 @@ import {
|
|
|
23
23
|
WidgetManager, ApplicationShellLayoutMigration,
|
|
24
24
|
createTreeContainer, TreeModel, TreeModelImpl, StylingParticipant
|
|
25
25
|
} from '@theia/core/lib/browser';
|
|
26
|
-
import { ScmService } from './scm-service';
|
|
27
|
-
import { SCM_WIDGET_FACTORY_ID, ScmContribution, SCM_VIEW_CONTAINER_ID, SCM_VIEW_CONTAINER_TITLE_OPTIONS } from './scm-contribution';
|
|
28
|
-
import { ScmWidget } from './scm-widget';
|
|
29
|
-
import { ScmTreeWidget } from './scm-tree-widget';
|
|
30
|
-
import { ScmCommitWidget } from './scm-commit-widget';
|
|
31
|
-
import { ScmActionButtonWidget } from './scm-action-button-widget';
|
|
32
|
-
import { ScmAmendWidget } from './scm-amend-widget';
|
|
33
|
-
import { ScmTreeModelProps } from './scm-tree-model';
|
|
34
|
-
import { ScmGroupsTreeModel } from './scm-groups-tree-model';
|
|
35
|
-
import { ScmQuickOpenService } from './scm-quick-open-service';
|
|
36
|
-
import { bindDirtyDiff } from './dirty-diff/dirty-diff-module';
|
|
37
|
-
import { ScmDecorationsService } from './decorations/scm-decorations-service';
|
|
38
|
-
import { ScmAvatarService } from './scm-avatar-service';
|
|
39
|
-
import { ScmContextKeyService } from './scm-context-key-service';
|
|
40
|
-
import { ScmLayoutVersion3Migration, ScmLayoutVersion5Migration } from './scm-layout-migrations';
|
|
41
|
-
import { ScmTreeLabelProvider } from './scm-tree-label-provider';
|
|
26
|
+
import { ScmService } from './scm-service.js';
|
|
27
|
+
import { SCM_WIDGET_FACTORY_ID, ScmContribution, SCM_VIEW_CONTAINER_ID, SCM_VIEW_CONTAINER_TITLE_OPTIONS } from './scm-contribution.js';
|
|
28
|
+
import { ScmWidget } from './scm-widget.js';
|
|
29
|
+
import { ScmTreeWidget } from './scm-tree-widget.js';
|
|
30
|
+
import { ScmCommitWidget } from './scm-commit-widget.js';
|
|
31
|
+
import { ScmActionButtonWidget } from './scm-action-button-widget.js';
|
|
32
|
+
import { ScmAmendWidget } from './scm-amend-widget.js';
|
|
33
|
+
import { ScmTreeModelProps } from './scm-tree-model.js';
|
|
34
|
+
import { ScmGroupsTreeModel } from './scm-groups-tree-model.js';
|
|
35
|
+
import { ScmQuickOpenService } from './scm-quick-open-service.js';
|
|
36
|
+
import { bindDirtyDiff } from './dirty-diff/dirty-diff-module.js';
|
|
37
|
+
import { ScmDecorationsService } from './decorations/scm-decorations-service.js';
|
|
38
|
+
import { ScmAvatarService } from './scm-avatar-service.js';
|
|
39
|
+
import { ScmContextKeyService } from './scm-context-key-service.js';
|
|
40
|
+
import { ScmLayoutVersion3Migration, ScmLayoutVersion5Migration } from './scm-layout-migrations.js';
|
|
41
|
+
import { ScmTreeLabelProvider } from './scm-tree-label-provider.js';
|
|
42
42
|
import { TabBarToolbarContribution } from '@theia/core/lib/browser/shell/tab-bar-toolbar';
|
|
43
43
|
import { ColorContribution } from '@theia/core/lib/browser/color-application-contribution';
|
|
44
44
|
import { LabelProviderContribution } from '@theia/core/lib/browser/label-provider';
|
|
45
|
-
import { bindScmPreferences } from '../common/scm-preferences';
|
|
46
|
-
import { bindMergeEditor } from './merge-editor/merge-editor-module';
|
|
47
|
-
import { bindMultiDiffEditor } from './multi-diff-editor/multi-diff-editor-module';
|
|
48
|
-
import { ScmRepositoriesWidget } from './scm-repositories-widget';
|
|
49
|
-
import { ScmHistoryGraphWidget } from './scm-history-graph-widget';
|
|
50
|
-
import { ScmHistoryGraphModel, ScmHistoryGraphModelProvider } from './scm-history-graph-model';
|
|
51
|
-
import { ScmHistoryGraphContribution } from './scm-history-graph-contribution';
|
|
45
|
+
import { bindScmPreferences } from '../common/scm-preferences.js';
|
|
46
|
+
import { bindMergeEditor } from './merge-editor/merge-editor-module.js';
|
|
47
|
+
import { bindMultiDiffEditor } from './multi-diff-editor/multi-diff-editor-module.js';
|
|
48
|
+
import { ScmRepositoriesWidget } from './scm-repositories-widget.js';
|
|
49
|
+
import { ScmHistoryGraphWidget } from './scm-history-graph-widget.js';
|
|
50
|
+
import { ScmHistoryGraphModel, ScmHistoryGraphModelProvider } from './scm-history-graph-model.js';
|
|
51
|
+
import { ScmHistoryGraphContribution } from './scm-history-graph-contribution.js';
|
|
52
52
|
import { CommandContribution, MenuContribution } from '@theia/core';
|
|
53
53
|
|
|
54
54
|
export default new ContainerModule(bind => {
|
|
@@ -16,9 +16,9 @@
|
|
|
16
16
|
|
|
17
17
|
import { injectable, inject, postConstruct } from '@theia/core/shared/inversify';
|
|
18
18
|
import { Disposable, DisposableCollection } from '@theia/core/lib/common/disposable';
|
|
19
|
-
import { ScmService } from './scm-service';
|
|
20
|
-
import { ScmTreeModel } from './scm-tree-model';
|
|
21
|
-
import { ScmResourceGroup, ScmProvider } from './scm-provider';
|
|
19
|
+
import { ScmService } from './scm-service.js';
|
|
20
|
+
import { ScmTreeModel } from './scm-tree-model.js';
|
|
21
|
+
import { ScmResourceGroup, ScmProvider } from './scm-provider.js';
|
|
22
22
|
|
|
23
23
|
@injectable()
|
|
24
24
|
export class ScmGroupsTreeModel extends ScmTreeModel {
|
|
@@ -20,9 +20,9 @@ const disableJSDOM = enableJSDOM();
|
|
|
20
20
|
import { expect } from 'chai';
|
|
21
21
|
import { Command, CommandHandler, CommandRegistry } from '@theia/core/lib/common/command';
|
|
22
22
|
import { Disposable } from '@theia/core/lib/common/disposable';
|
|
23
|
-
import { ScmHistoryGraphContribution, ScmHistoryGraphCommands } from './scm-history-graph-contribution';
|
|
24
|
-
import { ScmHistoryGraphModel, ScmHistoryViewMode } from './scm-history-graph-model';
|
|
25
|
-
import { ScmHistoryProvider } from './scm-provider';
|
|
23
|
+
import { ScmHistoryGraphContribution, ScmHistoryGraphCommands } from './scm-history-graph-contribution.js';
|
|
24
|
+
import { ScmHistoryGraphModel, ScmHistoryViewMode } from './scm-history-graph-model.js';
|
|
25
|
+
import { ScmHistoryProvider } from './scm-provider.js';
|
|
26
26
|
|
|
27
27
|
disableJSDOM();
|
|
28
28
|
|
|
@@ -23,12 +23,12 @@ import { CancellationTokenSource } from '@theia/core/lib/common/cancellation';
|
|
|
23
23
|
import { QuickInputService } from '@theia/core/lib/browser';
|
|
24
24
|
import { QuickPickItem, QuickPickSeparator } from '@theia/core/lib/common/quick-pick-service';
|
|
25
25
|
import { codicon } from '@theia/core/lib/browser/widgets/widget';
|
|
26
|
-
import { ScmHistoryGraphModel, ScmHistoryGraphModelProvider } from './scm-history-graph-model';
|
|
27
|
-
import { ScmService } from './scm-service';
|
|
28
|
-
import { ScmContextKeyService } from './scm-context-key-service';
|
|
29
|
-
import { ScmHistoryItemRef, ScmHistoryProvider } from './scm-provider';
|
|
30
|
-
import { SCM_HISTORY_TITLE_MENU } from './scm-history-graph-widget';
|
|
31
|
-
import { getRefBadgeClass } from './scm-history-graph-helpers';
|
|
26
|
+
import { ScmHistoryGraphModel, ScmHistoryGraphModelProvider } from './scm-history-graph-model.js';
|
|
27
|
+
import { ScmService } from './scm-service.js';
|
|
28
|
+
import { ScmContextKeyService } from './scm-context-key-service.js';
|
|
29
|
+
import { ScmHistoryItemRef, ScmHistoryProvider } from './scm-provider.js';
|
|
30
|
+
import { SCM_HISTORY_TITLE_MENU } from './scm-history-graph-widget.js';
|
|
31
|
+
import { getRefBadgeClass } from './scm-history-graph-helpers.js';
|
|
32
32
|
|
|
33
33
|
export namespace ScmHistoryGraphCommands {
|
|
34
34
|
export const REFRESH = Command.toDefaultLocalizedCommand({
|
|
@@ -17,8 +17,8 @@
|
|
|
17
17
|
import { expect } from 'chai';
|
|
18
18
|
import {
|
|
19
19
|
buildChangeTreeRows, ChangeTreeFileRow, ChangeTreeRow, filterRefsForBadges, getFileName, getRefBadgePresentation, getRefColorIndex
|
|
20
|
-
} from './scm-history-graph-helpers';
|
|
21
|
-
import { ScmHistoryItemChange, ScmHistoryItemRef, ScmHistoryProvider } from './scm-provider';
|
|
20
|
+
} from './scm-history-graph-helpers.js';
|
|
21
|
+
import { ScmHistoryItemChange, ScmHistoryItemRef, ScmHistoryProvider } from './scm-provider.js';
|
|
22
22
|
|
|
23
23
|
describe('getRefColorIndex', () => {
|
|
24
24
|
|
|
@@ -14,7 +14,7 @@
|
|
|
14
14
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
15
15
|
// *****************************************************************************
|
|
16
16
|
|
|
17
|
-
import { ScmHistoryItemRef, ScmHistoryItemChange, ScmHistoryProvider } from './scm-provider';
|
|
17
|
+
import { ScmHistoryItemRef, ScmHistoryItemChange, ScmHistoryProvider } from './scm-provider.js';
|
|
18
18
|
|
|
19
19
|
/**
|
|
20
20
|
* Returns the CSS color variable for the given color index.
|
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
// *****************************************************************************
|
|
16
16
|
|
|
17
17
|
import { expect } from 'chai';
|
|
18
|
-
import { computeGraphRows } from './scm-history-graph-lanes';
|
|
18
|
+
import { computeGraphRows } from './scm-history-graph-lanes.js';
|
|
19
19
|
|
|
20
20
|
describe('computeGraphRows', () => {
|
|
21
21
|
|
|
@@ -16,9 +16,9 @@
|
|
|
16
16
|
|
|
17
17
|
import { expect } from 'chai';
|
|
18
18
|
import { Emitter } from '@theia/core/lib/common/event';
|
|
19
|
-
import { ScmHistoryGraphModel, PAGE_SIZE } from './scm-history-graph-model';
|
|
20
|
-
import { ScmHistoryItem, ScmHistoryItemRef, ScmHistoryItemRefsChangeEvent, ScmHistoryItemChange, ScmHistoryOptions, ScmHistoryProvider } from './scm-provider';
|
|
21
|
-
import { ScmRepository } from './scm-repository';
|
|
19
|
+
import { ScmHistoryGraphModel, PAGE_SIZE } from './scm-history-graph-model.js';
|
|
20
|
+
import { ScmHistoryItem, ScmHistoryItemRef, ScmHistoryItemRefsChangeEvent, ScmHistoryItemChange, ScmHistoryOptions, ScmHistoryProvider } from './scm-provider.js';
|
|
21
|
+
import { ScmRepository } from './scm-repository.js';
|
|
22
22
|
|
|
23
23
|
class StubHistoryProvider implements ScmHistoryProvider {
|
|
24
24
|
currentHistoryItemRef: ScmHistoryItemRef | undefined;
|
|
@@ -18,12 +18,12 @@ import { injectable, inject, postConstruct, named } from '@theia/core/shared/inv
|
|
|
18
18
|
import { Disposable, DisposableCollection } from '@theia/core/lib/common/disposable';
|
|
19
19
|
import { Emitter, Event } from '@theia/core/lib/common/event';
|
|
20
20
|
import { CancellationTokenSource } from '@theia/core/lib/common/cancellation';
|
|
21
|
-
import { ScmService } from './scm-service';
|
|
22
|
-
import { ScmHistoryItem, ScmHistoryItemRef, ScmHistoryProvider, ScmHistoryOptions } from './scm-provider';
|
|
23
|
-
import { computeGraphRows, GraphRow } from './scm-history-graph-lanes';
|
|
21
|
+
import { ScmService } from './scm-service.js';
|
|
22
|
+
import { ScmHistoryItem, ScmHistoryItemRef, ScmHistoryProvider, ScmHistoryOptions } from './scm-provider.js';
|
|
23
|
+
import { computeGraphRows, GraphRow } from './scm-history-graph-lanes.js';
|
|
24
24
|
import { ILogger } from '@theia/core';
|
|
25
|
-
import { getRefColorIndex } from './scm-history-graph-helpers';
|
|
26
|
-
import { ScmPreferences } from '../common/scm-preferences';
|
|
25
|
+
import { getRefColorIndex } from './scm-history-graph-helpers.js';
|
|
26
|
+
import { ScmPreferences } from '../common/scm-preferences.js';
|
|
27
27
|
|
|
28
28
|
export const PAGE_SIZE = 50;
|
|
29
29
|
|
|
@@ -24,9 +24,9 @@ import { OpenerService } from '@theia/core/lib/browser/opener-service';
|
|
|
24
24
|
import { markMarkdownLinksWired } from '@theia/core/lib/browser/markdown-rendering/markdown-link-handler';
|
|
25
25
|
import { DisposableCollection } from '@theia/core/lib/common/disposable';
|
|
26
26
|
import URI from '@theia/core/lib/common/uri';
|
|
27
|
-
import { ScmHistoryItem } from './scm-provider';
|
|
28
|
-
import { HistoryGraphEntry } from './scm-history-graph-model';
|
|
29
|
-
import { buildHtmlTooltip, buildProviderTooltip, HistoryTooltipActions } from './scm-history-graph-tooltip';
|
|
27
|
+
import { ScmHistoryItem } from './scm-provider.js';
|
|
28
|
+
import { HistoryGraphEntry } from './scm-history-graph-model.js';
|
|
29
|
+
import { buildHtmlTooltip, buildProviderTooltip, HistoryTooltipActions } from './scm-history-graph-tooltip.js';
|
|
30
30
|
|
|
31
31
|
disableJSDOM();
|
|
32
32
|
|
|
@@ -21,9 +21,9 @@ import { OpenerService } from '@theia/core/lib/browser/opener-service';
|
|
|
21
21
|
import { DisposableCollection } from '@theia/core/lib/common/disposable';
|
|
22
22
|
import { codicon } from '@theia/core/lib/browser/widgets/widget';
|
|
23
23
|
import { nls } from '@theia/core/lib/common/nls';
|
|
24
|
-
import { ScmHistoryItem, ScmHistoryItemRef, ScmHistoryProvider } from './scm-provider';
|
|
25
|
-
import { HistoryGraphEntry } from './scm-history-graph-model';
|
|
26
|
-
import { laneColor, getRefBadgeClass, getRefBadgePresentation, deduplicateRefs, isTagRef, isRemoteRef } from './scm-history-graph-helpers';
|
|
24
|
+
import { ScmHistoryItem, ScmHistoryItemRef, ScmHistoryProvider } from './scm-provider.js';
|
|
25
|
+
import { HistoryGraphEntry } from './scm-history-graph-model.js';
|
|
26
|
+
import { laneColor, getRefBadgeClass, getRefBadgePresentation, deduplicateRefs, isTagRef, isRemoteRef } from './scm-history-graph-helpers.js';
|
|
27
27
|
|
|
28
28
|
export function formatRelativeTime(ms: number): string {
|
|
29
29
|
const now = Date.now();
|
|
@@ -21,10 +21,10 @@ import { expect } from 'chai';
|
|
|
21
21
|
import * as React from '@theia/core/shared/react';
|
|
22
22
|
import { Emitter } from '@theia/core/lib/common/event';
|
|
23
23
|
import { ContextKey, ContextKeyServiceDummyImpl, ContextKeyValue } from '@theia/core/lib/browser/context-key-service';
|
|
24
|
-
import { ScmContextKeyService } from './scm-context-key-service';
|
|
25
|
-
import { ScmHistoryGraphWidget } from './scm-history-graph-widget';
|
|
26
|
-
import { GraphRow } from './scm-history-graph-lanes';
|
|
27
|
-
import { ScmHistoryItemChange, ScmHistoryProvider } from './scm-provider';
|
|
24
|
+
import { ScmContextKeyService } from './scm-context-key-service.js';
|
|
25
|
+
import { ScmHistoryGraphWidget } from './scm-history-graph-widget.js';
|
|
26
|
+
import { GraphRow } from './scm-history-graph-lanes.js';
|
|
27
|
+
import { ScmHistoryItemChange, ScmHistoryProvider } from './scm-provider.js';
|
|
28
28
|
|
|
29
29
|
disableJSDOM();
|
|
30
30
|
|