andrey/helix-mirror
1
0
Fork 0
mirror of https://github.com/helix-editor/helix.git synced 2024-11-22 17:36:19 +04:00
Code Issues Projects Releases Wiki Activity

avoid repeated loading of config to check persistence config in startup

Browse Source
This commit is contained in:
Ingrid 2024-09-22 14:14:37 +02:00
parent c3ed498dc9
commit 56b1e20ecb
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
helix-term/src/application.rs
View File

@ -143,7 +143,8 @@ pub fn new(args: Args, config: Config, lang_loader: syntax::Loader) -> Result<Se
let mut compositor = Compositor::new(area);
let config = Arc::new(ArcSwap::from_pointee(config));
let handlers = handlers::setup(config.clone());
let old_file_locs = if config.load().editor.persistence.old_files {
let persistence_config = config.load().editor.persistence.clone();
let old_file_locs = if persistence_config.old_files {
HashMap::from_iter(
persistence::read_file_history()
.into_iter()
@ -164,21 +165,21 @@ pub fn new(args: Args, config: Config, lang_loader: syntax::Loader) -> Result<Se
);
// TODO: do most of this in the background?
if config.load().editor.persistence.commands {
if persistence_config.commands {
editor
.registers
.write(':', persistence::read_command_history())
// TODO: do something about this unwrap
.unwrap();
}
if config.load().editor.persistence.search {
if persistence_config.search {
editor
.registers
.write('/', persistence::read_search_history())
// TODO: do something about this unwrap
.unwrap();
}
if config.load().editor.persistence.clipboard {
if persistence_config.clipboard {
editor
.registers
.write('"', persistence::read_clipboard_file())
@ -290,8 +291,8 @@ pub fn new(args: Args, config: Config, lang_loader: syntax::Loader) -> Result<Se
.context("build signal handler")?;
let jobs = Jobs::new();
if config.load().editor.persistence.old_files {
let file_trim = config.load().editor.persistence.old_files_trim;
if persistence_config.old_files {
let file_trim = persistence_config.old_files_trim;
jobs.add(
Job::new(async move {
persistence::trim_file_history(file_trim);
@ -300,8 +301,8 @@ pub fn new(args: Args, config: Config, lang_loader: syntax::Loader) -> Result<Se
.wait_before_exiting(),
);
}
if config.load().editor.persistence.commands {
let commands_trim = config.load().editor.persistence.commands_trim;
if persistence_config.commands {
let commands_trim = persistence_config.commands_trim;
jobs.add(
Job::new(async move {
persistence::trim_command_history(commands_trim);
@ -310,8 +311,8 @@ pub fn new(args: Args, config: Config, lang_loader: syntax::Loader) -> Result<Se
.wait_before_exiting(),
);
}
if config.load().editor.persistence.search {
let search_trim = config.load().editor.persistence.search_trim;
if persistence_config.search {
let search_trim = persistence_config.search_trim;
jobs.add(
Job::new(async move {
persistence::trim_search_history(search_trim);