888f4fef6f
* Split helix_core::find_root and helix_loader::find_local_config_dirs The documentation of find_root described the following priority for detecting a project root: - Top-most folder containing a root marker in current git repository - Git repository root if no marker detected - Top-most folder containing a root marker if not git repository detected - Current working directory as fallback The commit contained in https://github.com/helix-editor/helix/pull/1249 extracted and changed the implementation of find_root in find_root_impl, actually reversing its result order (since that is the order that made sense for the local configuration merge, from innermost to outermost ancestors). Since the two uses of find_root_impl have different requirements (and it's not a matter of reversing the order of results since, e.g., the top repository dir should be used by find_root only if there's not marker in other dirs), this PR splits the two implementations in two different specialized functions. In doing so, find_root_impl is removed and the implementation is moved back in find_root, moving it closer to the documented behaviour thus making it easier to verify it's actually correct * helix-core: remove Option from find_root return type It always returns some result, so Option is not needed
109 lines
2.9 KiB
Rust
109 lines
2.9 KiB
Rust
pub use encoding_rs as encoding;
|
|
|
|
pub mod auto_pairs;
|
|
pub mod chars;
|
|
pub mod comment;
|
|
pub mod config;
|
|
pub mod diagnostic;
|
|
pub mod diff;
|
|
pub mod graphemes;
|
|
pub mod history;
|
|
pub mod increment;
|
|
pub mod indent;
|
|
pub mod line_ending;
|
|
pub mod macros;
|
|
pub mod match_brackets;
|
|
pub mod movement;
|
|
pub mod object;
|
|
pub mod path;
|
|
mod position;
|
|
pub mod register;
|
|
pub mod search;
|
|
pub mod selection;
|
|
pub mod shellwords;
|
|
mod state;
|
|
pub mod surround;
|
|
pub mod syntax;
|
|
pub mod test;
|
|
pub mod textobject;
|
|
mod transaction;
|
|
pub mod wrap;
|
|
|
|
pub mod unicode {
|
|
pub use unicode_general_category as category;
|
|
pub use unicode_segmentation as segmentation;
|
|
pub use unicode_width as width;
|
|
}
|
|
|
|
pub fn find_first_non_whitespace_char(line: RopeSlice) -> Option<usize> {
|
|
line.chars().position(|ch| !ch.is_whitespace())
|
|
}
|
|
|
|
/// Find project root.
|
|
///
|
|
/// Order of detection:
|
|
/// * Top-most folder containing a root marker in current git repository
|
|
/// * Git repository root if no marker detected
|
|
/// * Top-most folder containing a root marker if not git repository detected
|
|
/// * Current working directory as fallback
|
|
pub fn find_root(root: Option<&str>, root_markers: &[String]) -> std::path::PathBuf {
|
|
let current_dir = std::env::current_dir().expect("unable to determine current directory");
|
|
|
|
let root = match root {
|
|
Some(root) => {
|
|
let root = std::path::Path::new(root);
|
|
if root.is_absolute() {
|
|
root.to_path_buf()
|
|
} else {
|
|
current_dir.join(root)
|
|
}
|
|
}
|
|
None => current_dir.clone(),
|
|
};
|
|
|
|
let mut top_marker = None;
|
|
for ancestor in root.ancestors() {
|
|
if root_markers
|
|
.iter()
|
|
.any(|marker| ancestor.join(marker).exists())
|
|
{
|
|
top_marker = Some(ancestor);
|
|
}
|
|
|
|
if ancestor.join(".git").is_dir() {
|
|
// Top marker is repo root if not root marker was detected yet
|
|
if top_marker.is_none() {
|
|
top_marker = Some(ancestor);
|
|
}
|
|
// Don't go higher than repo if we're in one
|
|
break;
|
|
}
|
|
}
|
|
|
|
// Return the found top marker or the current_dir as fallback
|
|
top_marker.map_or(current_dir, |a| a.to_path_buf())
|
|
}
|
|
|
|
pub use ropey::{str_utils, Rope, RopeBuilder, RopeSlice};
|
|
|
|
// pub use tendril::StrTendril as Tendril;
|
|
pub use smartstring::SmartString;
|
|
|
|
pub type Tendril = SmartString<smartstring::LazyCompact>;
|
|
|
|
#[doc(inline)]
|
|
pub use {regex, tree_sitter};
|
|
|
|
pub use graphemes::RopeGraphemes;
|
|
pub use position::{
|
|
coords_at_pos, pos_at_coords, pos_at_visual_coords, visual_coords_at_pos, Position,
|
|
};
|
|
pub use selection::{Range, Selection};
|
|
pub use smallvec::{smallvec, SmallVec};
|
|
pub use syntax::Syntax;
|
|
|
|
pub use diagnostic::Diagnostic;
|
|
pub use state::State;
|
|
|
|
pub use line_ending::{LineEnding, DEFAULT_LINE_ENDING};
|
|
pub use transaction::{Assoc, Change, ChangeSet, Operation, Transaction};
|