Skip to content

Span merge review #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 14 commits into from
Closed

Span merge review #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
924e92c
add property testing
pascalkuthe Sep 24, 2022
447270a
fix: use descending order for span ends
pascalkuthe Sep 25, 2022
276e58b
fix: mainting descending span end oder during subslice
pascalkuthe Sep 25, 2022
f73a14e
fix: moving span end past the start
pascalkuthe Sep 25, 2022
db469ec
perf: sort range_ends in descending order
pascalkuthe Sep 25, 2022
8f92c62
refactor: move parts of the SpanIter into seperate functions
pascalkuthe Sep 25, 2022
cead56c
remove useless unit test
pascalkuthe Sep 25, 2022
10c4323
minor consmetic changes
pascalkuthe Sep 26, 2022
7de6f2a
update documentation and replace all mentions of range with span
pascalkuthe Sep 26, 2022
30563c4
make partition_spans_at function more readable
pascalkuthe Sep 26, 2022
8f995d6
skip empty spans
pascalkuthe Sep 26, 2022
8c4fba9
test all events emitted by the span-iter during proptests
pascalkuthe Sep 27, 2022
07cf301
always skip empty spans to avoid incorrect highlights
pascalkuthe Sep 27, 2022
b123aa1
retain descending span end order during partioning
pascalkuthe Sep 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
105 changes: 98 additions & 7 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion helix-core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,6 @@ etcetera = "0.4"
textwrap = "0.15.1"

[dev-dependencies]
quickcheck = { version = "1", default-features = false }

proptest = {version = "1.0", default-features=false, features = ["std"]}
similar-asserts = "1.4.2"
7 changes: 4 additions & 3 deletions helix-core/src/diff.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,14 @@ pub fn compare_ropes(old: &Rope, new: &Rope) -> Transaction {
#[cfg(test)]
mod tests {
use super::*;
use proptest::{prop_assert_eq, proptest};

quickcheck::quickcheck! {
fn test_compare_ropes(a: String, b: String) -> bool {
proptest! {
fn test_compare_ropes(a: String, b: String) {
let mut old = Rope::from(a);
let new = Rope::from(b);
compare_ropes(&old, &new).apply(&mut old);
old == new
prop_assert_eq!(old, new)
}
}
}
Loading