TudbuT/helix-mods
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

adding support for jujutsu VCS inside find_workspace resolution (#11685)

Browse source
This commit is contained in:
Théo Daron 2024-09-21 19:22:50 +02:00 • committed by GitHub
parent c850b90f67
commit 896bf47d8d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
helix-loader/src/lib.rs
View file

@ -225,7 +225,7 @@ pub fn merge_toml_values(left: toml::Value, right: toml::Value, merge_depth: usi
/// Used as a ceiling dir for LSP root resolution, the filepicker and potentially as a future filewatching root /// Used as a ceiling dir for LSP root resolution, the filepicker and potentially as a future filewatching root
/// ///
/// This function starts searching the FS upward from the CWD /// This function starts searching the FS upward from the CWD
/// and returns the first directory that contains either `.git`, `.svn` or `.helix`. /// and returns the first directory that contains either `.git`, `.svn`, `.jj` or `.helix`.
/// If no workspace was found returns (CWD, true). /// If no workspace was found returns (CWD, true).
/// Otherwise (workspace, false) is returned /// Otherwise (workspace, false) is returned
pub fn find_workspace() -> (PathBuf, bool) { pub fn find_workspace() -> (PathBuf, bool) {
@ -233,6 +233,7 @@ pub fn find_workspace() -> (PathBuf, bool) {
for ancestor in current_dir.ancestors() { for ancestor in current_dir.ancestors() {
if ancestor.join(".git").exists() if ancestor.join(".git").exists()
|| ancestor.join(".svn").exists() || ancestor.join(".svn").exists()
|| ancestor.join(".jj").exists()
|| ancestor.join(".helix").exists() || ancestor.join(".helix").exists()
{ {
return (ancestor.to_owned(), false); return (ancestor.to_owned(), false);