suimeng
/
helix
mirror of https://github.com/helix-editor/helix
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6 from MatrixManAtYrService/load-from-local 

Optionally load init.scm and helix.scm from .helix/
pull/8675/merge^2
Matthew Paras 2024-10-05 09:54:00 -07:00 committed by GitHub
parent b699f395c2 87496a8b1e
commit 4c82a21b27
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
helix-term/src/commands/engine/steel.rs
View File

@ -2,7 +2,7 @@ use arc_swap::ArcSwapAny;
use helix_core::{
diagnostic::Severity,
extensions::steel_implementations::{rope_module, SteelRopeSlice},
graphemes,
find_workspace, graphemes,
shellwords::Shellwords,
syntax::{AutoPairConfig, SoftWrap},
Range, Selection, Tendril,
@ -1198,12 +1198,25 @@ pub fn is_keymap(keymap: SteelVal) -> bool {
}
}
fn local_config_exists() -> bool {
let local_helix = find_workspace().0.join(".helix");
local_helix.join("helix.scm").exists() && local_helix.join("init.scm").exists()
}
fn preferred_config_path(file_name: &str) -> PathBuf {
if local_config_exists() {
find_workspace().0.join(".helix").join(file_name)
} else {
helix_loader::config_dir().join(file_name)
}
}
pub fn helix_module_file() -> PathBuf {
helix_loader::config_dir().join("helix.scm")
preferred_config_path("helix.scm")
}
pub fn steel_init_file() -> PathBuf {
helix_loader::config_dir().join("init.scm")
preferred_config_path("init.scm")
}
#[derive(Clone)]