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

Hide decorations for selections that are larger than the viewport #403

Merged
merged 7 commits into from
Jan 6, 2022
Merged

Hide decorations for selections that are larger than the viewport #403

Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9df9c7c
Don't show decorations for selections that are larger than the visibl…
AndreasArvidsson Dec 17, 2021
45f0495
Allow decorations on equal
AndreasArvidsson Dec 18, 2021
d0aea8a
Merge branch 'main' into scroll_decorations_filter
AndreasArvidsson Jan 4, 2022
438fac0
Make selection more specific
AndreasArvidsson Jan 5, 2022
71afca1
Merged
AndreasArvidsson Jan 5, 2022
3b3e6da
Do filtering only on line numbers
AndreasArvidsson Jan 5, 2022
7f3dbdc
Merge branch 'main' into scroll_decorations_filter
AndreasArvidsson Jan 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 15 additions & 4 deletions src/actions/Scroll.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@ import {
import { groupBy } from "../util/itertools";
import { commands, window } from "vscode";
import { focusEditor } from "../util/setSelectionsAndFocusEditor";
import {
displayPendingEditDecorationsForSelection,
} from "../util/editDisplayUtils";
import { displayPendingEditDecorationsForSelection } from "../util/editDisplayUtils";

class Scroll implements Action {
getTargetPreferences: () => ActionPreferences[] = () => [
Expand Down Expand Up @@ -49,8 +47,21 @@ class Scroll implements Action {
await focusEditor(originalEditor);
}

const decorationSelections = targets
.map((target) => target.selection)
.filter((selection) => {
const visibleRanges = selection.editor.visibleRanges;
const start = visibleRanges[0].start;
const end = visibleRanges[visibleRanges.length - 1].end;
// Don't show decorations for selections that are larger than the visible range
return (
selection.selection.start.isAfterOrEqual(start) ||
selection.selection.end.isBeforeOrEqual(end)
);
});

await displayPendingEditDecorationsForSelection(
targets.map((target) => target.selection),
decorationSelections,
this.graph.editStyles.referenced.line
);

Expand Down