zellij-org/zellij
1
1
Fork 0
mirror of https://github.com/zellij-org/zellij.git synced 2024-11-26 10:55:12 +03:00
Code Issues Projects Releases Wiki Activity

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
// 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>) {
if let Some(file_name) = command
.file_name()
.and_then(|f_n| f_n.to_str())
.map(|f_n| f_n.to_string())
{
let mut file_name_parts = file_name.split_ascii_whitespace();
if let Some(first_part) = file_name_parts.next() {
command.set_file_name(first_part);
for part in file_name_parts {
args.push(String::from(part));
}
let mut parts = vec![];
let mut current_part = String::new();
for part in command.display().to_string().split_ascii_whitespace() {
current_part.push_str(part);
if current_part.ends_with('\\') {
let _ = current_part.pop();
current_part.push(' ');
} else {
let current_part = std::mem::replace(&mut current_part, String::new());
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`