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

highlight: make PathFlags an ordinary struct

Browse Source 
No need for fancy bitflags.
This commit is contained in:
Peter Ammon
2025-01-01 17:22:59 -08:00
parent 3129c9e939
commit 7af9844de0
2 changed files with 48 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/highlight.rs
View File

@@ -49,7 +49,6 @@
use crate::wutil::fish_wcstoi;
use crate::wutil::{normalize_path, waccess, wstat};
use crate::wutil::{wbasename, wdirname};
use bitflags::bitflags;
use libc::{ENOENT, PATH_MAX, R_OK, W_OK};
use std::collections::hash_map::Entry;
use std::collections::{HashMap, HashSet};
@@ -697,7 +696,10 @@ fn range_is_potential_path(
at_cursor,
&[working_directory.to_owned()],
ctx,
PathFlags::PATH_EXPAND_TILDE,
PathFlags {
expand_tilde: true,
..Default::default()
},
);
}
result
@@ -708,16 +710,14 @@ fn range_is_potential_path(
// This does I/O!
//
// This is used only internally to this file, and is exposed only for testing.
bitflags! {
#[derive(Clone, Copy, Default)]
pub struct PathFlags: u8 {
// The path must be to a directory.
const PATH_REQUIRE_DIR = 1 << 0;
// Expand any leading tilde in the path.
const PATH_EXPAND_TILDE = 1 << 1;
// Normalize directories before resolving, as "cd".
const PATH_FOR_CD = 1 << 2;
}
#[derive(Clone, Copy, Default)]
pub struct PathFlags {
// The path must be to a directory.
pub require_dir: bool,
// Expand any leading tilde in the path.
pub expand_tilde: bool,
// Normalize directories before resolving, as "cd".
pub for_cd: bool,
}
/// Tests whether the specified string cpath is the prefix of anything we could cd to. directories
@@ -741,12 +741,12 @@ pub fn is_potential_path(
return false;
}
let require_dir = flags.contains(PathFlags::PATH_REQUIRE_DIR);
let require_dir = flags.require_dir;
let mut clean_potential_path_fragment = WString::new();
let mut has_magic = false;
let mut path_with_magic = potential_path_fragment.to_owned();
if flags.contains(PathFlags::PATH_EXPAND_TILDE) {
if flags.expand_tilde {
expand_tilde(&mut path_with_magic, ctx.vars());
}
@@ -785,7 +785,7 @@ pub fn is_potential_path(
}
let mut abs_path = path_apply_working_directory(&clean_potential_path_fragment, wd);
let must_be_full_dir = abs_path.chars().next_back() == Some('/');
if flags.contains(PathFlags::PATH_FOR_CD) {
if flags.for_cd {
abs_path = normalize_path(&abs_path, /*allow_leading_double_slashes=*/ true);
}
@@ -856,7 +856,7 @@ fn is_potential_cd_path(
at_cursor: bool,
working_directory: &wstr,
ctx: &OperationContext<'_>,
flags: PathFlags,
mut flags: PathFlags,
) -> bool {
let mut directories = vec![];
@@ -883,13 +883,9 @@ fn is_potential_cd_path(
}
// Call is_potential_path with all of these directories.
is_potential_path(
path,
at_cursor,
&directories,
ctx,
flags | PathFlags::PATH_REQUIRE_DIR | PathFlags::PATH_FOR_CD,
)
flags.require_dir = true;
flags.for_cd = true;
is_potential_path(path, at_cursor, &directories, ctx, flags)
}
pub type ColorArray = Vec<HighlightSpec>;
@@ -1144,7 +1140,10 @@ fn visit_argument(&mut self, arg: &Argument, cmd_is_cd: bool, options_allowed: b
at_cursor,
&self.working_directory,
self.ctx,
PathFlags::PATH_EXPAND_TILDE,
PathFlags {
expand_tilde: true,
..Default::default()
},
);
if !is_valid_path {
self.color_node(

41
src/tests/highlight.rs
View File

@@ -38,12 +38,17 @@ fn test_is_potential_path() {
let vars = EnvStack::new();
let ctx = OperationContext::background(&vars, EXPANSION_LIMIT_DEFAULT);
let path_require_dir = PathFlags {
require_dir: true,
..Default::default()
};
assert!(is_potential_path(
L!("al"),
true,
&wds[..],
&ctx,
PathFlags::PATH_REQUIRE_DIR
path_require_dir
));
assert!(is_potential_path(
@@ -51,28 +56,32 @@ fn test_is_potential_path() {
true,
&wds[..],
&ctx,
PathFlags::PATH_REQUIRE_DIR
path_require_dir
));
assert!(is_potential_path(
L!("aard"),
true,
&wds[..],
&ctx,
PathFlags::empty()
PathFlags::default()
));
assert!(!is_potential_path(
L!("aard"),
false,
&wds[..],
&ctx,
PathFlags::empty()
PathFlags::default()
));
assert!(!is_potential_path(
L!("alp/"),
true,
&wds[..],
&ctx,
PathFlags::PATH_REQUIRE_DIR | PathFlags::PATH_FOR_CD
PathFlags {
require_dir: true,
for_cd: true,
..Default::default()
}
));
assert!(!is_potential_path(
@@ -80,28 +89,28 @@ fn test_is_potential_path() {
true,
&wds[..],
&ctx,
PathFlags::PATH_REQUIRE_DIR
path_require_dir
));
assert!(!is_potential_path(
L!("aard"),
true,
&wds[..],
&ctx,
PathFlags::PATH_REQUIRE_DIR
path_require_dir
));
assert!(!is_potential_path(
L!("aarde"),
true,
&wds[..],
&ctx,
PathFlags::PATH_REQUIRE_DIR
path_require_dir
));
assert!(!is_potential_path(
L!("aarde"),
true,
&wds[..],
&ctx,
PathFlags::empty()
PathFlags::default()
));
assert!(is_potential_path(
@@ -109,21 +118,21 @@ fn test_is_potential_path() {
true,
&wds[..],
&ctx,
PathFlags::empty()
PathFlags::default()
));
assert!(is_potential_path(
L!("test/is_potential_path_test/al"),
true,
&wds[..],
&ctx,
PathFlags::PATH_REQUIRE_DIR
path_require_dir
));
assert!(is_potential_path(
L!("test/is_potential_path_test/aardv"),
true,
&wds[..],
&ctx,
PathFlags::empty()
PathFlags::default()
));
assert!(!is_potential_path(
@@ -131,28 +140,28 @@ fn test_is_potential_path() {
true,
&wds[..],
&ctx,
PathFlags::PATH_REQUIRE_DIR
path_require_dir
));
assert!(!is_potential_path(
L!("test/is_potential_path_test/al/"),
true,
&wds[..],
&ctx,
PathFlags::empty()
PathFlags::default()
));
assert!(!is_potential_path(
L!("test/is_potential_path_test/ar"),
true,
&wds[..],
&ctx,
PathFlags::empty()
PathFlags::default()
));
assert!(is_potential_path(
L!("/usr"),
true,
&wds[..],
&ctx,
PathFlags::PATH_REQUIRE_DIR
path_require_dir
));
}