h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-06-04 15:51:15 -03:00
Code Issues Packages Projects Releases Wiki Activity

refactor(tokenizer): use unqualified names in word motion tests

Browse Source 
Add `use Direction::*` and `use MoveWordStyle::*` in tests to reduce
verbosity. Reformat tests to one-line style and reorder by test type.
No behavior change.

Part of #12269
This commit is contained in:
SharzyL
2026-01-10 14:04:53 +08:00
committed by Johannes Altmanninger
parent 38e633d49b
commit 042117ee30
1 changed files with 31 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

128
src/tokenizer.rs
View File

@@ -1668,108 +1668,42 @@ macro_rules! validate {
};
}
validate!(
Direction::Left,
MoveWordStyle::Punctuation,
"^echo ^hello_^world.^txt^"
);
validate!(
Direction::Right,
MoveWordStyle::Punctuation,
"^echo^ hello^_world^.txt^"
);
use Direction::*;
use MoveWordStyle::*;
// PathComponents tests
validate!(
Direction::Left,
MoveWordStyle::Punctuation,
"echo ^foo_^foo_^foo/^/^/^/^/^ ^"
);
validate!(
Direction::Right,
MoveWordStyle::Punctuation,
"^echo^ foo^_foo^_foo^/^/^/^/^/ ^"
);
validate!(
Direction::Left,
MoveWordStyle::PathComponents,
"^/^foo/^bar/^baz/^"
);
validate!(
Direction::Left,
MoveWordStyle::PathComponents,
"^echo ^--foo ^--bar^"
);
validate!(
Direction::Left,
MoveWordStyle::PathComponents,
"^echo ^hi ^> ^/^dev/^null^"
);
validate!(
Direction::Left,
MoveWordStyle::PathComponents,
Left,
PathComponents,
"^echo ^/^foo/^bar{^aaa,^bbb,^ccc}^bak/^"
);
validate!(
Direction::Left,
MoveWordStyle::PathComponents,
"^echo ^bak ^///^"
);
validate!(
Direction::Left,
MoveWordStyle::PathComponents,
"^aaa ^@ ^@^aaa^"
);
validate!(
Direction::Left,
MoveWordStyle::PathComponents,
"^aaa ^a ^@^aaa^"
);
validate!(
Direction::Left,
MoveWordStyle::PathComponents,
"^aaa ^@@@ ^@@^aa^"
);
validate!(
Direction::Left,
MoveWordStyle::PathComponents,
"^aa^@@ ^aa@@^a^"
);
validate!(
Direction::Left,
MoveWordStyle::PathComponents,
r#"^a\ ^b\ c/^d"^e\ f"^g"#
);
validate!(
Direction::Left,
MoveWordStyle::PathComponents,
r#"^a\"^bc^"#
);
validate!(Left, PathComponents, "^echo ^bak ^///^");
validate!(Left, PathComponents, "^aaa ^@ ^@^aaa^");
validate!(Left, PathComponents, "^aaa ^a ^@^aaa^");
validate!(Left, PathComponents, "^aaa ^@@@ ^@@^aa^");
validate!(Left, PathComponents, "^aa^@@ ^aa@@^a^");
validate!(Left, PathComponents, r#"^a\ ^b\ c/^d"^e\ f"^g"#);
validate!(Left, PathComponents, r#"^a\"^bc^"#);
validate!(Direction::Right, MoveWordStyle::Punctuation, "^a^ bcd^");
validate!(Direction::Right, MoveWordStyle::Punctuation, "a^b^ cde^");
validate!(Direction::Right, MoveWordStyle::Punctuation, "^ab^ cde^");
validate!(
Direction::Right,
MoveWordStyle::Punctuation,
"^ab^&cd^ ^& ^e^ f^&"
);
validate!(Left, PathComponents, "^/^foo/^bar/^baz/^");
validate!(Left, PathComponents, "^echo ^--foo ^--bar^");
validate!(Left, PathComponents, "^echo ^hi ^> ^/^dev/^null^");
validate!(
Direction::Right,
MoveWordStyle::Whitespace,
"^^a-b-c^ d-e-f"
);
validate!(
Direction::Right,
MoveWordStyle::Whitespace,
"^a-b-c^\n d-e-f^ "
);
validate!(
Direction::Right,
MoveWordStyle::Whitespace,
"^a-b-c^\n\nd-e-f^ "
);
// General punctuation tests
validate!(Right, Punctuation, "^a^ bcd^");
validate!(Right, Punctuation, "a^b^ cde^");
validate!(Right, Punctuation, "^ab^ cde^");
validate!(Right, Punctuation, "^ab^&cd^ ^& ^e^ f^&");
validate!(Left, Punctuation, "^echo ^hello_^world.^txt^");
validate!(Right, Punctuation, "^echo^ hello^_world^.txt^");
validate!(Left, Punctuation, "echo ^foo_^foo_^foo/^/^/^/^/^ ^");
validate!(Right, Punctuation, "^echo^ foo^_foo^_foo^/^/^/^/^/ ^");
// General whitespace tests
validate!(Right, Whitespace, "^^a-b-c^ d-e-f");
validate!(Right, Whitespace, "^a-b-c^\n d-e-f^ ");
validate!(Right, Whitespace, "^a-b-c^\n\nd-e-f^ ");
}
}