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

Fix build on master

Browse source
This commit is contained in:
Blaž Hrastnik 2021-06-23 10:15:57 +09:00
parent fd1ae35051
commit 7511110d82
1 changed files with 14 additions and 10 deletions

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

@ -1365,17 +1365,17 @@ mod cmd {
.set_status(cx.editor.clipboard_provider.name().into());
}
fn change_current_directory(editor: &mut Editor, args: &[&str], _: PromptEvent) {
fn change_current_directory(cx: &mut compositor::Context, args: &[&str], _: PromptEvent) {
let dir = match args.first() {
Some(dir) => dir,
None => {
editor.set_error("target directory not provided".into());
cx.editor.set_error("target directory not provided".into());
return;
}
};
if let Err(e) = std::env::set_current_dir(dir) {
editor.set_error(format!(
cx.editor.set_error(format!(
"Couldn't change the current working directory: {:?}",
e
));
@ -1383,20 +1383,24 @@ mod cmd {
}
match std::env::current_dir() {
Ok(cwd) => editor.set_status(format!(
Ok(cwd) => cx.editor.set_status(format!(
"Current working directory is now {}",
cwd.display()
)),
Err(e) => editor.set_error(format!("Couldn't get the new working directory: {}", e)),
Err(e) => cx
.editor
.set_error(format!("Couldn't get the new working directory: {}", e)),
}
}
fn show_current_directory(editor: &mut Editor, args: &[&str], _: PromptEvent) {
fn show_current_directory(cx: &mut compositor::Context, args: &[&str], _: PromptEvent) {
match std::env::current_dir() {
Ok(cwd) => editor.set_status(format!("Current working directory is {}", cwd.display())),
Err(e) => {
editor.set_error(format!("Couldn't get the current working directory: {}", e))
}
Ok(cwd) => cx
.editor
.set_status(format!("Current working directory is {}", cwd.display())),
Err(e) => cx
.editor
.set_error(format!("Couldn't get the current working directory: {}", e)),
}
}