git.iko.soy/helix
on master help sign in
move config parsing back into main
0623a72Skyler Hawthorne
helix-term/src/application.rs+1−20
compare with master
unifiedsplit
@@ -56,29 +56,10 @@ pub struct Application {
56}
56}
57
57
58impl Application {
58impl Application {
59− pub fn new(args: Args) -> Result<Self, Error> {
59+ pub fn new(args: Args, config: Config) -> Result<Self, Error> {
60 use helix_view::editor::Action;
60 use helix_view::editor::Action;
61
61
62 let config_dir = helix_loader::config_dir();
62 let config_dir = helix_loader::config_dir();
63− if !config_dir.exists() {
64− std::fs::create_dir_all(&config_dir).ok();
65− }
66−
67− let config = match std::fs::read_to_string(config_dir.join("config.toml")) {
68− Ok(config) => toml::from_str(&config)
69− .map(crate::keymap::merge_keys)
70− .unwrap_or_else(|err| {
71− eprintln!("Bad config: {}", err);
72− eprintln!("Press <ENTER> to continue with default config");
73− use std::io::Read;
74− // This waits for an enter press.
75− let _ = std::io::stdin().read(&mut []);
76− Config::default()
77− }),
78− Err(err) if err.kind() == std::io::ErrorKind::NotFound => Config::default(),
79− Err(err) => return Err(Error::new(err)),
80− };
81−
82 let theme_loader = std::sync::Arc::new(theme::Loader::new(
63 let theme_loader = std::sync::Arc::new(theme::Loader::new(
83 &config_dir,
64 &config_dir,
84 &helix_loader::runtime_dir(),
65 &helix_loader::runtime_dir(),
helix-term/src/main.rs+23−2
@@ -1,6 +1,7 @@
1−use anyhow::{Context, Result};
1+use anyhow::{Context, Error, Result};
2use helix_term::application::Application;
2use helix_term::application::Application;
3use helix_term::args::Args;
3use helix_term::args::Args;
4+use helix_term::config::Config;
4use std::path::PathBuf;
5use std::path::PathBuf;
5
6
6fn setup_logging(logpath: PathBuf, verbosity: u64) -> Result<()> {
7fn setup_logging(logpath: PathBuf, verbosity: u64) -> Result<()> {
@@ -110,8 +111,28 @@ FLAGS:
110
111
111 setup_logging(logpath, args.verbosity).context("failed to initialize logging")?;
112 setup_logging(logpath, args.verbosity).context("failed to initialize logging")?;
112
113
114+ let config_dir = helix_loader::config_dir();
115+ if !config_dir.exists() {
116+ std::fs::create_dir_all(&config_dir).ok();
117+ }
118+
119+ let config = match std::fs::read_to_string(config_dir.join("config.toml")) {
120+ Ok(config) => toml::from_str(&config)
121+ .map(helix_term::keymap::merge_keys)
122+ .unwrap_or_else(|err| {
123+ eprintln!("Bad config: {}", err);
124+ eprintln!("Press <ENTER> to continue with default config");
125+ use std::io::Read;
126+ // This waits for an enter press.
127+ let _ = std::io::stdin().read(&mut []);
128+ Config::default()
129+ }),
130+ Err(err) if err.kind() == std::io::ErrorKind::NotFound => Config::default(),
131+ Err(err) => return Err(Error::new(err)),
132+ };
133+
113 // TODO: use the thread local executor to spawn the application task separately from the work pool
134 // TODO: use the thread local executor to spawn the application task separately from the work pool
114− let mut app = Application::new(args).context("unable to create new application")?;
135+ let mut app = Application::new(args, config).context("unable to create new application")?;
115
136
116 let exit_code = app.run().await?;
137 let exit_code = app.run().await?;
117
138