Skip to content

feat: add option to set environment variables for edit command #133

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Sep 9, 2023
Merged

feat: add option to set environment variables for edit command #133

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
28c3613
feat: add option to configure environment variable for edit command
Subjective Sep 8, 2023
7b3047f
feat: allow for unlimited environment variables
Subjective Sep 8, 2023
c9e8c1f
Update README for Optional environment variables
Subjective Sep 8, 2023
0546474
docs: fix inject_before example in README
Subjective Sep 8, 2023
7cb2355
chore: fix grammar/typos
Subjective Sep 8, 2023
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
feat: add option to configure environment variable for edit command
  • Loading branch information
@Subjective
Subjective committed Sep 8, 2023
commit 28c36131e347dda08c77488c2627f02eb2456b2b
13 changes: 13 additions & 0 deletions src/cmds/edit.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,8 +161,21 @@ impl Command for EditCommand {
args.extend_from_slice(&editor_args);
}

let editor_env = &conf.code.editor_env;
let mut env: Vec<&str> = vec!["", ""];
if !editor_env.is_empty() {
env = editor_env.splitn(2, '=').collect();
if env.len() != 2 {
return Err(crate::Error::FeatureError(
"Invalid environment variable, please check your configuration for errors"
.into(),
));
}
}

args.push(path);
std::process::Command::new(conf.code.editor)
.env(env[0], env[1])
.args(args)
.status()?;
Ok(())
Expand Down
3 changes: 3 additions & 0 deletions src/config/code.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ pub struct Code {
#[serde(rename(serialize = "editor-args"), alias = "editor-args", default)]
pub editor_args: Option<Vec<String>>,
#[serde(default, skip_serializing)]
pub editor_env: String,
#[serde(default, skip_serializing)]
pub edit_code_marker: bool,
#[serde(default, skip_serializing)]
pub start_marker: String,
Expand Down Expand Up @@ -44,6 +46,7 @@ impl Default for Code {
Self {
editor: "vim".into(),
editor_args: None,
editor_env: "".into(),
edit_code_marker: false,
start_marker: "".into(),
end_marker: "".into(),
Expand Down