Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Diff Editor v2: Improves collapse unchanged code feature #185226

Merged
merged 2 commits into from
Jun 15, 2023
Merged

Diff Editor v2: Improves collapse unchanged code feature #185226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
25edaf5
Diff Editor v2: Improves collapse unchanged code feature
hediet Jun 15, 2023
7effbe9
Updates Labels
hediet Jun 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
24 changes: 13 additions & 11 deletions src/vs/editor/browser/widget/diffEditorWidget2/diffEditorWidget2.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,17 +143,19 @@ export class DiffEditorWidget2 extends DelegatingEditor implements IDiffEditor {
});
this._register(keepAlive(this._sash, true));

this._register(new UnchangedRangesFeature(this._originalEditor, this._modifiedEditor, this._diffModel));
this._register(
this._instantiationService.createInstance(
ViewZoneManager,
this._originalEditor,
this._modifiedEditor,
this._diffModel,
this._options.map((o) => o.renderSideBySide),
this
)
);
this._register(new UnchangedRangesFeature(
this._originalEditor,
this._modifiedEditor,
this._diffModel
));
this._register(this._instantiationService.createInstance(
ViewZoneManager,
this._originalEditor,
this._modifiedEditor,
this._diffModel,
this._options.map((o) => o.renderSideBySide),
this,
));

this._register(this._instantiationService.createInstance(OverviewRulerPart,
this._originalEditor,
Expand Down
6 changes: 4 additions & 2 deletions src/vs/editor/browser/widget/diffEditorWidget2/patternBottom.svg
View file
Open in desktop
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 4 additions & 2 deletions src/vs/editor/browser/widget/diffEditorWidget2/patternTop.svg
View file
Open in desktop
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions src/vs/editor/browser/widget/diffEditorWidget2/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@
display: block;
text-overflow: ellipsis;
white-space: nowrap;

height: 20px;
}

.diff-hidden-lines .center > span,
Expand Down
27 changes: 21 additions & 6 deletions src/vs/editor/browser/widget/diffEditorWidget2/unchangedRanges.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,26 +74,38 @@ export class UnchangedRangesFeature extends Disposable {
if (hiddenOriginalRange.isEmpty) {
continue;
}
const marginDomNode1 = h('div.diff-hidden-lines', { className: [true ? 'showTop' : '', true ? 'showBottom' : ''].join(' ') }, [
h('div.top'),
h('div.center@content'),
h('div.bottom'),
]).root;

store.add(new CollapsedCodeActionsContentWidget(this._originalEditor, aOrig, hiddenOriginalRange.startLineNumber - 1, 30, constObservable<IContentWidgetAction[]>([
{
text: `${hiddenOriginalRange.length} Lines Hidden`
},
{
text: '$(chevron-up) Show More',
text: '$(chevron-up) Show More Above',
async action() { r.showMoreAbove(undefined); },
},
{
text: '$(chevron-down) Show More',
text: '$(chevron-down) Show More Below',
async action() { r.showMoreBelow(undefined); },
},
{
text: '$(close) Show All',
async action() { r.showAll(undefined); },
}
]), unchangedRegionViewZoneIdsOrig, atTop, atBottom));
]), unchangedRegionViewZoneIdsOrig, atTop, atBottom, marginDomNode1));

const marginDomNode = h('div.diff-hidden-lines', { className: [true ? 'showTop' : '', true ? 'showBottom' : ''].join(' ') }, [
h('div.top'),
h('div.center@content'),
h('div.bottom'),
]).root;

store.add(new CollapsedCodeActionsContentWidget(this._modifiedEditor, aMod, hiddenModifiedRange.startLineNumber - 1, 30, constObservable<IContentWidgetAction[]>([
/* Dont show buttons for modified, but maybe revisit that
{
text: '$(chevron-up) Show More',
async action() { r.showMoreAbove(undefined); },
Expand All @@ -106,15 +118,15 @@ export class UnchangedRangesFeature extends Disposable {
text: '$(close) Show All',
async action() { r.showAll(undefined); },
}
]), unchangedRegionViewZoneIdsMod, atTop, atBottom));
*/
]), unchangedRegionViewZoneIdsMod, atTop, atBottom, marginDomNode));
}
});
});

this._originalEditor.setHiddenAreas(unchangedRegions.map(r => r.getHiddenOriginalRange(reader).toInclusiveRange()).filter(isDefined));
this._modifiedEditor.setHiddenAreas(unchangedRegions.map(r => r.getHiddenModifiedRange(reader).toInclusiveRange()).filter(isDefined));
}));

}
}

Expand All @@ -137,6 +149,7 @@ abstract class FixedZoneWidget extends Disposable {
afterLineNumber: number,
height: number,
viewZoneIdsToCleanUp: string[],
marginDomNode: HTMLElement | undefined,
) {
super();

Expand All @@ -151,6 +164,7 @@ abstract class FixedZoneWidget extends Disposable {
this.widgetDomNode.style.top = `${top}px`;
},
showInHiddenAreas: true,
marginDomNode,
});
viewZoneIdsToCleanUp.push(this.viewZoneId);

Expand Down Expand Up @@ -183,8 +197,9 @@ class CollapsedCodeActionsContentWidget extends FixedZoneWidget {
viewZoneIdsToCleanUp: string[],
public readonly showTopZigZag: boolean,
public readonly showBottomZigZag: boolean,
marginDomNode: HTMLElement | undefined,
) {
super(editor, viewZoneAccessor, afterLineNumber, height, viewZoneIdsToCleanUp);
super(editor, viewZoneAccessor, afterLineNumber, height, viewZoneIdsToCleanUp, marginDomNode);

this.widgetDomNode.appendChild(this._domNode.root);

Expand Down