Skip to content

Select by range not id in stepper #2106

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

Closed
Negabinary wants to merge 1 commit into from
Closed

Select by range not id in stepper #2106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions src/haz3lcore/zipper/action/Action.re
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ type rel =
[@deriving (show({with_path: false}), sexp, yojson, eq)]
type select =
| All
| PointToPoint((Point.t, Point.t))
| Resize(move)
| Smart(int)
| Tile(rel)
Expand Down Expand Up @@ -224,6 +225,7 @@ let should_animate: t => bool =
switch (s) {
| Resize(_) => false
| All
| PointToPoint(_)
| Smart(_)
| Tile(_)
| Term(_)
Expand Down
7 changes: 7 additions & 0 deletions src/haz3lcore/zipper/action/Perform.re
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,13 @@ let go =
|> return(Cant_select)
| Select(Resize(Goal(_))) => failwith("Select not implemented for goals")
| Select(All) => Ok(Select.all(z))
| Select(PointToPoint((p1, p2))) =>
z
|> Move.to_point(~measured=syntax.measured, ~goal=p1)
|> OptUtil.and_then(z =>
Select.to_point(~measured=syntax.measured, ~goal=p2, z)
)
|> return(Cant_select)
| Select(Term(Current)) =>
Select.current_term(
syntax.term_data,
Expand Down
39 changes: 29 additions & 10 deletions src/web/app/editors/result/StepperEditor.re
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,17 +130,36 @@ module View = {

taken_steps(model.taken_steps)
@ next_steps(model.next_steps, ~inject=x =>
Some(List.nth(model.next_steps, x)) == selected_id
? signal(TakeStep(x))
: inject(Select(Term(Id(List.nth(model.next_steps, x), Right))))
{
open OptUtil.Syntax;
let+ range =
TermData.extreme_measures(
List.nth(model.next_steps, x),
model.editor.editor.syntax.term_data,
model.editor.editor.syntax.measured,
);
Some(List.nth(model.next_steps, x)) == selected_id
? signal(TakeStep(x)) : inject(Select(PointToPoint(range)));
}
|> Option.value(~default=Ui_effect.Ignore)
)
@ refl_steps(model.refls, ~inject=x => {
Some(List.nth(model.refls, x)) == selected_id
? signal(Refl(x))
: {
inject(Select(Term(Id(List.nth(model.refls, x), Right))));
}
});
@ refl_steps(model.refls, ~inject=x =>
{
open OptUtil.Syntax;
let+ range =
TermData.extreme_measures(
List.nth(model.refls, x),
model.editor.editor.syntax.term_data,
model.editor.editor.syntax.measured,
);
Some(List.nth(model.refls, x)) == selected_id
? signal(Refl(x))
: {
inject(Select(PointToPoint(range)));
};
}
|> Option.value(~default=Ui_effect.Ignore)
);
};

/* Steppers don't support probe dynamics - expressions shown are
Expand Down
Loading