kc/helix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

minor: Refactor commands.rs a bit more

Browse source
This commit is contained in:
Blaž Hrastnik 2021-08-20 10:30:45 +09:00
parent da8810809a
commit cbd39d67a4
2 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
helix-term/src/commands.rs
View file

@ -888,7 +888,7 @@ pub fn scroll(cx: &mut Context, offset: usize, direction: Direction) {
.primary() .primary()
.cursor(doc.text().slice(..)), .cursor(doc.text().slice(..)),
); );
let doc_last_line = doc.text().len_lines() - 1; let doc_last_line = doc.text().len_lines().saturating_sub(1);
let last_line = view.last_line(doc); let last_line = view.last_line(doc);
@ -1509,18 +1509,19 @@ mod cmd {
return Ok(()); return Ok(());
} }
let arg = args.get(0).context("argument missing")?.to_ascii_lowercase();
// Attempt to parse argument as a line ending. // Attempt to parse argument as a line ending.
let line_ending = match args.get(0) { let line_ending = match arg {
// We check for CR first because it shares a common prefix with CRLF. // We check for CR first because it shares a common prefix with CRLF.
Some(arg) if "cr".starts_with(&arg.to_lowercase()) => Some(CR), arg if arg.starts_with("cr") => CR,
Some(arg) if "crlf".starts_with(&arg.to_lowercase()) => Some(Crlf), arg if arg.starts_with("crlf") => Crlf,
Some(arg) if "lf".starts_with(&arg.to_lowercase()) => Some(LF), arg if arg.starts_with("lf") => LF,
Some(arg) if "ff".starts_with(&arg.to_lowercase()) => Some(FF), arg if arg.starts_with("ff") => FF,
Some(arg) if "nel".starts_with(&arg.to_lowercase()) => Some(Nel), arg if arg.starts_with("nel") => Nel,
_ => None, _ => bail!("invalid line ending")
}; };
let line_ending = line_ending.context("invalid line ending")?;
doc_mut!(cx.editor).line_ending = line_ending; doc_mut!(cx.editor).line_ending = line_ending;
Ok(()) Ok(())
} }

2
helix-term/src/ui/mod.rs
View file

@ -76,7 +76,7 @@ pub fn regex_prompt(
pub fn file_picker(root: PathBuf) -> FilePicker<PathBuf> { pub fn file_picker(root: PathBuf) -> FilePicker<PathBuf> {
use ignore::Walk; use ignore::Walk;
use std::time; use std::time;
let files = Walk::new(root.clone()).filter_map(|entry| { let files = Walk::new(&root).filter_map(|entry| {
let entry = entry.ok()?; let entry = entry.ok()?;
// Path::is_dir() traverses symlinks, so we use it over DirEntry::is_dir // Path::is_dir() traverses symlinks, so we use it over DirEntry::is_dir
if entry.path().is_dir() { if entry.path().is_dir() {