Skip to content

Commit

Permalink
Implement check before adding path to files
Browse files Browse the repository at this point in the history
  • Loading branch information
TiredTumblrina committed May 11, 2024
1 parent 00e9e5e commit c123944
Showing 1 changed file with 17 additions and 2 deletions.
19 changes: 17 additions & 2 deletions helix-term/src/args.rs
Original file line number Diff line number Diff line change
Expand Up @@ -95,13 +95,23 @@ impl Args {
_ => args.files.push(parse_file(arg)),
};
}
arg => args.files.push(parse_file(arg)),
arg => {
let file = parse_file(arg);

if is_proper_file(&file) {
args.files.push(file)
}
}
}
}

// push the remaining args, if any to the files
for arg in argv {
args.files.push(parse_file(&arg));
let file = parse_file(&arg);

if is_proper_file(&file) {
args.files.push(file);
}
}

if let Some(file) = args.files.first_mut() {
Expand All @@ -125,6 +135,11 @@ pub(crate) fn parse_file(s: &str) -> (PathBuf, Position) {
.unwrap_or_else(def)
}

/// Ensure file is not a pipe or random
fn is_proper_file(f: &(PathBuf, Position)) -> bool {
f.0.is_file() || f.0.is_symlink()
}

/// Split file.rs:10:2 into [`PathBuf`], row and col.
///
/// Does not validate if file.rs is a file or directory.
Expand Down

0 comments on commit c123944

Please sign in to comment.