pogmommy/zellij
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(scrollback-editor): properly invoke editor when command includes spaces (#2339)

Browse source 
* fix(scrollback-editor): properly invoke editor when command includes spaces

* style(fmt): srsly clippy?
This commit is contained in:
Aram Drevekenin 2023-03-31 16:23:24 +02:00 • committed by GitHub
parent dc03fb0318
commit cc3c276586
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
zellij-server/src/os_input_output.rs
View file

@ -245,19 +245,22 @@ fn handle_terminal(
// this is a utility method to separate the arguments from a pathbuf before we turn it into a // this is a utility method to separate the arguments from a pathbuf before we turn it into a
// Command. eg. "/usr/bin/vim -e" ==> "/usr/bin/vim" + "-e" (the latter will be pushed to args) // Command. eg. "/usr/bin/vim -e" ==> "/usr/bin/vim" + "-e" (the latter will be pushed to args)
fn separate_command_arguments(command: &mut PathBuf, args: &mut Vec<String>) { fn separate_command_arguments(command: &mut PathBuf, args: &mut Vec<String>) {
if let Some(file_name) = command let mut parts = vec![];
.file_name() let mut current_part = String::new();
.and_then(|f_n| f_n.to_str()) for part in command.display().to_string().split_ascii_whitespace() {
.map(|f_n| f_n.to_string()) current_part.push_str(part);
{ if current_part.ends_with('\\') {
let mut file_name_parts = file_name.split_ascii_whitespace(); let _ = current_part.pop();
if let Some(first_part) = file_name_parts.next() { current_part.push(' ');
command.set_file_name(first_part); } else {
for part in file_name_parts { let current_part = std::mem::replace(&mut current_part, String::new());
args.push(String::from(part)); parts.push(current_part);
}
} }
} }
if !parts.is_empty() {
*command = PathBuf::from(parts.remove(0));
args.append(&mut parts);
}
} }
/// If a [`TerminalAction::OpenFile(file)`] is given, the text editor specified by environment variable `EDITOR` /// If a [`TerminalAction::OpenFile(file)`] is given, the text editor specified by environment variable `EDITOR`