Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'helix-core/src/lib.rs')
-rw-r--r--helix-core/src/lib.rs204
1 files changed, 166 insertions, 38 deletions
diff --git a/helix-core/src/lib.rs b/helix-core/src/lib.rs
index 09865ca4..d971464a 100644
--- a/helix-core/src/lib.rs
+++ b/helix-core/src/lib.rs
@@ -1,38 +1,26 @@
-pub use encoding_rs as encoding;
-
pub mod auto_pairs;
-pub mod case_conversion;
pub mod chars;
-pub mod command_line;
pub mod comment;
-pub mod completion;
-pub mod config;
pub mod diagnostic;
pub mod diff;
-pub mod doc_formatter;
-pub mod editor_config;
-pub mod fuzzy;
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 snippets;
+mod state;
pub mod surround;
pub mod syntax;
-pub mod test;
-pub mod text_annotations;
pub mod textobject;
mod transaction;
-pub mod uri;
-pub mod wrap;
pub mod unicode {
pub use unicode_general_category as category;
@@ -40,38 +28,178 @@ pub mod unicode {
pub use unicode_width as width;
}
-pub use helix_loader::find_workspace;
+static RUNTIME_DIR: once_cell::sync::Lazy<std::path::PathBuf> =
+ once_cell::sync::Lazy::new(runtime_dir);
-mod rope_reader;
+pub fn find_first_non_whitespace_char(line: RopeSlice) -> Option<usize> {
+ line.chars().position(|ch| !ch.is_whitespace())
+}
-pub use rope_reader::RopeReader;
-pub use ropey::{self, str_utils, Rope, RopeBuilder, RopeSlice};
+pub fn find_root(root: Option<&str>) -> Option<std::path::PathBuf> {
+ let current_dir = std::env::current_dir().expect("unable to determine current directory");
-// pub use tendril::StrTendril as Tendril;
-pub use smartstring::SmartString;
+ 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,
+ };
-pub type Tendril = SmartString<smartstring::LazyCompact>;
+ for ancestor in root.ancestors() {
+ // TODO: also use defined roots if git isn't found
+ if ancestor.join(".git").is_dir() {
+ return Some(ancestor.to_path_buf());
+ }
+ }
+ None
+}
-#[doc(inline)]
-pub use {regex, tree_house::tree_sitter};
+pub fn runtime_dir() -> std::path::PathBuf {
+ if let Ok(dir) = std::env::var("HELIX_RUNTIME") {
+ return dir.into();
+ }
+
+ const RT_DIR: &str = "runtime";
+ let conf_dir = config_dir().join(RT_DIR);
+ if conf_dir.exists() {
+ return conf_dir;
+ }
+
+ if let Ok(dir) = std::env::var("CARGO_MANIFEST_DIR") {
+ // this is the directory of the crate being run by cargo, we need the workspace path so we take the parent
+ return std::path::PathBuf::from(dir).parent().unwrap().join(RT_DIR);
+ }
+
+ // fallback to location of the executable being run
+ std::env::current_exe()
+ .ok()
+ .and_then(|path| path.parent().map(|path| path.to_path_buf().join(RT_DIR)))
+ .unwrap()
+}
+
+pub fn config_dir() -> std::path::PathBuf {
+ // TODO: allow env var override
+ let strategy = choose_base_strategy().expect("Unable to find the config directory!");
+ let mut path = strategy.config_dir();
+ path.push("helix");
+ path
+}
+
+pub fn cache_dir() -> std::path::PathBuf {
+ // TODO: allow env var override
+ let strategy = choose_base_strategy().expect("Unable to find the config directory!");
+ let mut path = strategy.cache_dir();
+ path.push("helix");
+ path
+}
+
+// right overrides left
+pub fn merge_toml_values(left: toml::Value, right: toml::Value) -> toml::Value {
+ use toml::Value;
+
+ fn get_name(v: &Value) -> Option<&str> {
+ v.get("name").and_then(Value::as_str)
+ }
+
+ match (left, right) {
+ (Value::Array(mut left_items), Value::Array(right_items)) => {
+ left_items.reserve(right_items.len());
+ for rvalue in right_items {
+ let lvalue = get_name(&rvalue)
+ .and_then(|rname| left_items.iter().position(|v| get_name(v) == Some(rname)))
+ .map(|lpos| left_items.remove(lpos));
+ let mvalue = match lvalue {
+ Some(lvalue) => merge_toml_values(lvalue, rvalue),
+ None => rvalue,
+ };
+ left_items.push(mvalue);
+ }
+ Value::Array(left_items)
+ }
+ (Value::Table(mut left_map), Value::Table(right_map)) => {
+ for (rname, rvalue) in right_map {
+ match left_map.remove(&rname) {
+ Some(lvalue) => {
+ let merged_value = merge_toml_values(lvalue, rvalue);
+ left_map.insert(rname, merged_value);
+ }
+ None => {
+ left_map.insert(rname, rvalue);
+ }
+ }
+ }
+ Value::Table(left_map)
+ }
+ // Catch everything else we didn't handle, and use the right value
+ (_, value) => value,
+ }
+}
+
+#[cfg(test)]
+mod merge_toml_tests {
+ use super::merge_toml_values;
+
+ #[test]
+ fn language_tomls() {
+ use toml::Value;
+
+ const USER: &str = "
+ [[language]]
+ name = \"nix\"
+ test = \"bbb\"
+ indent = { tab-width = 4, unit = \" \", test = \"aaa\" }
+ ";
+
+ let base: Value = toml::from_slice(include_bytes!("../../languages.toml"))
+ .expect("Couldn't parse built-in langauges config");
+ let user: Value = toml::from_str(USER).unwrap();
+
+ let merged = merge_toml_values(base, user);
+ let languages = merged.get("language").unwrap().as_array().unwrap();
+ let nix = languages
+ .iter()
+ .find(|v| v.get("name").unwrap().as_str().unwrap() == "nix")
+ .unwrap();
+ let nix_indent = nix.get("indent").unwrap();
+
+ // We changed tab-width and unit in indent so check them if they are the new values
+ assert_eq!(
+ nix_indent.get("tab-width").unwrap().as_integer().unwrap(),
+ 4
+ );
+ assert_eq!(nix_indent.get("unit").unwrap().as_str().unwrap(), " ");
+ // We added a new keys, so check them
+ assert_eq!(nix.get("test").unwrap().as_str().unwrap(), "bbb");
+ assert_eq!(nix_indent.get("test").unwrap().as_str().unwrap(), "aaa");
+ // We didn't change comment-token so it should be same
+ assert_eq!(nix.get("comment-token").unwrap().as_str().unwrap(), "#");
+ }
+}
-pub use position::{
- char_idx_at_visual_offset, coords_at_pos, pos_at_coords, softwrapped_dimensions,
- visual_offset_from_anchor, visual_offset_from_block, Position, VisualOffsetError,
-};
-#[allow(deprecated)]
-pub use position::{pos_at_visual_coords, visual_coords_at_pos};
+pub use etcetera::home_dir;
+use etcetera::base_strategy::{choose_base_strategy, BaseStrategy};
+
+pub use ropey::{Rope, RopeBuilder, RopeSlice};
+
+pub use tendril::StrTendril as Tendril;
+
+#[doc(inline)]
+pub use {regex, tree_sitter};
+
+pub use graphemes::RopeGraphemes;
+pub use position::{coords_at_pos, pos_at_coords, Position};
pub use selection::{Range, Selection};
-pub use smallvec::{smallvec, SmallVec};
+pub use smallvec::SmallVec;
pub use syntax::Syntax;
-pub use completion::CompletionItem;
pub use diagnostic::Diagnostic;
+pub use state::State;
-pub use line_ending::{LineEnding, NATIVE_LINE_ENDING};
-pub use transaction::{Assoc, Change, ChangeSet, Deletion, Operation, Transaction};
-
-pub use uri::Uri;
-
-pub use tree_house::Language;
+pub use line_ending::{LineEnding, DEFAULT_LINE_ENDING};
+pub use transaction::{Assoc, Change, ChangeSet, Operation, Transaction};