aboutsummaryrefslogtreecommitdiff
path: root/helix-core
diff options
context:
space:
mode:
authorDmitry Sharshakov2021-08-28 11:59:26 +0000
committerDmitry Sharshakov2021-08-28 11:59:26 +0000
commite3153946311b189bd5e10e816acbdda508ded31c (patch)
tree304e0b8c0b869cc239d8c0ce9b0f328fe589bd93 /helix-core
parent8df6739759396b45d06356dd78c39117590b062b (diff)
parentd6a9c2c0f6f4af98146b52d1c886a1ca99d15676 (diff)
Merge remote-tracking branch 'origin/master' into debug
Diffstat (limited to 'helix-core')
-rw-r--r--helix-core/src/lib.rs83
-rw-r--r--helix-core/src/state.rs24
-rw-r--r--helix-core/src/syntax.rs17
-rw-r--r--helix-core/src/transaction.rs14
4 files changed, 98 insertions, 40 deletions
diff --git a/helix-core/src/lib.rs b/helix-core/src/lib.rs
index be01c302..d971464a 100644
--- a/helix-core/src/lib.rs
+++ b/helix-core/src/lib.rs
@@ -98,6 +98,89 @@ pub fn cache_dir() -> std::path::PathBuf {
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 etcetera::home_dir;
use etcetera::base_strategy::{choose_base_strategy, BaseStrategy};
diff --git a/helix-core/src/state.rs b/helix-core/src/state.rs
index 7e4a7f70..dcc4b11b 100644
--- a/helix-core/src/state.rs
+++ b/helix-core/src/state.rs
@@ -1,6 +1,5 @@
use crate::{Rope, Selection};
-/// A state represents the current editor state of a single buffer.
#[derive(Debug, Clone)]
pub struct State {
pub doc: Rope,
@@ -15,27 +14,4 @@ impl State {
selection: Selection::point(0),
}
}
-
- // update/transact:
- // update(desc) => transaction ? transaction.doc() for applied doc
- // transaction.apply(doc)
- // doc.transact(fn -> ... end)
-
- // replaceSelection (transaction that replaces selection)
- // changeByRange
- // changes
- // slice
- //
- // getters:
- // tabSize
- // indentUnit
- // languageDataAt()
- //
- // config:
- // indentation
- // tabSize
- // lineUnit
- // syntax
- // foldable
- // changeFilter/transactionFilter
}
diff --git a/helix-core/src/syntax.rs b/helix-core/src/syntax.rs
index ae99a159..a7410203 100644
--- a/helix-core/src/syntax.rs
+++ b/helix-core/src/syntax.rs
@@ -1831,15 +1831,14 @@ mod test {
#[test]
fn test_input_edits() {
- use crate::State;
use tree_sitter::InputEdit;
- let state = State::new("hello world!\ntest 123".into());
+ let doc = Rope::from("hello world!\ntest 123");
let transaction = Transaction::change(
- &state.doc,
+ &doc,
vec![(6, 11, Some("test".into())), (12, 17, None)].into_iter(),
);
- let edits = LanguageLayer::generate_edits(state.doc.slice(..), transaction.changes());
+ let edits = LanguageLayer::generate_edits(doc.slice(..), transaction.changes());
// transaction.apply(&mut state);
assert_eq!(
@@ -1865,13 +1864,13 @@ mod test {
);
// Testing with the official example from tree-sitter
- let mut state = State::new("fn test() {}".into());
+ let mut doc = Rope::from("fn test() {}");
let transaction =
- Transaction::change(&state.doc, vec![(8, 8, Some("a: u32".into()))].into_iter());
- let edits = LanguageLayer::generate_edits(state.doc.slice(..), transaction.changes());
- transaction.apply(&mut state.doc);
+ Transaction::change(&doc, vec![(8, 8, Some("a: u32".into()))].into_iter());
+ let edits = LanguageLayer::generate_edits(doc.slice(..), transaction.changes());
+ transaction.apply(&mut doc);
- assert_eq!(state.doc, "fn test(a: u32) {}");
+ assert_eq!(doc, "fn test(a: u32) {}");
assert_eq!(
edits,
&[InputEdit {
diff --git a/helix-core/src/transaction.rs b/helix-core/src/transaction.rs
index e20e550f..d682f058 100644
--- a/helix-core/src/transaction.rs
+++ b/helix-core/src/transaction.rs
@@ -125,7 +125,7 @@ impl ChangeSet {
/// In other words, If `this` goes `docA` → `docB` and `other` represents `docB` → `docC`, the
/// returned value will represent the change `docA` → `docC`.
pub fn compose(self, other: Self) -> Self {
- debug_assert!(self.len_after == other.len);
+ assert!(self.len_after == other.len);
// composing fails in weird ways if one of the sets is empty
// a: [] len: 0 len_after: 1 | b: [Insert(Tendril<UTF8>(inline: "\n")), Retain(1)] len 1
@@ -689,21 +689,21 @@ mod test {
#[test]
fn transaction_change() {
- let mut state = State::new("hello world!\ntest 123".into());
+ let mut doc = Rope::from("hello world!\ntest 123");
let transaction = Transaction::change(
- &state.doc,
+ &doc,
// (1, 1, None) is a useless 0-width delete
vec![(1, 1, None), (6, 11, Some("void".into())), (12, 17, None)].into_iter(),
);
- transaction.apply(&mut state.doc);
- assert_eq!(state.doc, Rope::from_str("hello void! 123"));
+ transaction.apply(&mut doc);
+ assert_eq!(doc, Rope::from_str("hello void! 123"));
}
#[test]
fn changes_iter() {
- let state = State::new("hello world!\ntest 123".into());
+ let doc = Rope::from("hello world!\ntest 123");
let changes = vec![(6, 11, Some("void".into())), (12, 17, None)];
- let transaction = Transaction::change(&state.doc, changes.clone().into_iter());
+ let transaction = Transaction::change(&doc, changes.clone().into_iter());
assert_eq!(transaction.changes_iter().collect::<Vec<_>>(), changes);
}