bendns' repos / gracilaria
A simple CPU rendered GUI IDE experience.
Diffstat (limited to 'src/edi/st.rs')
-rw-r--r--src/edi/st.rs44
1 files changed, 22 insertions, 22 deletions
diff --git a/src/edi/st.rs b/src/edi/st.rs
index c6fbdbb..5c7568f 100644
--- a/src/edi/st.rs
+++ b/src/edi/st.rs
@@ -38,20 +38,20 @@ pub(crate) State => #[derive(Debug)] pub(crate) Action => #[derive(Debug)] pub(c
Dead => K(Key => _) => Dead,
Default => {
- K(Key::Character(x) if x == "s" && ctrl()) => Save [Save],
- K(Key::Character(x) if x == "q" && ctrl()) => Dead [Quit],
- K(Key::Character(x) if x == "v" && ctrl()) => _ [Paste],
- K(Key::Character(x) if x == "z" && ctrl()) => _ [Undo],
- K(Key::Character(x) if x == "y" && ctrl()) => _ [Redo],
- K(Key::Character(x) if x == "f" && ctrl()) => Procure((default(), InputRequest::Search)),
- K(Key::Character(x) if x == "o" && ctrl()) => Procure((default(), InputRequest::OpenFile)),
- K(Key::Character(x) if x == "c" && ctrl()) => _,
- K(Key::Character(x) if x == "l" && ctrl()) => _ [Symbols],
- K(Key::Character(x) if x == "." && ctrl()) => _ [CodeAction],
- K(Key::Character(x) if x == "0" && ctrl()) => _ [MatchingBrace],
- K(Key::Character(x) if x == "`" && ctrl()) => _ [SpawnTerminal],
- K(Key::Character(y) if y == "/" && ctrl()) => Default [Comment(State => State::Default)],
- K(Key::Character(x) if x == "p" && ctrl()) => Command(Commands => Commands::default()),
+ K(Key::Character("s") if ctrl()) => Save [Save],
+ K(Key::Character("q") if ctrl()) => Dead [Quit],
+ K(Key::Character("v") if ctrl()) => _ [Paste],
+ K(Key::Character("z") if ctrl()) => _ [Undo],
+ K(Key::Character("y") if ctrl()) => _ [Redo],
+ K(Key::Character("f") if ctrl()) => Procure((default(), InputRequest::Search)),
+ K(Key::Character("o") if ctrl()) => Procure((default(), InputRequest::OpenFile)),
+ K(Key::Character("c") if ctrl()) => _,
+ K(Key::Character("l") if ctrl()) => _ [Symbols],
+ K(Key::Character(".") if ctrl()) => _ [CodeAction],
+ K(Key::Character("0") if ctrl()) => _ [MatchingBrace],
+ K(Key::Character("`") if ctrl()) => _ [SpawnTerminal],
+ K(Key::Character("/") if ctrl()) => Default [Comment(State => State::Default)],
+ K(Key::Character("p") if ctrl()) => Command(Commands => Commands::default()),
K(Key::Named(Backspace) if alt()) => _ [DeleteBracketPair],
K(Key::Named(F1)) => Procure((default(), InputRequest::RenameSymbol)),
K(Key::Named(k @ (ArrowUp | ArrowDown)) if alt()) => _ [InsertCursor(Direction => {
@@ -62,8 +62,8 @@ Default => {
M(MouseButton::Left if alt()) => _ [InsertCursorAtMouse],
M(MouseButton::Left if ctrl()) => _ [GoToDefinition],
M(MouseButton::Left) => _ [MoveCursor],
- K(Key::Character(x) if x == "-" && ctrl()) => _ [NavBack],
- K(Key::Character(x) if x == "=" && ctrl()) => _ [NavBack],
+ K(Key::Character("=") if ctrl()) => _ [NavForward],
+ K(Key::Character("-") if ctrl()) => _ [NavBack],
M(MouseButton::Back) => _ [NavBack],
M(MouseButton::Forward) => _ [NavForward],
C(((usize, usize)) => .. if unsafe { CLICKING }) => Selection [StartSelection],
@@ -108,7 +108,7 @@ Symbols(Rq { result: Some(_x), request: _rq }) => {
K(Key::Named(Escape)) => Default,
},
Symbols(Rq::<Symbols, Option<SymbolsList>, (), AQErr> => _rq) => {
- K(Key::Character(x) if x == "d" && ctrl()) => _ [SwitchType], // crahs cond methinks
+ K(Key::Character("d") if ctrl()) => _ [SwitchType], // crahs cond methinks
K(Key::Named(Escape)) => Default,
K(_) => _ [SymbolsHandleKey],
C(_) => _,
@@ -136,9 +136,9 @@ Selection => {
C(_) => _,
M(MouseButton => MouseButton::Left) => Default [MoveCursor],
K(Key::Named(Backspace)) => Default [Delete],
- K(Key::Character(y) if y == "x" && ctrl()) => Default [Cut],
- K(Key::Character(y) if y == "c" && ctrl()) => Default [Copy],
- K(Key::Character(y) if y == "/" && ctrl()) => Default [Comment(State::Selection)],
+ K(Key::Character("x") if ctrl()) => Default [Cut],
+ K(Key::Character("c") if ctrl()) => Default [Copy],
+ K(Key::Character("/") if ctrl()) => Default [Comment(State::Selection)],
M(_) => _,
K(Key::Character(y) if !ctrl()) => Default [Insert(SmolStr => y)],
@@ -158,8 +158,8 @@ Procure((t, InputRequest::RenameSymbol)) => K(Key::Named(Enter)) => Default [Ren
Procure((t, a)) => K(k) => Procure((handle(k, t), a)),
Procure((t, a)) => C(_) => Procure((t, a)),
RequestBoolean(t) => {
- K(Key::Character(x) if x == "y") => Default [Boolean((BoolRequest, bool) => (t, true))],
- K(Key::Character(x) if x == "n") => Default [Boolean((t, false))],
+ K(Key::Character("n")) => Default [Boolean((BoolRequest, bool) => (t, true))],
+ K(Key::Character("y")) => Default [Boolean((t, false))],
K(Key::Named(Escape)) => Default [Boolean((t, false))],
K(_) => RequestBoolean(t),
C(_) => _,