git.iko.soy/helix
on master help sign in
Fix `:log-open` when `--log` is specified (#7573)
1698992Alex Vinyals
helix-loader/src/lib.rs+28−16
compare with master
unifiedsplit
@@ -11,21 +11,20 @@ static RUNTIME_DIRS: once_cell::sync::Lazy<Vec<PathBuf>> =
11
11
12static CONFIG_FILE: once_cell::sync::OnceCell<PathBuf> = once_cell::sync::OnceCell::new();
12static CONFIG_FILE: once_cell::sync::OnceCell<PathBuf> = once_cell::sync::OnceCell::new();
13
13
14−pub fn initialize_config_file(specified_file: Option<PathBuf>) {
14+static LOG_FILE: once_cell::sync::OnceCell<PathBuf> = once_cell::sync::OnceCell::new();
15− let config_file = specified_file.unwrap_or_else(|| {
16− let config_dir = config_dir();
17−
18− if !config_dir.exists() {
19− std::fs::create_dir_all(&config_dir).ok();
20− }
21
15
22− config_dir.join("config.toml")
16+pub fn initialize_config_file(specified_file: Option<PathBuf>) {
23− });
17+ let config_file = specified_file.unwrap_or_else(default_config_file);
24−
18+ ensure_parent_dir(&config_file);
25− // We should only initialize this value once.
26 CONFIG_FILE.set(config_file).ok();
19 CONFIG_FILE.set(config_file).ok();
27}
20}
28
21
22+pub fn initialize_log_file(specified_file: Option<PathBuf>) {
23+ let log_file = specified_file.unwrap_or_else(default_log_file);
24+ ensure_parent_dir(&log_file);
25+ LOG_FILE.set(log_file).ok();
26+}
27+
29/// A list of runtime directories from highest to lowest priority
28/// A list of runtime directories from highest to lowest priority
30///
29///
31/// The priority is:
30/// The priority is:
@@ -122,10 +121,11 @@ pub fn cache_dir() -> PathBuf {
122}
121}
123
122
124pub fn config_file() -> PathBuf {
123pub fn config_file() -> PathBuf {
125− CONFIG_FILE
126− .get()
127− .map(|path| path.to_path_buf())
124+ CONFIG_FILE.get().map(|path| path.to_path_buf()).unwrap()
128− .unwrap_or_else(|| config_dir().join("config.toml"))
125+}
126+
127+pub fn log_file() -> PathBuf {
128+ LOG_FILE.get().map(|path| path.to_path_buf()).unwrap()
129}
129}
130
130
131pub fn workspace_config_file() -> PathBuf {
131pub fn workspace_config_file() -> PathBuf {
@@ -136,7 +136,7 @@ pub fn lang_config_file() -> PathBuf {
136 config_dir().join("languages.toml")
136 config_dir().join("languages.toml")
137}
137}
138
138
139−pub fn log_file() -> PathBuf {
139+pub fn default_log_file() -> PathBuf {
140 cache_dir().join("helix.log")
140 cache_dir().join("helix.log")
141}
141}
142
142
@@ -227,6 +227,18 @@ pub fn find_workspace() -> (PathBuf, bool) {
227 (current_dir, true)
227 (current_dir, true)
228}
228}
229
229
230+fn default_config_file() -> PathBuf {
231+ config_dir().join("config.toml")
232+}
233+
234+fn ensure_parent_dir(path: &Path) {
235+ if let Some(parent) = path.parent() {
236+ if !parent.exists() {
237+ std::fs::create_dir_all(parent).ok();
238+ }
239+ }
240+}
241+
230#[cfg(test)]
242#[cfg(test)]
231mod merge_toml_tests {
243mod merge_toml_tests {
232 use std::str;
244 use std::str;
helix-term/src/main.rs+6−18
@@ -4,9 +4,8 @@ use helix_loader::VERSION_AND_GIT_HASH;
4use helix_term::application::Application;
4use helix_term::application::Application;
5use helix_term::args::Args;
5use helix_term::args::Args;
6use helix_term::config::{Config, ConfigLoadError};
6use helix_term::config::{Config, ConfigLoadError};
7−use std::path::PathBuf;
8
7
9−fn setup_logging(logpath: PathBuf, verbosity: u64) -> Result<()> {
8+fn setup_logging(verbosity: u64) -> Result<()> {
10 let mut base_config = fern::Dispatch::new();
9 let mut base_config = fern::Dispatch::new();
11
10
12 base_config = match verbosity {
11 base_config = match verbosity {
@@ -27,7 +26,7 @@ fn setup_logging(logpath: PathBuf, verbosity: u64) -> Result<()> {
27 message
26 message
28 ))
27 ))
29 })
28 })
30− .chain(fern::log_file(logpath)?);
29+ .chain(fern::log_file(helix_loader::log_file())?);
31
30
32 base_config.chain(file_config).apply()?;
31 base_config.chain(file_config).apply()?;
33
32
@@ -41,12 +40,6 @@ fn main() -> Result<()> {
41
40
42#[tokio::main]
41#[tokio::main]
43async fn main_impl() -> Result<i32> {
42async fn main_impl() -> Result<i32> {
44− let logpath = helix_loader::log_file();
45− let parent = logpath.parent().unwrap();
46− if !parent.exists() {
47− std::fs::create_dir_all(parent).ok();
48− }
49−
50 let help = format!(
43 let help = format!(
51 "\
44 "\
52{} {}
45{} {}
@@ -78,7 +71,7 @@ FLAGS:
78 VERSION_AND_GIT_HASH,
71 VERSION_AND_GIT_HASH,
79 env!("CARGO_PKG_AUTHORS"),
72 env!("CARGO_PKG_AUTHORS"),
80 env!("CARGO_PKG_DESCRIPTION"),
73 env!("CARGO_PKG_DESCRIPTION"),
81− logpath.display(),
74+ helix_loader::default_log_file().display(),
82 );
75 );
83
76
84 let args = Args::parse_args().context("could not parse arguments")?;
77 let args = Args::parse_args().context("could not parse arguments")?;
@@ -116,15 +109,10 @@ FLAGS:
116 return Ok(0);
109 return Ok(0);
117 }
110 }
118
111
119− let logpath = args.log_file.as_ref().cloned().unwrap_or(logpath);
120− setup_logging(logpath, args.verbosity).context("failed to initialize logging")?;
121−
122− let config_dir = helix_loader::config_dir();
123− if !config_dir.exists() {
124− std::fs::create_dir_all(&config_dir).ok();
125− }
126−
127 helix_loader::initialize_config_file(args.config_file.clone());
112 helix_loader::initialize_config_file(args.config_file.clone());
113+ helix_loader::initialize_log_file(args.log_file.clone());
114+
115+ setup_logging(args.verbosity).context("failed to initialize logging")?;
128
116
129 let config = match Config::load_default() {
117 let config = match Config::load_default() {
130 Ok(config) => config,
118 Ok(config) => config,