diff --git a/src/tokenizer/snapshots/reconcile__tokenizer__character_tokenizer__tests__with_snapshots-2.snap b/src/tokenizer/snapshots/reconcile__tokenizer__character_tokenizer__tests__with_snapshots-2.snap index b61d12a..6c45107 100644 --- a/src/tokenizer/snapshots/reconcile__tokenizer__character_tokenizer__tests__with_snapshots-2.snap +++ b/src/tokenizer/snapshots/reconcile__tokenizer__character_tokenizer__tests__with_snapshots-2.snap @@ -1,142 +1,143 @@ --- source: src/tokenizer/character_tokenizer.rs expression: "character_tokenizer(\" hello, \\nwhere are you?\")" +snapshot_kind: text --- [ Token { - normalised: " ", + normalized: " ", original: " ", is_left_joinable: true, is_right_joinable: true, }, Token { - normalised: "h", + normalized: "h", original: "h", is_left_joinable: true, is_right_joinable: true, }, Token { - normalised: "e", + normalized: "e", original: "e", is_left_joinable: true, is_right_joinable: true, }, Token { - normalised: "l", + normalized: "l", original: "l", is_left_joinable: true, is_right_joinable: true, }, Token { - normalised: "l", + normalized: "l", original: "l", is_left_joinable: true, is_right_joinable: true, }, Token { - normalised: "o", + normalized: "o", original: "o", is_left_joinable: true, is_right_joinable: true, }, Token { - normalised: ",", + normalized: ",", original: ",", is_left_joinable: true, is_right_joinable: true, }, Token { - normalised: " ", + normalized: " ", original: " ", is_left_joinable: true, is_right_joinable: true, }, Token { - normalised: "\n", + normalized: "\n", original: "\n", is_left_joinable: true, is_right_joinable: true, }, Token { - normalised: "w", + normalized: "w", original: "w", is_left_joinable: true, is_right_joinable: true, }, Token { - normalised: "h", + normalized: "h", original: "h", is_left_joinable: true, is_right_joinable: true, }, Token { - normalised: "e", + normalized: "e", original: "e", is_left_joinable: true, is_right_joinable: true, }, Token { - normalised: "r", + normalized: "r", original: "r", is_left_joinable: true, is_right_joinable: true, }, Token { - normalised: "e", + normalized: "e", original: "e", is_left_joinable: true, is_right_joinable: true, }, Token { - normalised: " ", + normalized: " ", original: " ", is_left_joinable: true, is_right_joinable: true, }, Token { - normalised: "a", + normalized: "a", original: "a", is_left_joinable: true, is_right_joinable: true, }, Token { - normalised: "r", + normalized: "r", original: "r", is_left_joinable: true, is_right_joinable: true, }, Token { - normalised: "e", + normalized: "e", original: "e", is_left_joinable: true, is_right_joinable: true, }, Token { - normalised: " ", + normalized: " ", original: " ", is_left_joinable: true, is_right_joinable: true, }, Token { - normalised: "y", + normalized: "y", original: "y", is_left_joinable: true, is_right_joinable: true, }, Token { - normalised: "o", + normalized: "o", original: "o", is_left_joinable: true, is_right_joinable: true, }, Token { - normalised: "u", + normalized: "u", original: "u", is_left_joinable: true, is_right_joinable: true, }, Token { - normalised: "?", + normalized: "?", original: "?", is_left_joinable: true, is_right_joinable: true, diff --git a/src/tokenizer/snapshots/reconcile__tokenizer__line_tokenizer__tests__with_snapshots-2.snap b/src/tokenizer/snapshots/reconcile__tokenizer__line_tokenizer__tests__with_snapshots-2.snap index ec1c89e..78e67ff 100644 --- a/src/tokenizer/snapshots/reconcile__tokenizer__line_tokenizer__tests__with_snapshots-2.snap +++ b/src/tokenizer/snapshots/reconcile__tokenizer__line_tokenizer__tests__with_snapshots-2.snap @@ -5,7 +5,7 @@ snapshot_kind: text --- [ Token { - normalised: "Hello", + normalized: "Hello", original: "Hello", is_left_joinable: true, is_right_joinable: true, diff --git a/src/tokenizer/snapshots/reconcile__tokenizer__line_tokenizer__tests__with_snapshots-3.snap b/src/tokenizer/snapshots/reconcile__tokenizer__line_tokenizer__tests__with_snapshots-3.snap index c45029a..648073a 100644 --- a/src/tokenizer/snapshots/reconcile__tokenizer__line_tokenizer__tests__with_snapshots-3.snap +++ b/src/tokenizer/snapshots/reconcile__tokenizer__line_tokenizer__tests__with_snapshots-3.snap @@ -5,19 +5,19 @@ snapshot_kind: text --- [ Token { - normalised: "Hello", + normalized: "Hello", original: "Hello", is_left_joinable: true, is_right_joinable: true, }, Token { - normalised: "\n", + normalized: "\n", original: "\n", is_left_joinable: true, is_right_joinable: true, }, Token { - normalised: "World", + normalized: "World", original: "World", is_left_joinable: true, is_right_joinable: true, diff --git a/src/tokenizer/snapshots/reconcile__tokenizer__line_tokenizer__tests__with_snapshots-4.snap b/src/tokenizer/snapshots/reconcile__tokenizer__line_tokenizer__tests__with_snapshots-4.snap index ad8cf81..5fed364 100644 --- a/src/tokenizer/snapshots/reconcile__tokenizer__line_tokenizer__tests__with_snapshots-4.snap +++ b/src/tokenizer/snapshots/reconcile__tokenizer__line_tokenizer__tests__with_snapshots-4.snap @@ -5,25 +5,25 @@ snapshot_kind: text --- [ Token { - normalised: "Hello", + normalized: "Hello", original: "Hello", is_left_joinable: true, is_right_joinable: true, }, Token { - normalised: "\n", + normalized: "\n", original: "\n", is_left_joinable: true, is_right_joinable: true, }, Token { - normalised: "World", + normalized: "World", original: "World", is_left_joinable: true, is_right_joinable: true, }, Token { - normalised: "\n", + normalized: "\n", original: "\n", is_left_joinable: true, is_right_joinable: true, diff --git a/src/tokenizer/snapshots/reconcile__tokenizer__line_tokenizer__tests__with_snapshots-5.snap b/src/tokenizer/snapshots/reconcile__tokenizer__line_tokenizer__tests__with_snapshots-5.snap index ef1f9cb..2a5cac0 100644 --- a/src/tokenizer/snapshots/reconcile__tokenizer__line_tokenizer__tests__with_snapshots-5.snap +++ b/src/tokenizer/snapshots/reconcile__tokenizer__line_tokenizer__tests__with_snapshots-5.snap @@ -5,19 +5,19 @@ snapshot_kind: text --- [ Token { - normalised: "Line 1", + normalized: "Line 1", original: "Line 1", is_left_joinable: true, is_right_joinable: true, }, Token { - normalised: "\r\n", + normalized: "\r\n", original: "\r\n", is_left_joinable: true, is_right_joinable: true, }, Token { - normalised: "Line 2", + normalized: "Line 2", original: "Line 2", is_left_joinable: true, is_right_joinable: true, diff --git a/src/tokenizer/snapshots/reconcile__tokenizer__line_tokenizer__tests__with_snapshots-6.snap b/src/tokenizer/snapshots/reconcile__tokenizer__line_tokenizer__tests__with_snapshots-6.snap index 5edb790..f42abb2 100644 --- a/src/tokenizer/snapshots/reconcile__tokenizer__line_tokenizer__tests__with_snapshots-6.snap +++ b/src/tokenizer/snapshots/reconcile__tokenizer__line_tokenizer__tests__with_snapshots-6.snap @@ -5,43 +5,43 @@ snapshot_kind: text --- [ Token { - normalised: "Multi", + normalized: "Multi", original: "Multi", is_left_joinable: true, is_right_joinable: true, }, Token { - normalised: "\n", + normalized: "\n", original: "\n", is_left_joinable: true, is_right_joinable: true, }, Token { - normalised: "Line", + normalized: "Line", original: "Line", is_left_joinable: true, is_right_joinable: true, }, Token { - normalised: "\n", + normalized: "\n", original: "\n", is_left_joinable: true, is_right_joinable: true, }, Token { - normalised: "Text", + normalized: "Text", original: "Text", is_left_joinable: true, is_right_joinable: true, }, Token { - normalised: "\n", + normalized: "\n", original: "\n", is_left_joinable: true, is_right_joinable: true, }, Token { - normalised: "Here", + normalized: "Here", original: "Here", is_left_joinable: true, is_right_joinable: true, diff --git a/src/tokenizer/snapshots/reconcile__tokenizer__line_tokenizer__tests__with_snapshots-7.snap b/src/tokenizer/snapshots/reconcile__tokenizer__line_tokenizer__tests__with_snapshots-7.snap index 8dcdba8..fbbd511 100644 --- a/src/tokenizer/snapshots/reconcile__tokenizer__line_tokenizer__tests__with_snapshots-7.snap +++ b/src/tokenizer/snapshots/reconcile__tokenizer__line_tokenizer__tests__with_snapshots-7.snap @@ -5,7 +5,7 @@ snapshot_kind: text --- [ Token { - normalised: "\n", + normalized: "\n", original: "\n", is_left_joinable: true, is_right_joinable: true, diff --git a/src/tokenizer/snapshots/reconcile__tokenizer__line_tokenizer__tests__with_snapshots-8.snap b/src/tokenizer/snapshots/reconcile__tokenizer__line_tokenizer__tests__with_snapshots-8.snap index 8466643..0e55867 100644 --- a/src/tokenizer/snapshots/reconcile__tokenizer__line_tokenizer__tests__with_snapshots-8.snap +++ b/src/tokenizer/snapshots/reconcile__tokenizer__line_tokenizer__tests__with_snapshots-8.snap @@ -5,13 +5,13 @@ snapshot_kind: text --- [ Token { - normalised: "\n", + normalized: "\n", original: "\n", is_left_joinable: true, is_right_joinable: true, }, Token { - normalised: "\n", + normalized: "\n", original: "\n", is_left_joinable: true, is_right_joinable: true, diff --git a/src/tokenizer/snapshots/reconcile__tokenizer__line_tokenizer__tests__with_snapshots-9.snap b/src/tokenizer/snapshots/reconcile__tokenizer__line_tokenizer__tests__with_snapshots-9.snap index 9c2be98..bb717c4 100644 --- a/src/tokenizer/snapshots/reconcile__tokenizer__line_tokenizer__tests__with_snapshots-9.snap +++ b/src/tokenizer/snapshots/reconcile__tokenizer__line_tokenizer__tests__with_snapshots-9.snap @@ -5,25 +5,25 @@ snapshot_kind: text --- [ Token { - normalised: "Start", + normalized: "Start", original: "Start", is_left_joinable: true, is_right_joinable: true, }, Token { - normalised: "\n", + normalized: "\n", original: "\n", is_left_joinable: true, is_right_joinable: true, }, Token { - normalised: "\n", + normalized: "\n", original: "\n", is_left_joinable: true, is_right_joinable: true, }, Token { - normalised: "End", + normalized: "End", original: "End", is_left_joinable: true, is_right_joinable: true, diff --git a/src/tokenizer/snapshots/reconcile__tokenizer__word_tokenizer__tests__with_snapshots-3.snap b/src/tokenizer/snapshots/reconcile__tokenizer__word_tokenizer__tests__with_snapshots-3.snap index d1c94e1..6db03d3 100644 --- a/src/tokenizer/snapshots/reconcile__tokenizer__word_tokenizer__tests__with_snapshots-3.snap +++ b/src/tokenizer/snapshots/reconcile__tokenizer__word_tokenizer__tests__with_snapshots-3.snap @@ -1,23 +1,23 @@ --- -source: reconcile/src/tokenizer/word_tokenizer.rs +source: src/tokenizer/word_tokenizer.rs expression: "word_tokenizer(\" what? \")" snapshot_kind: text --- [ Token { - normalised: " what?", + normalized: " what?", original: " ", is_left_joinable: true, is_right_joinable: true, }, Token { - normalised: "what?", + normalized: "what?", original: "what?", is_left_joinable: true, is_right_joinable: true, }, Token { - normalised: " ", + normalized: " ", original: " ", is_left_joinable: true, is_right_joinable: true, diff --git a/src/tokenizer/snapshots/reconcile__tokenizer__word_tokenizer__tests__with_snapshots-4.snap b/src/tokenizer/snapshots/reconcile__tokenizer__word_tokenizer__tests__with_snapshots-4.snap index 6740dbc..ed332f1 100644 --- a/src/tokenizer/snapshots/reconcile__tokenizer__word_tokenizer__tests__with_snapshots-4.snap +++ b/src/tokenizer/snapshots/reconcile__tokenizer__word_tokenizer__tests__with_snapshots-4.snap @@ -1,53 +1,53 @@ --- -source: reconcile/src/tokenizer/word_tokenizer.rs +source: src/tokenizer/word_tokenizer.rs expression: "word_tokenizer(\" hello, \\nwhere are you?\")" snapshot_kind: text --- [ Token { - normalised: " hello,", + normalized: " hello,", original: " ", is_left_joinable: true, is_right_joinable: true, }, Token { - normalised: "hello,", + normalized: "hello,", original: "hello,", is_left_joinable: true, is_right_joinable: true, }, Token { - normalised: " \nwhere", + normalized: " \nwhere", original: " \n", is_left_joinable: true, is_right_joinable: true, }, Token { - normalised: "where", + normalized: "where", original: "where", is_left_joinable: true, is_right_joinable: true, }, Token { - normalised: " are", + normalized: " are", original: " ", is_left_joinable: true, is_right_joinable: true, }, Token { - normalised: "are", + normalized: "are", original: "are", is_left_joinable: true, is_right_joinable: true, }, Token { - normalised: " you?", + normalized: " you?", original: " ", is_left_joinable: true, is_right_joinable: true, }, Token { - normalised: "you?", + normalized: "you?", original: "you?", is_left_joinable: true, is_right_joinable: true, diff --git a/src/tokenizer/snapshots/reconcile__tokenizer__word_tokenizer__tests__with_snapshots.snap b/src/tokenizer/snapshots/reconcile__tokenizer__word_tokenizer__tests__with_snapshots.snap index 95c8db5..8a2b0ec 100644 --- a/src/tokenizer/snapshots/reconcile__tokenizer__word_tokenizer__tests__with_snapshots.snap +++ b/src/tokenizer/snapshots/reconcile__tokenizer__word_tokenizer__tests__with_snapshots.snap @@ -1,23 +1,23 @@ --- -source: reconcile/src/tokenizer/word_tokenizer.rs +source: src/tokenizer/word_tokenizer.rs expression: "word_tokenizer(\"Hi there!\")" snapshot_kind: text --- [ Token { - normalised: "Hi", + normalized: "Hi", original: "Hi", is_left_joinable: true, is_right_joinable: true, }, Token { - normalised: " there!", + normalized: " there!", original: " ", is_left_joinable: true, is_right_joinable: true, }, Token { - normalised: "there!", + normalized: "there!", original: "there!", is_left_joinable: true, is_right_joinable: true, diff --git a/src/utils/snapshots/reconcile__utils__myers_diff__tests__complex_diff.snap b/src/utils/snapshots/reconcile__utils__myers_diff__tests__complex_diff.snap index 98ef83c..a28cf05 100644 --- a/src/utils/snapshots/reconcile__utils__myers_diff__tests__complex_diff.snap +++ b/src/utils/snapshots/reconcile__utils__myers_diff__tests__complex_diff.snap @@ -1,12 +1,13 @@ --- source: src/utils/myers_diff.rs expression: result +snapshot_kind: text --- [ Equal( [ Token { - normalised: "a", + normalized: "a", original: "a", is_left_joinable: true, is_right_joinable: true, @@ -16,7 +17,7 @@ expression: result Insert( [ Token { - normalised: "x", + normalized: "x", original: "x", is_left_joinable: true, is_right_joinable: true, @@ -26,7 +27,7 @@ expression: result Delete( [ Token { - normalised: "b", + normalized: "b", original: "b", is_left_joinable: true, is_right_joinable: true, @@ -36,7 +37,7 @@ expression: result Equal( [ Token { - normalised: "c", + normalized: "c", original: "c", is_left_joinable: true, is_right_joinable: true, @@ -46,7 +47,7 @@ expression: result Insert( [ Token { - normalised: "y", + normalized: "y", original: "y", is_left_joinable: true, is_right_joinable: true, @@ -56,7 +57,7 @@ expression: result Delete( [ Token { - normalised: "d", + normalized: "d", original: "d", is_left_joinable: true, is_right_joinable: true, diff --git a/src/utils/snapshots/reconcile__utils__myers_diff__tests__delete_only.snap b/src/utils/snapshots/reconcile__utils__myers_diff__tests__delete_only.snap index 1c01e1a..d4f02da 100644 --- a/src/utils/snapshots/reconcile__utils__myers_diff__tests__delete_only.snap +++ b/src/utils/snapshots/reconcile__utils__myers_diff__tests__delete_only.snap @@ -1,12 +1,13 @@ --- source: src/utils/myers_diff.rs expression: result +snapshot_kind: text --- [ Delete( [ Token { - normalised: "a", + normalized: "a", original: "a", is_left_joinable: true, is_right_joinable: true, @@ -16,7 +17,7 @@ expression: result Delete( [ Token { - normalised: "b", + normalized: "b", original: "b", is_left_joinable: true, is_right_joinable: true, diff --git a/src/utils/snapshots/reconcile__utils__myers_diff__tests__identical_content.snap b/src/utils/snapshots/reconcile__utils__myers_diff__tests__identical_content.snap index f942a17..cf7f0a8 100644 --- a/src/utils/snapshots/reconcile__utils__myers_diff__tests__identical_content.snap +++ b/src/utils/snapshots/reconcile__utils__myers_diff__tests__identical_content.snap @@ -1,12 +1,13 @@ --- source: src/utils/myers_diff.rs expression: result +snapshot_kind: text --- [ Equal( [ Token { - normalised: "a", + normalized: "a", original: "a", is_left_joinable: true, is_right_joinable: true, @@ -16,7 +17,7 @@ expression: result Equal( [ Token { - normalised: "b", + normalized: "b", original: "b", is_left_joinable: true, is_right_joinable: true, @@ -26,7 +27,7 @@ expression: result Equal( [ Token { - normalised: "c", + normalized: "c", original: "c", is_left_joinable: true, is_right_joinable: true, diff --git a/src/utils/snapshots/reconcile__utils__myers_diff__tests__insert_only.snap b/src/utils/snapshots/reconcile__utils__myers_diff__tests__insert_only.snap index 0b40f12..3597f64 100644 --- a/src/utils/snapshots/reconcile__utils__myers_diff__tests__insert_only.snap +++ b/src/utils/snapshots/reconcile__utils__myers_diff__tests__insert_only.snap @@ -1,12 +1,13 @@ --- source: src/utils/myers_diff.rs expression: result +snapshot_kind: text --- [ Insert( [ Token { - normalised: "a", + normalized: "a", original: "a", is_left_joinable: true, is_right_joinable: true, @@ -16,7 +17,7 @@ expression: result Insert( [ Token { - normalised: "b", + normalized: "b", original: "b", is_left_joinable: true, is_right_joinable: true, diff --git a/src/utils/snapshots/reconcile__utils__myers_diff__tests__prefix_and_suffix.snap b/src/utils/snapshots/reconcile__utils__myers_diff__tests__prefix_and_suffix.snap index 59f4997..aeb360e 100644 --- a/src/utils/snapshots/reconcile__utils__myers_diff__tests__prefix_and_suffix.snap +++ b/src/utils/snapshots/reconcile__utils__myers_diff__tests__prefix_and_suffix.snap @@ -1,12 +1,13 @@ --- source: src/utils/myers_diff.rs expression: result +snapshot_kind: text --- [ Equal( [ Token { - normalised: "a", + normalized: "a", original: "a", is_left_joinable: true, is_right_joinable: true, @@ -16,7 +17,7 @@ expression: result Delete( [ Token { - normalised: "b", + normalized: "b", original: "b", is_left_joinable: true, is_right_joinable: true, @@ -26,7 +27,7 @@ expression: result Delete( [ Token { - normalised: "c", + normalized: "c", original: "c", is_left_joinable: true, is_right_joinable: true, @@ -36,7 +37,7 @@ expression: result Insert( [ Token { - normalised: "x", + normalized: "x", original: "x", is_left_joinable: true, is_right_joinable: true, @@ -46,7 +47,7 @@ expression: result Equal( [ Token { - normalised: "d", + normalized: "d", original: "d", is_left_joinable: true, is_right_joinable: true,