andras/reconcile
andras/reconcile
Watch
1
0
Fork
You've already forked reconcile
 0
Code Issues Pull requests 10 Projects Releases Packages Wiki Activity Actions

Rename package

Browse source
This commit is contained in:
Andras Schmelczer 2025-07-09 23:21:01 +01:00
commit 7e9ea69a08
No known key found for this signature in database
GPG key ID: FC8F2C3D3D1A718C
27 changed files with 58 additions and 209 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/lib.rs
View file

@ -12,7 +12,7 @@
//! ✨ **[Try the interactive demo](https://schmelczer.dev/reconcile)** to see it in action!
//!
//! ```
//! use reconcile::{reconcile, BuiltinTokenizer};
//! use reconcile_text::{reconcile, BuiltinTokenizer};
//!
//! // Start with original text
//! let parent = "Merging text is hard!";
@ -34,7 +34,7 @@
//! ### Built-in tokenisers
//!
//! ```
//! use reconcile::{reconcile, BuiltinTokenizer};
//! use reconcile_text::{reconcile, BuiltinTokenizer};
//!
//! let parent = "The quick brown fox\n";
//! let left = "The very quick brown fox\n"; // Added "very"
@ -51,7 +51,7 @@
//! you can implement custom tokenisation logic:
//!
//! ```
//! use reconcile::{reconcile, Token, BuiltinTokenizer};
//! use reconcile_text::{reconcile, Token, BuiltinTokenizer};
//!
//! // Example: custom sentence-based tokeniser
//! let sentence_tokeniser = |text: &str| {
@ -83,7 +83,7 @@
//! cursors and selection ranges during merging:
//!
//! ```
//! use reconcile::{reconcile, BuiltinTokenizer, TextWithCursors, CursorPosition};
//! use reconcile_text::{reconcile, BuiltinTokenizer, TextWithCursors, CursorPosition};
//!
//! let parent = "Hello world";
//! let left = TextWithCursors::new(

2
src/operation_transformation.rs
View file

@ -29,7 +29,7 @@ use crate::{
/// granularity of words.
///
/// ```
/// use reconcile::{reconcile, BuiltinTokenizer};
/// use reconcile_text::{reconcile, BuiltinTokenizer};
///
/// let parent = "Merging text is hard!";
/// let left = "Merging text is easy!";

61
src/operation_transformation/snapshots/reconcile__operations__edited_text__tests__calculate_operations.snap
View file

@ -1,61 +0,0 @@
---
source: reconcile/src/operations/edited_text.rs
expression: operations
snapshot_kind: text
---
EditedText {
text: "hello world! How are you? Adam",
operations: [
OrderedOperation {
order: 0,
operation: Insert {
index: 0,
text: "Hello, my friend! ",
},
},
OrderedOperation {
order: 0,
operation: Delete {
index: 18,
deleted_character_count: 13,
deleted_text: Some(
"hello world! ",
),
},
},
OrderedOperation {
order: 21,
operation: Delete {
index: 26,
deleted_character_count: 5,
deleted_text: Some(
"you? ",
),
},
},
OrderedOperation {
order: 26,
operation: Delete {
index: 26,
deleted_character_count: 5,
deleted_text: Some(
" Adam",
),
},
},
OrderedOperation {
order: 31,
operation: Insert {
index: 26,
text: "you ",
},
},
OrderedOperation {
order: 31,
operation: Insert {
index: 30,
text: "doing? Albert",
},
},
],
}

60
src/operation_transformation/snapshots/reconcile__operations__operation_sequence__tests__calculate_operations.snap
View file

@ -1,60 +0,0 @@
---
source: reconcile/src/operations/operation_sequence.rs
expression: operations
snapshot_kind: text
---
EditedText {
operations: [
OrderedOperation {
order: 0,
operation: Insert {
index: 0,
text: "Hello, my friend! ",
},
},
OrderedOperation {
order: 0,
operation: Delete {
index: 18,
deleted_character_count: 13,
deleted_text: Some(
"hello world! ",
),
},
},
OrderedOperation {
order: 21,
operation: Delete {
index: 26,
deleted_character_count: 5,
deleted_text: Some(
"you? ",
),
},
},
OrderedOperation {
order: 26,
operation: Delete {
index: 26,
deleted_character_count: 5,
deleted_text: Some(
" Adam",
),
},
},
OrderedOperation {
order: 31,
operation: Insert {
index: 26,
text: "you ",
},
},
OrderedOperation {
order: 31,
operation: Insert {
index: 30,
text: "doing? Albert",
},
},
],
}

19
src/operation_transformation/snapshots/reconcile_text__operation_transformation__edited_text__tests__calculate_operations.snap Normal file
View file

@ -0,0 +1,19 @@
---
source: src/operation_transformation/edited_text.rs
expression: operations
snapshot_kind: text
---
EditedText {
text: "hello world! How are you? Adam",
operations: [
<delete 'hello world!' from 0>,
<insert 'Hello, my friend!' at 12>,
<equal ' ' from 12>,
<equal 'How' from 13>,
<equal ' ' from 16>,
<equal 'are' from 17>,
<delete ' you? Adam' from 20>,
<insert ' you doing? Albert' at 31>,
],
cursors: [],
}

14
src/operation_transformation/snapshots/reconcile_text__operation_transformation__edited_text__tests__calculate_operations_with_no_diff.snap Normal file
View file

@ -0,0 +1,14 @@
---
source: src/operation_transformation/edited_text.rs
expression: operations
snapshot_kind: text
---
EditedText {
text: "hello world!",
operations: [
<equal 'hello' from 0>,
<equal ' ' from 5>,
<equal 'world!' from 6>,
],
cursors: [],
}

39
src/tokenizer/snapshots/reconcile__tokenizer__word_tokenizer__tests__with_snapshots-5.snap
View file

@ -1,39 +0,0 @@
---
source: reconcile/src/tokenizer/word_tokenizer.rs
expression: "word_tokenizer(\" hello, \\nwhere are you?\")"
snapshot_kind: text
---
[
Token {
normalised: " ",
original: " ",
},
Token {
normalised: "hello,",
original: "hello,",
},
Token {
normalised: " \n",
original: " \n",
},
Token {
normalised: "where",
original: "where",
},
Token {
normalised: " ",
original: " ",
},
Token {
normalised: "are",
original: "are",
},
Token {
normalised: " ",
original: " ",
},
Token {
normalised: "you?",
original: "you?",
},
]

145
src/tokenizer/snapshots/reconcile_text__tokenizer__character_tokenizer__tests__with_snapshots-2.snap Normal file
View file

@ -0,0 +1,145 @@
---
source: src/tokenizer/character_tokenizer.rs
expression: "character_tokenizer(\" hello, \\nwhere are you?\")"
snapshot_kind: text
---
[
Token {
normalized: " ",
original: " ",
is_left_joinable: true,
is_right_joinable: true,
},
Token {
normalized: "h",
original: "h",
is_left_joinable: true,
is_right_joinable: true,
},
Token {
normalized: "e",
original: "e",
is_left_joinable: true,
is_right_joinable: true,
},
Token {
normalized: "l",
original: "l",
is_left_joinable: true,
is_right_joinable: true,
},
Token {
normalized: "l",
original: "l",
is_left_joinable: true,
is_right_joinable: true,
},
Token {
normalized: "o",
original: "o",
is_left_joinable: true,
is_right_joinable: true,
},
Token {
normalized: ",",
original: ",",
is_left_joinable: true,
is_right_joinable: true,
},
Token {
normalized: " ",
original: " ",
is_left_joinable: true,
is_right_joinable: true,
},
Token {
normalized: "\n",
original: "\n",
is_left_joinable: true,
is_right_joinable: true,
},
Token {
normalized: "w",
original: "w",
is_left_joinable: true,
is_right_joinable: true,
},
Token {
normalized: "h",
original: "h",
is_left_joinable: true,
is_right_joinable: true,
},
Token {
normalized: "e",
original: "e",
is_left_joinable: true,
is_right_joinable: true,
},
Token {
normalized: "r",
original: "r",
is_left_joinable: true,
is_right_joinable: true,
},
Token {
normalized: "e",
original: "e",
is_left_joinable: true,
is_right_joinable: true,
},
Token {
normalized: " ",
original: " ",
is_left_joinable: true,
is_right_joinable: true,
},
Token {
normalized: "a",
original: "a",
is_left_joinable: true,
is_right_joinable: true,
},
Token {
normalized: "r",
original: "r",
is_left_joinable: true,
is_right_joinable: true,
},
Token {
normalized: "e",
original: "e",
is_left_joinable: true,
is_right_joinable: true,
},
Token {
normalized: " ",
original: " ",
is_left_joinable: true,
is_right_joinable: true,
},
Token {
normalized: "y",
original: "y",
is_left_joinable: true,
is_right_joinable: true,
},
Token {
normalized: "o",
original: "o",
is_left_joinable: true,
is_right_joinable: true,
},
Token {
normalized: "u",
original: "u",
is_left_joinable: true,
is_right_joinable: true,
},
Token {
normalized: "?",
original: "?",
is_left_joinable: true,
is_right_joinable: true,
},
]

6
src/tokenizer/snapshots/reconcile_text__tokenizer__character_tokenizer__tests__with_snapshots.snap Normal file
View file

@ -0,0 +1,6 @@
---
source: src/tokenizer/character_tokenizer.rs
expression: "character_tokenizer(\"\")"
snapshot_kind: text
---
[]

13
src/tokenizer/snapshots/reconcile_text__tokenizer__line_tokenizer__tests__with_snapshots-2.snap Normal file
View file

@ -0,0 +1,13 @@
---
source: src/tokenizer/line_tokenizer.rs
expression: "line_tokenizer(\"Hello\")"
snapshot_kind: text
---
[
Token {
normalized: "Hello",
original: "Hello",
is_left_joinable: true,
is_right_joinable: true,
},
]

25
src/tokenizer/snapshots/reconcile_text__tokenizer__line_tokenizer__tests__with_snapshots-3.snap Normal file
View file

@ -0,0 +1,25 @@
---
source: src/tokenizer/line_tokenizer.rs
expression: "line_tokenizer(\"Hello\\nWorld\")"
snapshot_kind: text
---
[
Token {
normalized: "Hello",
original: "Hello",
is_left_joinable: true,
is_right_joinable: true,
},
Token {
normalized: "\n",
original: "\n",
is_left_joinable: true,
is_right_joinable: true,
},
Token {
normalized: "World",
original: "World",
is_left_joinable: true,
is_right_joinable: true,
},
]

31
src/tokenizer/snapshots/reconcile_text__tokenizer__line_tokenizer__tests__with_snapshots-4.snap Normal file
View file

@ -0,0 +1,31 @@
---
source: src/tokenizer/line_tokenizer.rs
expression: "line_tokenizer(\"Hello\\nWorld\\n\")"
snapshot_kind: text
---
[
Token {
normalized: "Hello",
original: "Hello",
is_left_joinable: true,
is_right_joinable: true,
},
Token {
normalized: "\n",
original: "\n",
is_left_joinable: true,
is_right_joinable: true,
},
Token {
normalized: "World",
original: "World",
is_left_joinable: true,
is_right_joinable: true,
},
Token {
normalized: "\n",
original: "\n",
is_left_joinable: true,
is_right_joinable: true,
},
]

25
src/tokenizer/snapshots/reconcile_text__tokenizer__line_tokenizer__tests__with_snapshots-5.snap Normal file
View file

@ -0,0 +1,25 @@
---
source: src/tokenizer/line_tokenizer.rs
expression: "line_tokenizer(\"Line 1\\r\\nLine 2\")"
snapshot_kind: text
---
[
Token {
normalized: "Line 1",
original: "Line 1",
is_left_joinable: true,
is_right_joinable: true,
},
Token {
normalized: "\r\n",
original: "\r\n",
is_left_joinable: true,
is_right_joinable: true,
},
Token {
normalized: "Line 2",
original: "Line 2",
is_left_joinable: true,
is_right_joinable: true,
},
]

49
src/tokenizer/snapshots/reconcile_text__tokenizer__line_tokenizer__tests__with_snapshots-6.snap Normal file
View file

@ -0,0 +1,49 @@
---
source: src/tokenizer/line_tokenizer.rs
expression: "line_tokenizer(\"Multi\\nLine\\nText\\nHere\")"
snapshot_kind: text
---
[
Token {
normalized: "Multi",
original: "Multi",
is_left_joinable: true,
is_right_joinable: true,
},
Token {
normalized: "\n",
original: "\n",
is_left_joinable: true,
is_right_joinable: true,
},
Token {
normalized: "Line",
original: "Line",
is_left_joinable: true,
is_right_joinable: true,
},
Token {
normalized: "\n",
original: "\n",
is_left_joinable: true,
is_right_joinable: true,
},
Token {
normalized: "Text",
original: "Text",
is_left_joinable: true,
is_right_joinable: true,
},
Token {
normalized: "\n",
original: "\n",
is_left_joinable: true,
is_right_joinable: true,
},
Token {
normalized: "Here",
original: "Here",
is_left_joinable: true,
is_right_joinable: true,
},
]

13
src/tokenizer/snapshots/reconcile_text__tokenizer__line_tokenizer__tests__with_snapshots-7.snap Normal file
View file

@ -0,0 +1,13 @@
---
source: src/tokenizer/line_tokenizer.rs
expression: "line_tokenizer(\"\\n\")"
snapshot_kind: text
---
[
Token {
normalized: "\n",
original: "\n",
is_left_joinable: true,
is_right_joinable: true,
},
]

19
src/tokenizer/snapshots/reconcile_text__tokenizer__line_tokenizer__tests__with_snapshots-8.snap Normal file
View file

@ -0,0 +1,19 @@
---
source: src/tokenizer/line_tokenizer.rs
expression: "line_tokenizer(\"\\n\\n\")"
snapshot_kind: text
---
[
Token {
normalized: "\n",
original: "\n",
is_left_joinable: true,
is_right_joinable: true,
},
Token {
normalized: "\n",
original: "\n",
is_left_joinable: true,
is_right_joinable: true,
},
]

31
src/tokenizer/snapshots/reconcile_text__tokenizer__line_tokenizer__tests__with_snapshots-9.snap Normal file
View file

@ -0,0 +1,31 @@
---
source: src/tokenizer/line_tokenizer.rs
expression: "line_tokenizer(\"Start\\n\\nEnd\")"
snapshot_kind: text
---
[
Token {
normalized: "Start",
original: "Start",
is_left_joinable: true,
is_right_joinable: true,
},
Token {
normalized: "\n",
original: "\n",
is_left_joinable: true,
is_right_joinable: true,
},
Token {
normalized: "\n",
original: "\n",
is_left_joinable: true,
is_right_joinable: true,
},
Token {
normalized: "End",
original: "End",
is_left_joinable: true,
is_right_joinable: true,
},
]

6
src/tokenizer/snapshots/reconcile_text__tokenizer__line_tokenizer__tests__with_snapshots.snap Normal file
View file

@ -0,0 +1,6 @@
---
source: src/tokenizer/line_tokenizer.rs
expression: "line_tokenizer(\"\")"
snapshot_kind: text
---
[]

6
src/tokenizer/snapshots/reconcile_text__tokenizer__word_tokenizer__tests__with_snapshots-2.snap Normal file
View file

@ -0,0 +1,6 @@
---
source: src/tokenizer/word_tokenizer.rs
expression: "word_tokenizer(\"\")"
snapshot_kind: text
---
[]

25
src/tokenizer/snapshots/reconcile_text__tokenizer__word_tokenizer__tests__with_snapshots-3.snap Normal file
View file

@ -0,0 +1,25 @@
---
source: src/tokenizer/word_tokenizer.rs
expression: "word_tokenizer(\" what? \")"
snapshot_kind: text
---
[
Token {
normalized: " what?",
original: " ",
is_left_joinable: true,
is_right_joinable: true,
},
Token {
normalized: "what?",
original: "what?",
is_left_joinable: true,
is_right_joinable: true,
},
Token {
normalized: " ",
original: " ",
is_left_joinable: true,
is_right_joinable: true,
},
]

Some files were not shown because too many files have changed in this diff Show more