@theia/scm 1.77.0-next.99 → 1.78.0-next.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/browser/decorations/scm-decorations-service.d.ts +2 -2
- package/lib/browser/decorations/scm-decorations-service.d.ts.map +1 -1
- package/lib/browser/decorations/scm-decorations-service.js +22 -28
- package/lib/browser/decorations/scm-decorations-service.js.map +1 -1
- package/lib/browser/decorations/scm-navigator-decorator.js +22 -28
- package/lib/browser/decorations/scm-navigator-decorator.js.map +1 -1
- package/lib/browser/dirty-diff/content-lines.js +2 -5
- package/lib/browser/dirty-diff/content-lines.js.map +1 -1
- package/lib/browser/dirty-diff/content-lines.spec.js +15 -17
- package/lib/browser/dirty-diff/content-lines.spec.js.map +1 -1
- package/lib/browser/dirty-diff/diff-computer.d.ts +1 -1
- package/lib/browser/dirty-diff/diff-computer.d.ts.map +1 -1
- package/lib/browser/dirty-diff/diff-computer.js +11 -16
- package/lib/browser/dirty-diff/diff-computer.js.map +1 -1
- package/lib/browser/dirty-diff/diff-computer.spec.js +26 -28
- package/lib/browser/dirty-diff/diff-computer.spec.js.map +1 -1
- package/lib/browser/dirty-diff/dirty-diff-decorator.d.ts +1 -1
- package/lib/browser/dirty-diff/dirty-diff-decorator.d.ts.map +1 -1
- package/lib/browser/dirty-diff/dirty-diff-decorator.js +19 -22
- package/lib/browser/dirty-diff/dirty-diff-decorator.js.map +1 -1
- package/lib/browser/dirty-diff/dirty-diff-module.js +11 -14
- package/lib/browser/dirty-diff/dirty-diff-module.js.map +1 -1
- package/lib/browser/dirty-diff/dirty-diff-navigator.d.ts +3 -3
- package/lib/browser/dirty-diff/dirty-diff-navigator.d.ts.map +1 -1
- package/lib/browser/dirty-diff/dirty-diff-navigator.js +30 -40
- package/lib/browser/dirty-diff/dirty-diff-navigator.js.map +1 -1
- package/lib/browser/dirty-diff/dirty-diff-widget.d.ts +1 -1
- package/lib/browser/dirty-diff/dirty-diff-widget.d.ts.map +1 -1
- package/lib/browser/dirty-diff/dirty-diff-widget.js +50 -54
- package/lib/browser/dirty-diff/dirty-diff-widget.js.map +1 -1
- package/lib/browser/merge-editor/merge-editor-contribution.d.ts +2 -2
- package/lib/browser/merge-editor/merge-editor-contribution.d.ts.map +1 -1
- package/lib/browser/merge-editor/merge-editor-contribution.js +43 -49
- package/lib/browser/merge-editor/merge-editor-contribution.js.map +1 -1
- package/lib/browser/merge-editor/merge-editor-dev-contribution.d.ts +2 -2
- package/lib/browser/merge-editor/merge-editor-dev-contribution.d.ts.map +1 -1
- package/lib/browser/merge-editor/merge-editor-dev-contribution.js +35 -45
- package/lib/browser/merge-editor/merge-editor-dev-contribution.js.map +1 -1
- package/lib/browser/merge-editor/merge-editor-module.d.ts +1 -1
- package/lib/browser/merge-editor/merge-editor-module.d.ts.map +1 -1
- package/lib/browser/merge-editor/merge-editor-module.js +49 -54
- package/lib/browser/merge-editor/merge-editor-module.js.map +1 -1
- package/lib/browser/merge-editor/merge-editor.d.ts +5 -5
- package/lib/browser/merge-editor/merge-editor.d.ts.map +1 -1
- package/lib/browser/merge-editor/merge-editor.js +77 -92
- package/lib/browser/merge-editor/merge-editor.js.map +1 -1
- package/lib/browser/merge-editor/model/line-range.js +6 -10
- package/lib/browser/merge-editor/model/line-range.js.map +1 -1
- package/lib/browser/merge-editor/model/live-diff.d.ts +1 -1
- package/lib/browser/merge-editor/model/live-diff.d.ts.map +1 -1
- package/lib/browser/merge-editor/model/live-diff.js +14 -18
- package/lib/browser/merge-editor/model/live-diff.js.map +1 -1
- package/lib/browser/merge-editor/model/merge-editor-model.d.ts +4 -4
- package/lib/browser/merge-editor/model/merge-editor-model.d.ts.map +1 -1
- package/lib/browser/merge-editor/model/merge-editor-model.js +88 -98
- package/lib/browser/merge-editor/model/merge-editor-model.js.map +1 -1
- package/lib/browser/merge-editor/model/merge-range.d.ts +3 -3
- package/lib/browser/merge-editor/model/merge-range.d.ts.map +1 -1
- package/lib/browser/merge-editor/model/merge-range.js +26 -30
- package/lib/browser/merge-editor/model/merge-range.js.map +1 -1
- package/lib/browser/merge-editor/model/range-editing.d.ts +1 -1
- package/lib/browser/merge-editor/model/range-editing.d.ts.map +1 -1
- package/lib/browser/merge-editor/model/range-editing.js +8 -13
- package/lib/browser/merge-editor/model/range-editing.js.map +1 -1
- package/lib/browser/merge-editor/model/range-mapping.d.ts +2 -2
- package/lib/browser/merge-editor/model/range-mapping.d.ts.map +1 -1
- package/lib/browser/merge-editor/model/range-mapping.js +28 -37
- package/lib/browser/merge-editor/model/range-mapping.js.map +1 -1
- package/lib/browser/merge-editor/model/range-mapping.spec.js +19 -21
- package/lib/browser/merge-editor/model/range-mapping.spec.js.map +1 -1
- package/lib/browser/merge-editor/model/range-utils.js +9 -12
- package/lib/browser/merge-editor/model/range-utils.js.map +1 -1
- package/lib/browser/merge-editor/view/diff-spacers.d.ts +1 -1
- package/lib/browser/merge-editor/view/diff-spacers.d.ts.map +1 -1
- package/lib/browser/merge-editor/view/diff-spacers.js +7 -10
- package/lib/browser/merge-editor/view/diff-spacers.js.map +1 -1
- package/lib/browser/merge-editor/view/merge-editor-panes/index.d.ts +5 -5
- package/lib/browser/merge-editor/view/merge-editor-panes/index.d.ts.map +1 -1
- package/lib/browser/merge-editor/view/merge-editor-panes/index.js +5 -8
- package/lib/browser/merge-editor/view/merge-editor-panes/index.js.map +1 -1
- package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-base-pane.d.ts +3 -3
- package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-base-pane.d.ts.map +1 -1
- package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-base-pane.js +11 -15
- package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-base-pane.js.map +1 -1
- package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-pane-header.js +18 -25
- package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-pane-header.js.map +1 -1
- package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-pane.d.ts +5 -5
- package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-pane.d.ts.map +1 -1
- package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-pane.js +48 -58
- package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-pane.js.map +1 -1
- package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-result-pane.d.ts +4 -4
- package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-result-pane.d.ts.map +1 -1
- package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-result-pane.js +32 -38
- package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-result-pane.js.map +1 -1
- package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-side-pane.d.ts +4 -4
- package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-side-pane.d.ts.map +1 -1
- package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-side-pane.js +32 -41
- package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-side-pane.js.map +1 -1
- package/lib/browser/merge-editor/view/merge-editor-scroll-sync.d.ts +2 -2
- package/lib/browser/merge-editor/view/merge-editor-scroll-sync.d.ts.map +1 -1
- package/lib/browser/merge-editor/view/merge-editor-scroll-sync.js +3 -7
- package/lib/browser/merge-editor/view/merge-editor-scroll-sync.js.map +1 -1
- package/lib/browser/merge-editor/view/merge-editor-view-zones.d.ts +5 -5
- package/lib/browser/merge-editor/view/merge-editor-view-zones.d.ts.map +1 -1
- package/lib/browser/merge-editor/view/merge-editor-view-zones.js +18 -25
- package/lib/browser/merge-editor/view/merge-editor-view-zones.js.map +1 -1
- package/lib/browser/merge-editor/view/merge-range-actions.d.ts +2 -2
- package/lib/browser/merge-editor/view/merge-range-actions.d.ts.map +1 -1
- package/lib/browser/merge-editor/view/merge-range-actions.js +34 -38
- package/lib/browser/merge-editor/view/merge-range-actions.js.map +1 -1
- package/lib/browser/multi-diff-editor/multi-diff-editor-module.js +13 -16
- package/lib/browser/multi-diff-editor/multi-diff-editor-module.js.map +1 -1
- package/lib/browser/multi-diff-editor/multi-diff-editor-uri.js +7 -10
- package/lib/browser/multi-diff-editor/multi-diff-editor-uri.js.map +1 -1
- package/lib/browser/multi-diff-editor/multi-diff-editor-widget-factory.d.ts +2 -2
- package/lib/browser/multi-diff-editor/multi-diff-editor-widget-factory.d.ts.map +1 -1
- package/lib/browser/multi-diff-editor/multi-diff-editor-widget-factory.js +17 -21
- package/lib/browser/multi-diff-editor/multi-diff-editor-widget-factory.js.map +1 -1
- package/lib/browser/multi-diff-editor/multi-diff-editor-widget.spec.js +226 -229
- package/lib/browser/multi-diff-editor/multi-diff-editor-widget.spec.js.map +1 -1
- package/lib/browser/multi-diff-editor/multi-diff-editor.d.ts +1 -1
- package/lib/browser/multi-diff-editor/multi-diff-editor.d.ts.map +1 -1
- package/lib/browser/multi-diff-editor/multi-diff-editor.js +70 -81
- package/lib/browser/multi-diff-editor/multi-diff-editor.js.map +1 -1
- package/lib/browser/multi-diff-editor/multi-diff-editor.spec.js +66 -68
- package/lib/browser/multi-diff-editor/multi-diff-editor.spec.js.map +1 -1
- package/lib/browser/scm-action-button-widget.d.ts +2 -2
- package/lib/browser/scm-action-button-widget.d.ts.map +1 -1
- package/lib/browser/scm-action-button-widget.js +30 -39
- package/lib/browser/scm-action-button-widget.js.map +1 -1
- package/lib/browser/scm-amend-component.d.ts +3 -3
- package/lib/browser/scm-amend-component.d.ts.map +1 -1
- package/lib/browser/scm-amend-component.js +24 -29
- package/lib/browser/scm-amend-component.js.map +1 -1
- package/lib/browser/scm-amend-widget.d.ts +2 -2
- package/lib/browser/scm-amend-widget.d.ts.map +1 -1
- package/lib/browser/scm-amend-widget.js +26 -36
- package/lib/browser/scm-amend-widget.js.map +1 -1
- package/lib/browser/scm-avatar-service.js +7 -10
- package/lib/browser/scm-avatar-service.js.map +1 -1
- package/lib/browser/scm-colors.js +2 -5
- package/lib/browser/scm-colors.js.map +1 -1
- package/lib/browser/scm-commit-widget.d.ts +2 -2
- package/lib/browser/scm-commit-widget.d.ts.map +1 -1
- package/lib/browser/scm-commit-widget.js +25 -31
- package/lib/browser/scm-commit-widget.js.map +1 -1
- package/lib/browser/scm-context-key-service.js +10 -17
- package/lib/browser/scm-context-key-service.js.map +1 -1
- package/lib/browser/scm-context-key-service.spec.js +33 -35
- package/lib/browser/scm-context-key-service.spec.js.map +1 -1
- package/lib/browser/scm-contribution.d.ts +8 -8
- package/lib/browser/scm-contribution.d.ts.map +1 -1
- package/lib/browser/scm-contribution.js +114 -131
- package/lib/browser/scm-contribution.js.map +1 -1
- package/lib/browser/scm-frontend-module.js +99 -103
- package/lib/browser/scm-frontend-module.js.map +1 -1
- package/lib/browser/scm-groups-tree-model.d.ts +3 -3
- package/lib/browser/scm-groups-tree-model.d.ts.map +1 -1
- package/lib/browser/scm-groups-tree-model.js +15 -22
- package/lib/browser/scm-groups-tree-model.js.map +1 -1
- package/lib/browser/scm-history-graph-contribution.d.ts +4 -4
- package/lib/browser/scm-history-graph-contribution.d.ts.map +1 -1
- package/lib/browser/scm-history-graph-contribution.js +52 -60
- package/lib/browser/scm-history-graph-contribution.js.map +1 -1
- package/lib/browser/scm-history-graph-contribution.spec.js +35 -37
- package/lib/browser/scm-history-graph-contribution.spec.js.map +1 -1
- package/lib/browser/scm-history-graph-helpers.d.ts +1 -1
- package/lib/browser/scm-history-graph-helpers.d.ts.map +1 -1
- package/lib/browser/scm-history-graph-helpers.js +14 -30
- package/lib/browser/scm-history-graph-helpers.js.map +1 -1
- package/lib/browser/scm-history-graph-helpers.spec.js +44 -46
- package/lib/browser/scm-history-graph-helpers.spec.js.map +1 -1
- package/lib/browser/scm-history-graph-lanes.js +1 -4
- package/lib/browser/scm-history-graph-lanes.js.map +1 -1
- package/lib/browser/scm-history-graph-lanes.spec.js +135 -137
- package/lib/browser/scm-history-graph-lanes.spec.js.map +1 -1
- package/lib/browser/scm-history-graph-model.d.ts +4 -4
- package/lib/browser/scm-history-graph-model.d.ts.map +1 -1
- package/lib/browser/scm-history-graph-model.js +34 -43
- package/lib/browser/scm-history-graph-model.js.map +1 -1
- package/lib/browser/scm-history-graph-model.spec.js +74 -76
- package/lib/browser/scm-history-graph-model.spec.js.map +1 -1
- package/lib/browser/scm-history-graph-tooltip.d.ts +2 -2
- package/lib/browser/scm-history-graph-tooltip.d.ts.map +1 -1
- package/lib/browser/scm-history-graph-tooltip.js +33 -42
- package/lib/browser/scm-history-graph-tooltip.js.map +1 -1
- package/lib/browser/scm-history-graph-tooltip.spec.js +63 -65
- package/lib/browser/scm-history-graph-tooltip.spec.js.map +1 -1
- package/lib/browser/scm-history-graph-widget.d.ts +7 -7
- package/lib/browser/scm-history-graph-widget.d.ts.map +1 -1
- package/lib/browser/scm-history-graph-widget.js +116 -134
- package/lib/browser/scm-history-graph-widget.js.map +1 -1
- package/lib/browser/scm-history-graph-widget.spec.js +40 -43
- package/lib/browser/scm-history-graph-widget.spec.js.map +1 -1
- package/lib/browser/scm-input.js +11 -16
- package/lib/browser/scm-input.js.map +1 -1
- package/lib/browser/scm-layout-migrations.js +15 -18
- package/lib/browser/scm-layout-migrations.js.map +1 -1
- package/lib/browser/scm-provider.js +1 -4
- package/lib/browser/scm-provider.js.map +1 -1
- package/lib/browser/scm-quick-open-service.d.ts +1 -1
- package/lib/browser/scm-quick-open-service.d.ts.map +1 -1
- package/lib/browser/scm-quick-open-service.js +20 -27
- package/lib/browser/scm-quick-open-service.js.map +1 -1
- package/lib/browser/scm-repositories-widget.d.ts +4 -4
- package/lib/browser/scm-repositories-widget.d.ts.map +1 -1
- package/lib/browser/scm-repositories-widget.js +55 -67
- package/lib/browser/scm-repositories-widget.js.map +1 -1
- package/lib/browser/scm-repositories-widget.spec.js +86 -89
- package/lib/browser/scm-repositories-widget.spec.js.map +1 -1
- package/lib/browser/scm-repository.d.ts +2 -2
- package/lib/browser/scm-repository.d.ts.map +1 -1
- package/lib/browser/scm-repository.js +6 -10
- package/lib/browser/scm-repository.js.map +1 -1
- package/lib/browser/scm-service.d.ts +3 -3
- package/lib/browser/scm-service.d.ts.map +1 -1
- package/lib/browser/scm-service.js +18 -22
- package/lib/browser/scm-service.js.map +1 -1
- package/lib/browser/scm-service.spec.js +15 -17
- package/lib/browser/scm-service.spec.js.map +1 -1
- package/lib/browser/scm-tree-label-provider.d.ts +1 -1
- package/lib/browser/scm-tree-label-provider.d.ts.map +1 -1
- package/lib/browser/scm-tree-label-provider.js +16 -20
- package/lib/browser/scm-tree-label-provider.js.map +1 -1
- package/lib/browser/scm-tree-model.d.ts +2 -2
- package/lib/browser/scm-tree-model.d.ts.map +1 -1
- package/lib/browser/scm-tree-model.js +27 -32
- package/lib/browser/scm-tree-model.js.map +1 -1
- package/lib/browser/scm-tree-widget.d.ts +4 -4
- package/lib/browser/scm-tree-widget.d.ts.map +1 -1
- package/lib/browser/scm-tree-widget.js +98 -122
- package/lib/browser/scm-tree-widget.js.map +1 -1
- package/lib/browser/scm-widget.d.ts +6 -6
- package/lib/browser/scm-widget.d.ts.map +1 -1
- package/lib/browser/scm-widget.js +49 -64
- package/lib/browser/scm-widget.js.map +1 -1
- package/lib/common/scm-preferences.js +21 -26
- package/lib/common/scm-preferences.js.map +1 -1
- package/lib/node/scm-backend-module.js +4 -6
- package/lib/node/scm-backend-module.js.map +1 -1
- package/package.json +16 -7
- package/src/browser/decorations/scm-decorations-service.ts +5 -5
- package/src/browser/dirty-diff/content-lines.spec.ts +3 -2
- package/src/browser/dirty-diff/diff-computer.spec.ts +4 -3
- package/src/browser/dirty-diff/diff-computer.ts +1 -1
- package/src/browser/dirty-diff/dirty-diff-decorator.ts +1 -1
- package/src/browser/dirty-diff/dirty-diff-module.ts +3 -3
- package/src/browser/dirty-diff/dirty-diff-navigator.ts +3 -3
- package/src/browser/dirty-diff/dirty-diff-widget.ts +2 -2
- package/src/browser/merge-editor/merge-editor-contribution.ts +2 -2
- package/src/browser/merge-editor/merge-editor-dev-contribution.ts +1 -1
- package/src/browser/merge-editor/merge-editor-module.ts +7 -7
- package/src/browser/merge-editor/merge-editor.ts +5 -5
- package/src/browser/merge-editor/model/live-diff.ts +2 -2
- package/src/browser/merge-editor/model/merge-editor-model.ts +8 -8
- package/src/browser/merge-editor/model/merge-range.ts +4 -4
- package/src/browser/merge-editor/model/range-editing.ts +1 -1
- package/src/browser/merge-editor/model/range-mapping.spec.ts +1 -1
- package/src/browser/merge-editor/model/range-mapping.ts +3 -3
- package/src/browser/merge-editor/view/diff-spacers.ts +1 -1
- package/src/browser/merge-editor/view/merge-editor-panes/index.ts +5 -5
- package/src/browser/merge-editor/view/merge-editor-panes/merge-editor-base-pane.ts +3 -3
- package/src/browser/merge-editor/view/merge-editor-panes/merge-editor-pane.ts +7 -7
- package/src/browser/merge-editor/view/merge-editor-panes/merge-editor-result-pane.ts +4 -4
- package/src/browser/merge-editor/view/merge-editor-panes/merge-editor-side-pane.ts +4 -4
- package/src/browser/merge-editor/view/merge-editor-scroll-sync.ts +2 -2
- package/src/browser/merge-editor/view/merge-editor-view-zones.ts +5 -5
- package/src/browser/merge-editor/view/merge-range-actions.ts +2 -2
- package/src/browser/multi-diff-editor/multi-diff-editor-module.ts +2 -2
- package/src/browser/multi-diff-editor/multi-diff-editor-widget-factory.ts +2 -2
- package/src/browser/multi-diff-editor/multi-diff-editor-widget.spec.ts +3 -3
- package/src/browser/multi-diff-editor/multi-diff-editor.spec.ts +1 -1
- package/src/browser/multi-diff-editor/multi-diff-editor.ts +1 -1
- package/src/browser/scm-action-button-widget.tsx +3 -3
- package/src/browser/scm-amend-component.tsx +3 -3
- package/src/browser/scm-amend-widget.tsx +3 -3
- package/src/browser/scm-commit-widget.tsx +2 -2
- package/src/browser/scm-context-key-service.spec.ts +3 -3
- package/src/browser/scm-contribution.ts +8 -8
- package/src/browser/scm-frontend-module.ts +23 -23
- package/src/browser/scm-groups-tree-model.ts +3 -3
- package/src/browser/scm-history-graph-contribution.spec.ts +3 -3
- package/src/browser/scm-history-graph-contribution.ts +6 -6
- package/src/browser/scm-history-graph-helpers.spec.ts +2 -2
- package/src/browser/scm-history-graph-helpers.ts +1 -1
- package/src/browser/scm-history-graph-lanes.spec.ts +1 -1
- package/src/browser/scm-history-graph-model.spec.ts +3 -3
- package/src/browser/scm-history-graph-model.ts +5 -5
- package/src/browser/scm-history-graph-tooltip.spec.ts +3 -3
- package/src/browser/scm-history-graph-tooltip.ts +3 -3
- package/src/browser/scm-history-graph-widget.spec.ts +4 -4
- package/src/browser/scm-history-graph-widget.tsx +8 -8
- package/src/browser/scm-layout-migrations.ts +1 -1
- package/src/browser/scm-quick-open-service.ts +1 -1
- package/src/browser/scm-repositories-widget.spec.ts +2 -2
- package/src/browser/scm-repositories-widget.tsx +4 -4
- package/src/browser/scm-repository.ts +2 -2
- package/src/browser/scm-service.spec.ts +2 -2
- package/src/browser/scm-service.ts +3 -3
- package/src/browser/scm-tree-label-provider.ts +1 -1
- package/src/browser/scm-tree-model.ts +2 -2
- package/src/browser/scm-tree-widget.tsx +4 -4
- package/src/browser/scm-widget.tsx +6 -6
- package/src/node/scm-backend-module.ts +1 -1
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
// *****************************************************************************
|
|
3
2
|
// Copyright (C) 2026 EclipseSource and others.
|
|
4
3
|
//
|
|
@@ -14,26 +13,24 @@
|
|
|
14
13
|
//
|
|
15
14
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
16
15
|
// *****************************************************************************
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
const multi_diff_editor_1 = require("./multi-diff-editor");
|
|
32
|
-
const multi_diff_editor_uri_1 = require("./multi-diff-editor-uri");
|
|
16
|
+
import { enableJSDOM } from '@theia/core/lib/browser/test/jsdom';
|
|
17
|
+
let disableJSDOM = enableJSDOM();
|
|
18
|
+
import { FrontendApplicationConfigProvider } from '@theia/core/lib/browser/frontend-application-config-provider';
|
|
19
|
+
FrontendApplicationConfigProvider.set({});
|
|
20
|
+
import { expect } from 'chai';
|
|
21
|
+
import * as sinon from 'sinon';
|
|
22
|
+
import { MonacoEditor } from '@theia/monaco/lib/browser/monaco-editor';
|
|
23
|
+
import { MonacoDiffEditor } from '@theia/monaco/lib/browser/monaco-diff-editor';
|
|
24
|
+
import { MultiDiffEditorWidgetFactory } from './multi-diff-editor-widget-factory.js';
|
|
25
|
+
import { Emitter, URI } from '@theia/core';
|
|
26
|
+
import { MessageLoop, Widget } from '@theia/core/lib/browser';
|
|
27
|
+
import { Container } from '@theia/core/shared/inversify';
|
|
28
|
+
import { DiffEntryErrorWidget, DiffEntryHeaderWidget, DiffEntryLoadingWidget, DiffEntryWidget, HEADER_HEIGHT, MIN_ENTRY_HEIGHT, MultiDiffEditor, MultiDiffEditorData, MultiDiffEditorLabelProvider, MultiDiffEditorOpenHandler } from './multi-diff-editor.js';
|
|
29
|
+
import { MultiDiffEditorUri } from './multi-diff-editor-uri.js';
|
|
33
30
|
disableJSDOM();
|
|
34
31
|
describe('Multi-Diff Editor — widgets', () => {
|
|
35
32
|
before(() => {
|
|
36
|
-
disableJSDOM =
|
|
33
|
+
disableJSDOM = enableJSDOM();
|
|
37
34
|
});
|
|
38
35
|
after(() => {
|
|
39
36
|
disableJSDOM();
|
|
@@ -45,53 +42,53 @@ describe('Multi-Diff Editor — widgets', () => {
|
|
|
45
42
|
getLongName: (uri) => uri.path.toString()
|
|
46
43
|
};
|
|
47
44
|
const sampleResource = {
|
|
48
|
-
originalUri: new
|
|
49
|
-
modifiedUri: new
|
|
45
|
+
originalUri: new URI('file:///workspace/a.ts'),
|
|
46
|
+
modifiedUri: new URI('file:///workspace/b.ts')
|
|
50
47
|
};
|
|
51
48
|
describe('DiffEntryHeaderWidget', () => {
|
|
52
49
|
it('should render icon, name and description', () => {
|
|
53
|
-
const widget = new
|
|
50
|
+
const widget = new DiffEntryHeaderWidget(sampleResource, mockLabelProvider);
|
|
54
51
|
try {
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
52
|
+
expect(widget.node.querySelector('.multi-diff-entry-icon')).to.exist;
|
|
53
|
+
expect(widget.node.querySelector('.multi-diff-entry-label')?.textContent).to.equal('b.ts');
|
|
54
|
+
expect(widget.node.querySelector('.multi-diff-entry-description')?.textContent).to.equal('/workspace/b.ts');
|
|
58
55
|
}
|
|
59
56
|
finally {
|
|
60
57
|
widget.dispose();
|
|
61
58
|
}
|
|
62
59
|
});
|
|
63
60
|
it('should expose aria-expanded=true by default', () => {
|
|
64
|
-
const widget = new
|
|
61
|
+
const widget = new DiffEntryHeaderWidget(sampleResource, mockLabelProvider);
|
|
65
62
|
try {
|
|
66
|
-
|
|
67
|
-
|
|
63
|
+
expect(widget.node.getAttribute('aria-expanded')).to.equal('true');
|
|
64
|
+
expect(widget.node.querySelector('.codicon-chevron-down')).to.exist;
|
|
68
65
|
}
|
|
69
66
|
finally {
|
|
70
67
|
widget.dispose();
|
|
71
68
|
}
|
|
72
69
|
});
|
|
73
70
|
it('should toggle chevron and aria-expanded on setCollapsed', () => {
|
|
74
|
-
const widget = new
|
|
71
|
+
const widget = new DiffEntryHeaderWidget(sampleResource, mockLabelProvider);
|
|
75
72
|
try {
|
|
76
73
|
widget.setCollapsed(true);
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
74
|
+
expect(widget.node.getAttribute('aria-expanded')).to.equal('false');
|
|
75
|
+
expect(widget.node.querySelector('.codicon-chevron-right')).to.exist;
|
|
76
|
+
expect(widget.node.querySelector('.codicon-chevron-down')).to.be.null;
|
|
80
77
|
widget.setCollapsed(false);
|
|
81
|
-
|
|
82
|
-
|
|
78
|
+
expect(widget.node.getAttribute('aria-expanded')).to.equal('true');
|
|
79
|
+
expect(widget.node.querySelector('.codicon-chevron-down')).to.exist;
|
|
83
80
|
}
|
|
84
81
|
finally {
|
|
85
82
|
widget.dispose();
|
|
86
83
|
}
|
|
87
84
|
});
|
|
88
85
|
it('should fire onDidToggleCollapse when clicked', () => {
|
|
89
|
-
const widget = new
|
|
86
|
+
const widget = new DiffEntryHeaderWidget(sampleResource, mockLabelProvider);
|
|
90
87
|
try {
|
|
91
88
|
let fired = 0;
|
|
92
89
|
widget.onDidToggleCollapse(() => fired++);
|
|
93
90
|
widget.node.click();
|
|
94
|
-
|
|
91
|
+
expect(fired).to.equal(1);
|
|
95
92
|
}
|
|
96
93
|
finally {
|
|
97
94
|
widget.dispose();
|
|
@@ -100,17 +97,17 @@ describe('Multi-Diff Editor — widgets', () => {
|
|
|
100
97
|
});
|
|
101
98
|
describe('DiffEntryWidget', () => {
|
|
102
99
|
function createEntry() {
|
|
103
|
-
const header = new
|
|
104
|
-
const entry = new
|
|
100
|
+
const header = new DiffEntryHeaderWidget(sampleResource, mockLabelProvider);
|
|
101
|
+
const entry = new DiffEntryWidget(sampleResource, header);
|
|
105
102
|
return { entry, header };
|
|
106
103
|
}
|
|
107
104
|
it('should start in loading state with MIN_ENTRY_HEIGHT', () => {
|
|
108
105
|
const { entry } = createEntry();
|
|
109
106
|
try {
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
107
|
+
expect(entry.editorWidget).to.be.undefined;
|
|
108
|
+
expect(entry.isCollapsed).to.be.false;
|
|
109
|
+
expect(entry.node.style.height).to.equal(`${MIN_ENTRY_HEIGHT}px`);
|
|
110
|
+
expect(entry.node.querySelector('.multi-diff-entry-loading')).to.exist;
|
|
114
111
|
}
|
|
115
112
|
finally {
|
|
116
113
|
entry.dispose();
|
|
@@ -120,9 +117,9 @@ describe('Multi-Diff Editor — widgets', () => {
|
|
|
120
117
|
const { entry } = createEntry();
|
|
121
118
|
try {
|
|
122
119
|
entry.setError('boom');
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
120
|
+
expect(entry.node.querySelector('.multi-diff-entry-loading')).to.be.null;
|
|
121
|
+
expect(entry.node.querySelector('.multi-diff-entry-error')?.textContent).to.contain('boom');
|
|
122
|
+
expect(entry.editorWidget).to.be.undefined;
|
|
126
123
|
}
|
|
127
124
|
finally {
|
|
128
125
|
entry.dispose();
|
|
@@ -132,11 +129,11 @@ describe('Multi-Diff Editor — widgets', () => {
|
|
|
132
129
|
const { entry } = createEntry();
|
|
133
130
|
try {
|
|
134
131
|
entry.setHeight(50);
|
|
135
|
-
|
|
132
|
+
expect(entry.node.style.height).to.equal('50px');
|
|
136
133
|
entry.setHeight(10_000);
|
|
137
|
-
|
|
138
|
-
entry.setHeight(
|
|
139
|
-
|
|
134
|
+
expect(entry.node.style.height).to.equal('5000px');
|
|
135
|
+
entry.setHeight(MIN_ENTRY_HEIGHT + 42);
|
|
136
|
+
expect(entry.node.style.height).to.equal(`${MIN_ENTRY_HEIGHT + 42}px`);
|
|
140
137
|
}
|
|
141
138
|
finally {
|
|
142
139
|
entry.dispose();
|
|
@@ -145,14 +142,14 @@ describe('Multi-Diff Editor — widgets', () => {
|
|
|
145
142
|
it('should shrink to HEADER_HEIGHT when collapsed and restore height when expanded', () => {
|
|
146
143
|
const { entry } = createEntry();
|
|
147
144
|
try {
|
|
148
|
-
entry.setHeight(
|
|
149
|
-
|
|
145
|
+
entry.setHeight(MIN_ENTRY_HEIGHT + 100);
|
|
146
|
+
expect(entry.node.style.height).to.equal(`${MIN_ENTRY_HEIGHT + 100}px`);
|
|
150
147
|
entry.setCollapsed(true);
|
|
151
|
-
|
|
152
|
-
|
|
148
|
+
expect(entry.isCollapsed).to.be.true;
|
|
149
|
+
expect(entry.node.style.height).to.equal(`${HEADER_HEIGHT}px`);
|
|
153
150
|
entry.setCollapsed(false);
|
|
154
|
-
|
|
155
|
-
|
|
151
|
+
expect(entry.isCollapsed).to.be.false;
|
|
152
|
+
expect(entry.node.style.height).to.equal(`${MIN_ENTRY_HEIGHT + 100}px`);
|
|
156
153
|
}
|
|
157
154
|
finally {
|
|
158
155
|
entry.dispose();
|
|
@@ -163,10 +160,10 @@ describe('Multi-Diff Editor — widgets', () => {
|
|
|
163
160
|
try {
|
|
164
161
|
entry.setCollapsed(true);
|
|
165
162
|
// setHeight while collapsed updates the remembered expanded height only.
|
|
166
|
-
entry.setHeight(
|
|
167
|
-
|
|
163
|
+
entry.setHeight(MIN_ENTRY_HEIGHT + 50);
|
|
164
|
+
expect(entry.node.style.height).to.equal(`${HEADER_HEIGHT}px`);
|
|
168
165
|
entry.setCollapsed(false);
|
|
169
|
-
|
|
166
|
+
expect(entry.node.style.height).to.equal(`${MIN_ENTRY_HEIGHT + 50}px`);
|
|
170
167
|
}
|
|
171
168
|
finally {
|
|
172
169
|
entry.dispose();
|
|
@@ -176,11 +173,11 @@ describe('Multi-Diff Editor — widgets', () => {
|
|
|
176
173
|
const { entry } = createEntry();
|
|
177
174
|
try {
|
|
178
175
|
entry.setCollapsed(true);
|
|
179
|
-
|
|
176
|
+
expect(entry['currentContent'].isHidden).to.be.true;
|
|
180
177
|
entry.setError('boom');
|
|
181
|
-
|
|
178
|
+
expect(entry['currentContent'].isHidden).to.be.true;
|
|
182
179
|
entry.setCollapsed(false);
|
|
183
|
-
|
|
180
|
+
expect(entry['currentContent'].isHidden).to.be.false;
|
|
184
181
|
}
|
|
185
182
|
finally {
|
|
186
183
|
entry.dispose();
|
|
@@ -191,12 +188,12 @@ describe('Multi-Diff Editor — widgets', () => {
|
|
|
191
188
|
try {
|
|
192
189
|
entry.setAvailableHeight(800);
|
|
193
190
|
entry.setHeight(200);
|
|
194
|
-
|
|
191
|
+
expect(entry.node.style.height).to.equal('800px');
|
|
195
192
|
entry.setCollapsed(true);
|
|
196
193
|
entry.setAvailableHeight(600);
|
|
197
|
-
|
|
194
|
+
expect(entry.node.style.height).to.equal(`${HEADER_HEIGHT}px`);
|
|
198
195
|
entry.setCollapsed(false);
|
|
199
|
-
|
|
196
|
+
expect(entry.node.style.height).to.equal('600px');
|
|
200
197
|
}
|
|
201
198
|
finally {
|
|
202
199
|
entry.dispose();
|
|
@@ -208,11 +205,11 @@ describe('Multi-Diff Editor — widgets', () => {
|
|
|
208
205
|
let fired = 0;
|
|
209
206
|
entry.onDidChangeCollapsed(() => fired++);
|
|
210
207
|
entry.setCollapsed(false);
|
|
211
|
-
|
|
208
|
+
expect(fired).to.equal(0);
|
|
212
209
|
entry.setCollapsed(true);
|
|
213
|
-
|
|
210
|
+
expect(fired).to.equal(1);
|
|
214
211
|
entry.setCollapsed(true);
|
|
215
|
-
|
|
212
|
+
expect(fired).to.equal(1);
|
|
216
213
|
}
|
|
217
214
|
finally {
|
|
218
215
|
entry.dispose();
|
|
@@ -221,11 +218,11 @@ describe('Multi-Diff Editor — widgets', () => {
|
|
|
221
218
|
it('should toggle collapsed when the header fires onDidToggleCollapse', () => {
|
|
222
219
|
const { entry, header } = createEntry();
|
|
223
220
|
try {
|
|
224
|
-
|
|
221
|
+
expect(entry.isCollapsed).to.be.false;
|
|
225
222
|
header.node.click();
|
|
226
|
-
|
|
223
|
+
expect(entry.isCollapsed).to.be.true;
|
|
227
224
|
header.node.click();
|
|
228
|
-
|
|
225
|
+
expect(entry.isCollapsed).to.be.false;
|
|
229
226
|
}
|
|
230
227
|
finally {
|
|
231
228
|
entry.dispose();
|
|
@@ -234,28 +231,28 @@ describe('Multi-Diff Editor — widgets', () => {
|
|
|
234
231
|
});
|
|
235
232
|
describe('entry loading', () => {
|
|
236
233
|
function createEntry(load) {
|
|
237
|
-
return new
|
|
234
|
+
return new DiffEntryWidget(sampleResource, new DiffEntryHeaderWidget(sampleResource, mockLabelProvider), load);
|
|
238
235
|
}
|
|
239
236
|
it('should skip collapsed entries, load on expansion, and suppress concurrent or repeated loads', async () => {
|
|
240
237
|
let resolve;
|
|
241
238
|
const load = sinon.stub().returns(new Promise(r => resolve = r));
|
|
242
239
|
const entry = createEntry(load);
|
|
243
|
-
const widget = new
|
|
240
|
+
const widget = new Widget();
|
|
244
241
|
try {
|
|
245
242
|
entry.setCollapsed(true);
|
|
246
243
|
await entry.loadEditor();
|
|
247
|
-
|
|
244
|
+
expect(load.callCount).to.equal(0);
|
|
248
245
|
entry.setCollapsed(false);
|
|
249
246
|
await entry.loadEditor();
|
|
250
|
-
|
|
247
|
+
expect(load.callCount).to.equal(1);
|
|
251
248
|
entry.setCollapsed(true);
|
|
252
249
|
resolve(widget);
|
|
253
250
|
await Promise.resolve();
|
|
254
|
-
|
|
255
|
-
|
|
251
|
+
expect(entry.editorWidget).to.equal(widget);
|
|
252
|
+
expect(widget.isHidden).to.be.true;
|
|
256
253
|
entry.setCollapsed(false);
|
|
257
254
|
await entry.loadEditor();
|
|
258
|
-
|
|
255
|
+
expect(load.callCount).to.equal(1);
|
|
259
256
|
}
|
|
260
257
|
finally {
|
|
261
258
|
entry.dispose();
|
|
@@ -267,22 +264,22 @@ describe('Multi-Diff Editor — widgets', () => {
|
|
|
267
264
|
load.onFirstCall().rejects(new Error('provider unavailable'));
|
|
268
265
|
load.onSecondCall().returns(new Promise(r => resolve = r));
|
|
269
266
|
const entry = createEntry(load);
|
|
270
|
-
const widget = new
|
|
267
|
+
const widget = new Widget();
|
|
271
268
|
try {
|
|
272
269
|
await entry.loadEditor();
|
|
273
270
|
const button = entry.node.querySelector('button');
|
|
274
|
-
|
|
275
|
-
|
|
271
|
+
expect(button.textContent).to.equal('Retry');
|
|
272
|
+
expect(button.type).to.equal('button');
|
|
276
273
|
await entry.loadEditor();
|
|
277
|
-
|
|
274
|
+
expect(load.callCount).to.equal(1);
|
|
278
275
|
button.click();
|
|
279
|
-
|
|
276
|
+
expect(entry.node.querySelector('.multi-diff-entry-loading')).to.exist;
|
|
280
277
|
button.click();
|
|
281
278
|
await entry.loadEditor(true);
|
|
282
|
-
|
|
279
|
+
expect(load.callCount).to.equal(2);
|
|
283
280
|
resolve(widget);
|
|
284
281
|
await Promise.resolve();
|
|
285
|
-
|
|
282
|
+
expect(entry.editorWidget).to.equal(widget);
|
|
286
283
|
}
|
|
287
284
|
finally {
|
|
288
285
|
entry.dispose();
|
|
@@ -295,11 +292,11 @@ describe('Multi-Diff Editor — widgets', () => {
|
|
|
295
292
|
entry.onDidLoadEditor(loaded);
|
|
296
293
|
const pending = entry.loadEditor();
|
|
297
294
|
entry.dispose();
|
|
298
|
-
const widget = new
|
|
295
|
+
const widget = new Widget();
|
|
299
296
|
resolve(widget);
|
|
300
297
|
await pending;
|
|
301
|
-
|
|
302
|
-
|
|
298
|
+
expect(widget.isDisposed).to.be.true;
|
|
299
|
+
expect(loaded.called).to.be.false;
|
|
303
300
|
});
|
|
304
301
|
it('should ignore rejected loads after disposal', async () => {
|
|
305
302
|
let reject;
|
|
@@ -309,14 +306,14 @@ describe('Multi-Diff Editor — widgets', () => {
|
|
|
309
306
|
entry.dispose();
|
|
310
307
|
reject(new Error('late failure'));
|
|
311
308
|
await pending;
|
|
312
|
-
|
|
309
|
+
expect(setError.called).to.be.false;
|
|
313
310
|
});
|
|
314
311
|
it('should track both diff content heights as unchanged regions are hidden or expanded and dispose listeners', () => {
|
|
315
|
-
const originalChanged = new
|
|
316
|
-
const modifiedChanged = new
|
|
312
|
+
const originalChanged = new Emitter();
|
|
313
|
+
const modifiedChanged = new Emitter();
|
|
317
314
|
let originalHeight = 300;
|
|
318
315
|
let modifiedHeight = 400;
|
|
319
|
-
const monacoEditor = Object.create(
|
|
316
|
+
const monacoEditor = Object.create(MonacoDiffEditor.prototype);
|
|
320
317
|
Object.defineProperty(monacoEditor, 'diffEditor', {
|
|
321
318
|
value: {
|
|
322
319
|
updateOptions: sinon.spy(),
|
|
@@ -324,27 +321,27 @@ describe('Multi-Diff Editor — widgets', () => {
|
|
|
324
321
|
getModifiedEditor: () => ({ getContentHeight: () => modifiedHeight, onDidContentSizeChange: modifiedChanged.event })
|
|
325
322
|
}
|
|
326
323
|
});
|
|
327
|
-
const widget = new
|
|
324
|
+
const widget = new Widget();
|
|
328
325
|
Object.defineProperty(widget, 'editor', { value: monacoEditor });
|
|
329
326
|
const entry = createEntry(async () => widget);
|
|
330
327
|
try {
|
|
331
328
|
entry.setEditor(widget);
|
|
332
|
-
|
|
329
|
+
expect(entry.node.style.height).to.equal(`${400 + HEADER_HEIGHT}px`);
|
|
333
330
|
originalHeight = 140;
|
|
334
331
|
modifiedHeight = 150;
|
|
335
332
|
modifiedChanged.fire();
|
|
336
|
-
|
|
333
|
+
expect(entry.node.style.height).to.equal(`${150 + HEADER_HEIGHT}px`);
|
|
337
334
|
entry.setCollapsed(true);
|
|
338
335
|
originalHeight = 350;
|
|
339
336
|
originalChanged.fire();
|
|
340
|
-
|
|
337
|
+
expect(entry.node.style.height).to.equal(`${HEADER_HEIGHT}px`);
|
|
341
338
|
entry.setCollapsed(false);
|
|
342
|
-
|
|
339
|
+
expect(entry.node.style.height).to.equal(`${350 + HEADER_HEIGHT}px`);
|
|
343
340
|
entry.dispose();
|
|
344
341
|
const setHeight = sinon.spy(entry, 'setHeight');
|
|
345
342
|
originalChanged.fire();
|
|
346
343
|
modifiedChanged.fire();
|
|
347
|
-
|
|
344
|
+
expect(setHeight.called).to.be.false;
|
|
348
345
|
}
|
|
349
346
|
finally {
|
|
350
347
|
entry.dispose();
|
|
@@ -356,7 +353,7 @@ describe('Multi-Diff Editor — widgets', () => {
|
|
|
356
353
|
describe('content-fit sizing and inner scrolling', () => {
|
|
357
354
|
for (const isDiff of [false, true]) {
|
|
358
355
|
it(`should release vertical wheel events at ${isDiff ? 'diff' : 'code'} boundaries without preventing outer scrolling`, () => {
|
|
359
|
-
const changed = new
|
|
356
|
+
const changed = new Emitter();
|
|
360
357
|
let scrollTop = 0;
|
|
361
358
|
let contentHeight = 6000;
|
|
362
359
|
const control = {
|
|
@@ -367,7 +364,7 @@ describe('Multi-Diff Editor — widgets', () => {
|
|
|
367
364
|
getScrollHeight: () => 6000,
|
|
368
365
|
getLayoutInfo: () => ({ height: 1000 })
|
|
369
366
|
};
|
|
370
|
-
const monacoEditor = Object.create(isDiff ?
|
|
367
|
+
const monacoEditor = Object.create(isDiff ? MonacoDiffEditor.prototype : MonacoEditor.prototype);
|
|
371
368
|
if (isDiff) {
|
|
372
369
|
Object.defineProperty(monacoEditor, 'diffEditor', {
|
|
373
370
|
value: { getOriginalEditor: () => control, getModifiedEditor: () => control, updateOptions: control.updateOptions }
|
|
@@ -376,9 +373,9 @@ describe('Multi-Diff Editor — widgets', () => {
|
|
|
376
373
|
else {
|
|
377
374
|
monacoEditor.getControl = () => control;
|
|
378
375
|
}
|
|
379
|
-
const widget = new
|
|
376
|
+
const widget = new Widget();
|
|
380
377
|
Object.defineProperty(widget, 'editor', { value: monacoEditor });
|
|
381
|
-
const entry = new
|
|
378
|
+
const entry = new DiffEntryWidget(sampleResource, new DiffEntryHeaderWidget(sampleResource, mockLabelProvider));
|
|
382
379
|
const targets = Array.from({ length: isDiff ? 2 : 1 }, () => {
|
|
383
380
|
const node = document.createElement('div');
|
|
384
381
|
widget.node.appendChild(node);
|
|
@@ -394,23 +391,23 @@ describe('Multi-Diff Editor — widgets', () => {
|
|
|
394
391
|
entry.setEditor(widget);
|
|
395
392
|
for (const target of targets) {
|
|
396
393
|
scrollTop = 0;
|
|
397
|
-
|
|
398
|
-
|
|
394
|
+
expect(wheel(target, -100)).to.be.false;
|
|
395
|
+
expect(wheel(target, 100)).to.be.true;
|
|
399
396
|
scrollTop = 2500;
|
|
400
|
-
|
|
401
|
-
|
|
397
|
+
expect(wheel(target, -100)).to.be.true;
|
|
398
|
+
expect(wheel(target, 100)).to.be.true;
|
|
402
399
|
scrollTop = 5000;
|
|
403
|
-
|
|
404
|
-
|
|
405
|
-
|
|
406
|
-
|
|
407
|
-
|
|
400
|
+
expect(wheel(target, 100)).to.be.false;
|
|
401
|
+
expect(wheel(target, -100)).to.be.true;
|
|
402
|
+
expect(wheel(target, 100, { deltaX: 200 })).to.be.true;
|
|
403
|
+
expect(wheel(target, 100, { ctrlKey: true })).to.be.true;
|
|
404
|
+
expect(wheel(target, 100, { shiftKey: true })).to.be.true;
|
|
408
405
|
}
|
|
409
406
|
contentHeight = 20;
|
|
410
407
|
changed.fire();
|
|
411
|
-
|
|
408
|
+
expect(wheel(targets[0], 100)).to.be.true;
|
|
412
409
|
entry.dispose();
|
|
413
|
-
|
|
410
|
+
expect(wheel(targets[0], 100)).to.be.true;
|
|
414
411
|
}
|
|
415
412
|
finally {
|
|
416
413
|
entry.dispose();
|
|
@@ -418,8 +415,8 @@ describe('Multi-Diff Editor — widgets', () => {
|
|
|
418
415
|
}
|
|
419
416
|
});
|
|
420
417
|
it(`should size ${isDiff ? 'diff' : 'code'} content including borders and toggle scrolling on content changes and resizes`, () => {
|
|
421
|
-
const changed = new
|
|
422
|
-
const originalChanged = new
|
|
418
|
+
const changed = new Emitter();
|
|
419
|
+
const originalChanged = new Emitter();
|
|
423
420
|
let contentHeight = 20;
|
|
424
421
|
let originalHeight = 10;
|
|
425
422
|
const updateOptions = sinon.spy((_options) => changed.fire());
|
|
@@ -428,7 +425,7 @@ describe('Multi-Diff Editor — widgets', () => {
|
|
|
428
425
|
onDidContentSizeChange: changed.event,
|
|
429
426
|
updateOptions
|
|
430
427
|
};
|
|
431
|
-
const monacoEditor = Object.create(isDiff ?
|
|
428
|
+
const monacoEditor = Object.create(isDiff ? MonacoDiffEditor.prototype : MonacoEditor.prototype);
|
|
432
429
|
if (isDiff) {
|
|
433
430
|
Object.defineProperty(monacoEditor, 'diffEditor', {
|
|
434
431
|
value: {
|
|
@@ -441,75 +438,75 @@ describe('Multi-Diff Editor — widgets', () => {
|
|
|
441
438
|
else {
|
|
442
439
|
monacoEditor.getControl = () => control;
|
|
443
440
|
}
|
|
444
|
-
const widget = new
|
|
441
|
+
const widget = new Widget();
|
|
445
442
|
Object.defineProperty(widget, 'editor', { value: monacoEditor });
|
|
446
|
-
const entry = new
|
|
443
|
+
const entry = new DiffEntryWidget(sampleResource, new DiffEntryHeaderWidget(sampleResource, mockLabelProvider));
|
|
447
444
|
entry.node.style.border = '1px solid black';
|
|
448
|
-
|
|
449
|
-
const chrome =
|
|
450
|
-
const expectScrolling = (enabled) =>
|
|
445
|
+
Widget.attach(entry, document.body);
|
|
446
|
+
const chrome = HEADER_HEIGHT + 2;
|
|
447
|
+
const expectScrolling = (enabled) => expect(updateOptions.lastCall.args[0]).to.deep.equal({
|
|
451
448
|
scrollbar: { vertical: enabled ? 'auto' : 'hidden', handleMouseWheel: enabled, alwaysConsumeMouseWheel: false }
|
|
452
449
|
});
|
|
453
450
|
try {
|
|
454
451
|
entry.setAvailableHeight(250, false);
|
|
455
452
|
entry.setEditor(widget);
|
|
456
|
-
|
|
453
|
+
expect(entry.node.style.height).to.equal(`${20 + chrome}px`);
|
|
457
454
|
expectScrolling(false);
|
|
458
|
-
|
|
455
|
+
expect(updateOptions.callCount).to.equal(1);
|
|
459
456
|
changed.fire();
|
|
460
|
-
|
|
457
|
+
expect(updateOptions.callCount).to.equal(1);
|
|
461
458
|
contentHeight = 6000;
|
|
462
459
|
changed.fire();
|
|
463
|
-
|
|
460
|
+
expect(entry.node.style.height).to.equal('5000px');
|
|
464
461
|
expectScrolling(true);
|
|
465
|
-
|
|
462
|
+
expect(updateOptions.callCount).to.equal(2);
|
|
466
463
|
entry.setAvailableHeight(600, false);
|
|
467
|
-
|
|
464
|
+
expect(entry.node.style.height).to.equal('5000px');
|
|
468
465
|
expectScrolling(true);
|
|
469
|
-
|
|
466
|
+
expect(updateOptions.callCount).to.equal(2);
|
|
470
467
|
contentHeight = 400;
|
|
471
468
|
changed.fire();
|
|
472
|
-
|
|
469
|
+
expect(entry.node.style.height).to.equal(`${400 + chrome}px`);
|
|
473
470
|
expectScrolling(false);
|
|
474
471
|
entry.setAvailableHeight(200, false);
|
|
475
|
-
|
|
472
|
+
expect(entry.node.style.height).to.equal(`${400 + chrome}px`);
|
|
476
473
|
expectScrolling(false);
|
|
477
474
|
contentHeight = 5000 - chrome;
|
|
478
475
|
changed.fire();
|
|
479
|
-
|
|
476
|
+
expect(entry.node.style.height).to.equal('5000px');
|
|
480
477
|
expectScrolling(false);
|
|
481
478
|
contentHeight++;
|
|
482
479
|
changed.fire();
|
|
483
|
-
|
|
480
|
+
expect(entry.node.style.height).to.equal('5000px');
|
|
484
481
|
expectScrolling(true);
|
|
485
482
|
entry.setCollapsed(true);
|
|
486
|
-
|
|
483
|
+
expect(entry.node.style.height).to.equal(`${chrome}px`);
|
|
487
484
|
entry.setAvailableHeight(100, false);
|
|
488
485
|
contentHeight = 20;
|
|
489
486
|
changed.fire();
|
|
490
|
-
|
|
487
|
+
expect(entry.node.style.height).to.equal(`${chrome}px`);
|
|
491
488
|
entry.setCollapsed(false);
|
|
492
|
-
|
|
489
|
+
expect(entry.node.style.height).to.equal(`${20 + chrome}px`);
|
|
493
490
|
expectScrolling(false);
|
|
494
491
|
if (isDiff) {
|
|
495
492
|
originalHeight = 500;
|
|
496
493
|
originalChanged.fire();
|
|
497
|
-
|
|
494
|
+
expect(entry.node.style.height).to.equal(`${500 + chrome}px`);
|
|
498
495
|
expectScrolling(false);
|
|
499
496
|
originalHeight = 10;
|
|
500
497
|
originalChanged.fire();
|
|
501
|
-
|
|
498
|
+
expect(entry.node.style.height).to.equal(`${20 + chrome}px`);
|
|
502
499
|
expectScrolling(false);
|
|
503
500
|
}
|
|
504
501
|
entry.setAvailableHeight(500);
|
|
505
|
-
|
|
502
|
+
expect(entry.node.style.height).to.equal('500px');
|
|
506
503
|
expectScrolling(false);
|
|
507
504
|
contentHeight = 600;
|
|
508
505
|
changed.fire();
|
|
509
|
-
|
|
506
|
+
expect(entry.node.style.height).to.equal('500px');
|
|
510
507
|
expectScrolling(true);
|
|
511
508
|
entry.setAvailableHeight(700);
|
|
512
|
-
|
|
509
|
+
expect(entry.node.style.height).to.equal('700px');
|
|
513
510
|
expectScrolling(false);
|
|
514
511
|
}
|
|
515
512
|
finally {
|
|
@@ -522,20 +519,20 @@ describe('Multi-Diff Editor — widgets', () => {
|
|
|
522
519
|
});
|
|
523
520
|
describe('DiffEntryLoadingWidget / DiffEntryErrorWidget', () => {
|
|
524
521
|
it('should render a spinning codicon loading indicator', () => {
|
|
525
|
-
const w = new
|
|
522
|
+
const w = new DiffEntryLoadingWidget();
|
|
526
523
|
try {
|
|
527
524
|
const spinner = w.node.querySelector('.codicon-loading.codicon-modifier-spin');
|
|
528
|
-
|
|
525
|
+
expect(spinner).to.exist;
|
|
529
526
|
}
|
|
530
527
|
finally {
|
|
531
528
|
w.dispose();
|
|
532
529
|
}
|
|
533
530
|
});
|
|
534
531
|
it('should render the error message', () => {
|
|
535
|
-
const w = new
|
|
532
|
+
const w = new DiffEntryErrorWidget('oops');
|
|
536
533
|
try {
|
|
537
|
-
|
|
538
|
-
|
|
534
|
+
expect(w.node.textContent).to.contain('oops');
|
|
535
|
+
expect(w.node.querySelector('.codicon-error')).to.exist;
|
|
539
536
|
}
|
|
540
537
|
finally {
|
|
541
538
|
w.dispose();
|
|
@@ -544,12 +541,12 @@ describe('Multi-Diff Editor — widgets', () => {
|
|
|
544
541
|
});
|
|
545
542
|
describe('MultiDiffEditor', () => {
|
|
546
543
|
function createEditor(count, load) {
|
|
547
|
-
const container = new
|
|
548
|
-
container.bind(
|
|
549
|
-
container.bind(
|
|
550
|
-
const editor = container.get(
|
|
544
|
+
const container = new Container();
|
|
545
|
+
container.bind(MultiDiffEditorData).toConstantValue({ title: 'Changes', resources: Array(count).fill(sampleResource) });
|
|
546
|
+
container.bind(MultiDiffEditor).toSelf();
|
|
547
|
+
const editor = container.get(MultiDiffEditor);
|
|
551
548
|
for (let index = 0; index < count; index++) {
|
|
552
|
-
editor.addDiffEntry(sampleResource, new
|
|
549
|
+
editor.addDiffEntry(sampleResource, new DiffEntryHeaderWidget(sampleResource, mockLabelProvider), load);
|
|
553
550
|
}
|
|
554
551
|
return editor;
|
|
555
552
|
}
|
|
@@ -557,9 +554,9 @@ describe('Multi-Diff Editor — widgets', () => {
|
|
|
557
554
|
const editor = createEditor(1);
|
|
558
555
|
try {
|
|
559
556
|
editor.restoreState({ collapsedUris: [sampleResource.modifiedUri.toString()], scrollTop: 123 });
|
|
560
|
-
|
|
561
|
-
|
|
562
|
-
|
|
557
|
+
expect(editor.entries[0].isCollapsed).to.be.false;
|
|
558
|
+
expect(editor['entriesPanel'].node.scrollTop).to.equal(0);
|
|
559
|
+
expect(editor.storeState()).to.be.undefined;
|
|
563
560
|
}
|
|
564
561
|
finally {
|
|
565
562
|
editor.dispose();
|
|
@@ -579,34 +576,34 @@ describe('Multi-Diff Editor — widgets', () => {
|
|
|
579
576
|
options = opts;
|
|
580
577
|
}
|
|
581
578
|
};
|
|
582
|
-
const load = sinon.stub().callsFake(async () => new
|
|
579
|
+
const load = sinon.stub().callsFake(async () => new Widget());
|
|
583
580
|
const editor = createEditor(2, load);
|
|
584
581
|
const firstLoad = sinon.spy(editor.entries[0], 'loadEditor');
|
|
585
582
|
const secondLoad = sinon.spy(editor.entries[1], 'loadEditor');
|
|
586
583
|
try {
|
|
587
|
-
|
|
588
|
-
|
|
589
|
-
|
|
584
|
+
expect(observe.callCount).to.equal(2);
|
|
585
|
+
expect(options?.root).to.equal(editor['entriesPanel'].node);
|
|
586
|
+
expect(options?.rootMargin).to.equal('500px 0px');
|
|
590
587
|
editor.entries[1].setCollapsed(true);
|
|
591
588
|
const records = editor.entries.map(entry => ({ target: entry.node, isIntersecting: true }));
|
|
592
589
|
callback([{ ...records[0], isIntersecting: false }], editor['entryObserver']);
|
|
593
|
-
|
|
590
|
+
expect(firstLoad.called).to.be.false;
|
|
594
591
|
callback(records, editor['entryObserver']);
|
|
595
|
-
|
|
596
|
-
|
|
597
|
-
|
|
592
|
+
expect(firstLoad.calledOnce).to.be.true;
|
|
593
|
+
expect(editor.entries[1].editorWidget).to.be.undefined;
|
|
594
|
+
expect(load.calledOnce).to.be.true;
|
|
598
595
|
await Promise.resolve();
|
|
599
|
-
|
|
596
|
+
expect(editor.entries[0].editorWidget).to.exist;
|
|
600
597
|
editor.entries[1].setCollapsed(false);
|
|
601
598
|
await Promise.resolve();
|
|
602
|
-
|
|
603
|
-
|
|
599
|
+
expect(load.calledTwice).to.be.true;
|
|
600
|
+
expect(editor.entries[1].editorWidget).to.exist;
|
|
604
601
|
editor.dispose();
|
|
605
|
-
|
|
602
|
+
expect(disconnect.calledOnce).to.be.true;
|
|
606
603
|
callback(records, editor['entryObserver']);
|
|
607
|
-
|
|
608
|
-
|
|
609
|
-
|
|
604
|
+
expect(firstLoad.calledOnce).to.be.true;
|
|
605
|
+
expect(secondLoad.calledTwice).to.be.true;
|
|
606
|
+
expect(load.calledTwice).to.be.true;
|
|
610
607
|
}
|
|
611
608
|
finally {
|
|
612
609
|
editor.dispose();
|
|
@@ -621,8 +618,8 @@ describe('Multi-Diff Editor — widgets', () => {
|
|
|
621
618
|
try {
|
|
622
619
|
editor.entries[0].setCollapsed(true);
|
|
623
620
|
editor.revealResource(sampleResource.modifiedUri);
|
|
624
|
-
|
|
625
|
-
|
|
621
|
+
expect(editor.entries[0].isCollapsed).to.be.false;
|
|
622
|
+
expect(load.called).to.be.true;
|
|
626
623
|
}
|
|
627
624
|
finally {
|
|
628
625
|
editor.dispose();
|
|
@@ -640,21 +637,21 @@ describe('Multi-Diff Editor — widgets', () => {
|
|
|
640
637
|
const offset = sinon.stub(entry.node, 'offsetTop').get(() => 120);
|
|
641
638
|
const pending = entry.loadEditor();
|
|
642
639
|
try {
|
|
643
|
-
|
|
640
|
+
Widget.attach(editor, document.body);
|
|
644
641
|
editor.node.scrollTop = 42;
|
|
645
642
|
document.body.scrollTop = 17;
|
|
646
643
|
editor.revealResource(entry.modifiedUri);
|
|
647
644
|
frames.splice(0).forEach(frame => frame(0));
|
|
648
|
-
|
|
649
|
-
|
|
650
|
-
|
|
645
|
+
expect(panel.scrollTop).to.equal(120);
|
|
646
|
+
expect(editor.node.scrollTop).to.equal(42);
|
|
647
|
+
expect(document.body.scrollTop).to.equal(17);
|
|
651
648
|
offset.get(() => 480);
|
|
652
|
-
resolve(new
|
|
649
|
+
resolve(new Widget());
|
|
653
650
|
await pending;
|
|
654
651
|
frames.splice(0).forEach(frame => frame(0));
|
|
655
|
-
|
|
656
|
-
|
|
657
|
-
|
|
652
|
+
expect(panel.scrollTop).to.equal(480);
|
|
653
|
+
expect(editor.node.scrollTop).to.equal(42);
|
|
654
|
+
expect(document.body.scrollTop).to.equal(17);
|
|
658
655
|
}
|
|
659
656
|
finally {
|
|
660
657
|
editor.dispose();
|
|
@@ -668,22 +665,22 @@ describe('Multi-Diff Editor — widgets', () => {
|
|
|
668
665
|
const frames = [];
|
|
669
666
|
globalThis.requestAnimationFrame = callback => frames.push(callback);
|
|
670
667
|
const editor = createEditor(1);
|
|
671
|
-
const otherResource = { ...sampleResource, modifiedUri: new
|
|
672
|
-
const other = editor.addDiffEntry(otherResource, new
|
|
668
|
+
const otherResource = { ...sampleResource, modifiedUri: new URI('file:///workspace/c.ts') };
|
|
669
|
+
const other = editor.addDiffEntry(otherResource, new DiffEntryHeaderWidget(otherResource, mockLabelProvider));
|
|
673
670
|
const panel = editor['entriesPanel'].node;
|
|
674
671
|
const offset = sinon.stub(other.node, 'offsetTop').get(() => 240);
|
|
675
672
|
try {
|
|
676
|
-
|
|
673
|
+
Widget.attach(editor, document.body);
|
|
677
674
|
editor.revealResource(sampleResource.modifiedUri);
|
|
678
675
|
editor.revealResource(otherResource.modifiedUri);
|
|
679
676
|
frames.shift()(0);
|
|
680
|
-
|
|
677
|
+
expect(panel.scrollTop).to.equal(0);
|
|
681
678
|
frames.shift()(0);
|
|
682
|
-
|
|
679
|
+
expect(panel.scrollTop).to.equal(240);
|
|
683
680
|
editor.revealResource(sampleResource.modifiedUri);
|
|
684
681
|
editor.dispose();
|
|
685
682
|
frames.splice(0).forEach(frame => frame(0));
|
|
686
|
-
|
|
683
|
+
expect(panel.scrollTop).to.equal(240);
|
|
687
684
|
}
|
|
688
685
|
finally {
|
|
689
686
|
editor.dispose();
|
|
@@ -697,7 +694,7 @@ describe('Multi-Diff Editor — widgets', () => {
|
|
|
697
694
|
sinon.stub(panel, 'getBoundingClientRect').returns({ top: 0, bottom: 500 });
|
|
698
695
|
const firstBounds = sinon.stub(editor.entries[0].node, 'getBoundingClientRect').returns({ top: -400, bottom: -100 });
|
|
699
696
|
sinon.stub(editor.entries[1].node, 'getBoundingClientRect').returns({ top: 100, bottom: 400 });
|
|
700
|
-
class FocusWidget extends
|
|
697
|
+
class FocusWidget extends Widget {
|
|
701
698
|
onActivateRequest() {
|
|
702
699
|
panel.scrollTop = 0;
|
|
703
700
|
editor.node.scrollTop = 0;
|
|
@@ -712,19 +709,19 @@ describe('Multi-Diff Editor — widgets', () => {
|
|
|
712
709
|
try {
|
|
713
710
|
panel.scrollTop = 350;
|
|
714
711
|
editor.node.scrollTop = 42;
|
|
715
|
-
|
|
716
|
-
|
|
717
|
-
|
|
718
|
-
|
|
719
|
-
|
|
712
|
+
MessageLoop.sendMessage(editor, Widget.Msg.ActivateRequest);
|
|
713
|
+
expect(firstActivate.calledWith(Widget.Msg.ActivateRequest)).to.be.false;
|
|
714
|
+
expect(secondActivate.calledWith(Widget.Msg.ActivateRequest)).to.be.true;
|
|
715
|
+
expect(panel.scrollTop).to.equal(350);
|
|
716
|
+
expect(editor.node.scrollTop).to.equal(42);
|
|
720
717
|
second.node.dispatchEvent(new window.Event('focusin', { bubbles: true }));
|
|
721
718
|
firstBounds.returns({ top: 0, bottom: 200 });
|
|
722
719
|
secondActivate.resetHistory();
|
|
723
|
-
|
|
724
|
-
|
|
720
|
+
MessageLoop.sendMessage(editor, Widget.Msg.ActivateRequest);
|
|
721
|
+
expect(secondActivate.calledWith(Widget.Msg.ActivateRequest)).to.be.true;
|
|
725
722
|
editor.entries[1].setCollapsed(true);
|
|
726
|
-
|
|
727
|
-
|
|
723
|
+
MessageLoop.sendMessage(editor, Widget.Msg.ActivateRequest);
|
|
724
|
+
expect(panel.scrollTop).to.equal(350);
|
|
728
725
|
}
|
|
729
726
|
finally {
|
|
730
727
|
sinon.restore();
|
|
@@ -734,10 +731,10 @@ describe('Multi-Diff Editor — widgets', () => {
|
|
|
734
731
|
it('should fill the viewport for a single entry and follow resizes', () => {
|
|
735
732
|
const editor = createEditor(1);
|
|
736
733
|
try {
|
|
737
|
-
|
|
738
|
-
|
|
739
|
-
|
|
740
|
-
|
|
734
|
+
MessageLoop.sendMessage(editor, new Widget.ResizeMessage(1000, 800));
|
|
735
|
+
expect(editor.entries[0].node.style.height).to.equal('800px');
|
|
736
|
+
MessageLoop.sendMessage(editor, new Widget.ResizeMessage(1000, 400));
|
|
737
|
+
expect(editor.entries[0].node.style.height).to.equal('400px');
|
|
741
738
|
}
|
|
742
739
|
finally {
|
|
743
740
|
editor.dispose();
|
|
@@ -746,17 +743,17 @@ describe('Multi-Diff Editor — widgets', () => {
|
|
|
746
743
|
it('should retain bounded content heights for multiple entries', () => {
|
|
747
744
|
const editor = createEditor(2);
|
|
748
745
|
try {
|
|
749
|
-
|
|
746
|
+
MessageLoop.sendMessage(editor, new Widget.ResizeMessage(1000, 800));
|
|
750
747
|
for (const entry of editor.entries) {
|
|
751
748
|
entry.setHeight(1000);
|
|
752
|
-
|
|
749
|
+
expect(entry.node.style.height).to.equal('1000px');
|
|
753
750
|
entry.setHeight(10_000);
|
|
754
|
-
|
|
751
|
+
expect(entry.node.style.height).to.equal('5000px');
|
|
755
752
|
}
|
|
756
|
-
|
|
757
|
-
|
|
753
|
+
MessageLoop.sendMessage(editor, new Widget.ResizeMessage(1000, 300));
|
|
754
|
+
expect(editor.entries[0].node.style.height).to.equal('5000px');
|
|
758
755
|
editor.entries[1].setHeight(60);
|
|
759
|
-
|
|
756
|
+
expect(editor.entries[1].node.style.height).to.equal('60px');
|
|
760
757
|
}
|
|
761
758
|
finally {
|
|
762
759
|
editor.dispose();
|
|
@@ -764,44 +761,44 @@ describe('Multi-Diff Editor — widgets', () => {
|
|
|
764
761
|
});
|
|
765
762
|
});
|
|
766
763
|
describe('MultiDiffEditorWidgetFactory', () => {
|
|
767
|
-
class TestFactory extends
|
|
764
|
+
class TestFactory extends MultiDiffEditorWidgetFactory {
|
|
768
765
|
configure(widget) {
|
|
769
766
|
this.configureEmbeddedEditor(widget);
|
|
770
767
|
}
|
|
771
768
|
}
|
|
772
769
|
it('should disable visibility side effects and enable unchanged-region hiding only for diff editors', () => {
|
|
773
|
-
const factory = new TestFactory(new
|
|
774
|
-
const diff = Object.create(
|
|
770
|
+
const factory = new TestFactory(new Container(), {}, mockLabelProvider);
|
|
771
|
+
const diff = Object.create(MonacoDiffEditor.prototype);
|
|
775
772
|
const updateDiffOptions = sinon.spy();
|
|
776
773
|
Object.defineProperty(diff, 'diffEditor', { value: { updateOptions: updateDiffOptions } });
|
|
777
|
-
const code = Object.create(
|
|
774
|
+
const code = Object.create(MonacoEditor.prototype);
|
|
778
775
|
const updateCodeOptions = sinon.spy();
|
|
779
776
|
code.getControl = () => ({ updateOptions: updateCodeOptions });
|
|
780
777
|
factory.configure({ editor: diff });
|
|
781
778
|
factory.configure({ editor: code });
|
|
782
779
|
for (const editor of [diff, code]) {
|
|
783
|
-
|
|
780
|
+
expect(editor.detachModelOnHide).to.be.false;
|
|
784
781
|
}
|
|
785
|
-
|
|
782
|
+
expect(updateDiffOptions.firstCall.args[0]).to.deep.equal({
|
|
786
783
|
folding: false, codeLens: false, scrollBeyondLastLine: false, stickyScroll: { enabled: false }, minimap: { enabled: false }, hideUnchangedRegions: { enabled: true }
|
|
787
784
|
});
|
|
788
|
-
|
|
785
|
+
expect(updateCodeOptions.firstCall.args[0]).not.to.have.property('hideUnchangedRegions');
|
|
789
786
|
});
|
|
790
787
|
it('should return placeholders without loading models, then configure and publish loaded editors', async () => {
|
|
791
|
-
const widget = new
|
|
788
|
+
const widget = new Widget();
|
|
792
789
|
const createByUri = sinon.stub().resolves(widget);
|
|
793
790
|
const manager = { createByUri };
|
|
794
|
-
const factory = new
|
|
795
|
-
const editor = factory.createMultiDiffEditor(
|
|
791
|
+
const factory = new MultiDiffEditorWidgetFactory(new Container(), manager, mockLabelProvider);
|
|
792
|
+
const editor = factory.createMultiDiffEditor(MultiDiffEditorUri.encode({ title: 'Changes', resources: [sampleResource] }));
|
|
796
793
|
const changed = sinon.spy();
|
|
797
794
|
editor.onDidChangeTrackableWidgets(changed);
|
|
798
795
|
try {
|
|
799
|
-
|
|
800
|
-
|
|
796
|
+
expect(createByUri.called).to.be.false;
|
|
797
|
+
expect(editor.entries[0].node.querySelector('.multi-diff-entry-loading')).to.exist;
|
|
801
798
|
await editor.entries[0].loadEditor();
|
|
802
|
-
|
|
803
|
-
|
|
804
|
-
|
|
799
|
+
expect(createByUri.calledOnce).to.be.true;
|
|
800
|
+
expect(editor.getTrackableWidgets()).to.deep.equal([widget]);
|
|
801
|
+
expect(changed.calledOnce).to.be.true;
|
|
805
802
|
}
|
|
806
803
|
finally {
|
|
807
804
|
editor.dispose();
|
|
@@ -810,25 +807,25 @@ describe('Multi-Diff Editor — widgets', () => {
|
|
|
810
807
|
});
|
|
811
808
|
describe('MultiDiffEditorLabelProvider', () => {
|
|
812
809
|
it('should label synthetic URIs with the full editor title', () => {
|
|
813
|
-
const provider = new
|
|
814
|
-
const uri =
|
|
815
|
-
|
|
816
|
-
|
|
817
|
-
|
|
818
|
-
|
|
819
|
-
|
|
810
|
+
const provider = new MultiDiffEditorLabelProvider();
|
|
811
|
+
const uri = MultiDiffEditorUri.encode({ title: 'Changes in feature/test', resources: [] });
|
|
812
|
+
expect(provider.canHandle(uri)).to.equal(20);
|
|
813
|
+
expect(provider.canHandle(new URI('file:///a.ts'))).to.equal(0);
|
|
814
|
+
expect(provider.getName(uri)).to.equal('Changes in feature/test');
|
|
815
|
+
expect(provider.getLongName(uri)).to.equal('Changes in feature/test');
|
|
816
|
+
expect(provider.getIcon()).to.equal('codicon codicon-diff-multiple');
|
|
820
817
|
});
|
|
821
818
|
});
|
|
822
819
|
describe('MultiDiffEditorOpenHandler', () => {
|
|
823
820
|
// canHandle can be exercised without DI, since it's a pure function of the URI.
|
|
824
|
-
const handler = Object.create(
|
|
821
|
+
const handler = Object.create(MultiDiffEditorOpenHandler.prototype);
|
|
825
822
|
it('should return 1000 for multi-diff-editor URIs', () => {
|
|
826
|
-
const uri =
|
|
827
|
-
|
|
823
|
+
const uri = MultiDiffEditorUri.encode({ title: 'x', resources: [] });
|
|
824
|
+
expect(handler.canHandle(uri)).to.equal(1000);
|
|
828
825
|
});
|
|
829
826
|
it('should return 0 for other URIs', () => {
|
|
830
|
-
|
|
831
|
-
|
|
827
|
+
expect(handler.canHandle(new URI('file:///a.ts'))).to.equal(0);
|
|
828
|
+
expect(handler.canHandle(new URI('diff://a/b'))).to.equal(0);
|
|
832
829
|
});
|
|
833
830
|
});
|
|
834
831
|
});
|