diff --git a/lua/grug-far/render/resultsList.lua b/lua/grug-far/render/resultsList.lua index 5d7574e5..f93da76c 100644 --- a/lua/grug-far/render/resultsList.lua +++ b/lua/grug-far/render/resultsList.lua @@ -114,6 +114,8 @@ function M.appendResultsChunk(buf, context, data) local resultLocationByExtmarkId = state.resultLocationByExtmarkId ---@type ResultLocation? local lastLocation = nil + ---@type ResultLocation? + local prevLastLocation = nil for i = 1, #data.highlights do local highlight = data.highlights[i] @@ -132,21 +134,32 @@ function M.appendResultsChunk(buf, context, data) local markId = addLocationMark(buf, context, lastline + highlight.start_line, #line, options) resultLocationByExtmarkId[markId] = { filename = state.resultsLastFilename } elseif hl_type == ResultHighlightType.LineNumber then - -- omit ending ':' - state.resultMatchLineCount = state.resultMatchLineCount + 1 - lastLocation = { filename = state.resultsLastFilename, count = state.resultMatchLineCount } + prevLastLocation = lastLocation + lastLocation = { filename = state.resultsLastFilename } + lastLocation.sign = highlight.sign + lastLocation.lnum = tonumber(string.sub(line, highlight.start_col + 1, highlight.end_col)) + lastLocation.text = line + + if + not ( + prevLastLocation + and lastLocation.filename == prevLastLocation.filename + and lastLocation.lnum == prevLastLocation.lnum + ) + then + state.resultMatchLineCount = state.resultMatchLineCount + 1 + lastLocation.count = state.resultMatchLineCount + end + local markId = addLocationMark( buf, context, lastline + highlight.start_line, #line, - { sign = highlight.sign, matchLineCount = state.resultMatchLineCount } + { sign = highlight.sign, matchLineCount = lastLocation.count } ) resultLocationByExtmarkId[markId] = lastLocation - lastLocation.sign = highlight.sign - lastLocation.lnum = tonumber(string.sub(line, highlight.start_col + 1, highlight.end_col)) - lastLocation.text = line if context.options.resultsHighlight and lastLocation.text then addHighlightResult( context, diff --git a/tests/screenshots/tests-astgrep-test_history.lua---replacement-interpreter-swaps-when-reloading-from-history-002 b/tests/screenshots/tests-astgrep-test_history.lua---replacement-interpreter-swaps-when-reloading-from-history-002 index 8d875cb4..e3d309f0 100644 --- a/tests/screenshots/tests-astgrep-test_history.lua---replacement-interpreter-swaps-when-reloading-from-history-002 +++ b/tests/screenshots/tests-astgrep-test_history.lua---replacement-interpreter-swaps-when-reloading-from-history-002 @@ -17,7 +17,7 @@ 16| 17| file2.ts 18|▒ 3:7: grug.walks(talks) [1] -19|▒ 3:7: walks(talks) [2] +19|▒ 3:7: walks(talks) 20| 21|~ 22|~ @@ -43,7 +43,7 @@ 16|00222222222222222222222222222222222222222222222222222222222222222222222222222222 17|00777777772222222222222222222222222222222222222222222222222222222222222222222222 18|88525222222222288888888882222222222222222222222222222222222222222222222222223333 -19|11525222222222211111222222222222222222222222222222222222222222222222222222223333 +19|11525222222222211111222222222222222222222222222222222222222222222222222222222222 20|00222222222222222222222222222222222222222222222222222222222222222222222222222222 21|00000000000000000000000000000000000000000000000000000000000000000000000000000000 22|00000000000000000000000000000000000000000000000000000000000000000000000000000000 diff --git a/tests/screenshots/tests-astgrep-test_lua_interpreter.lua---can-replace-with-replace-interpreter b/tests/screenshots/tests-astgrep-test_lua_interpreter.lua---can-replace-with-replace-interpreter index d019039d..0141e195 100644 --- a/tests/screenshots/tests-astgrep-test_lua_interpreter.lua---can-replace-with-replace-interpreter +++ b/tests/screenshots/tests-astgrep-test_lua_interpreter.lua---can-replace-with-replace-interpreter @@ -17,7 +17,7 @@ 16| 17| file2.ts 18|▒ 3:7: grug.walks(talks) [1] -19|▒ 3:7: grug.walks_walks(talks) [2] +19|▒ 3:7: grug.walks_walks(talks) 20| 21|~ 22|~ @@ -43,7 +43,7 @@ 16|00222222222222222222222222222222222222222222222222222222222222222222222222222222 17|00777777772222222222222222222222222222222222222222222222222222222222222222222222 18|88525222222222288888888882222222222222222222222222222222222222222222222222223333 -19|11525222222222211111111111111112222222222222222222222222222222222222222222223333 +19|11525222222222211111111111111112222222222222222222222222222222222222222222222222 20|00222222222222222222222222222222222222222222222222222222222222222222222222222222 21|00000000000000000000000000000000000000000000000000000000000000000000000000000000 22|00000000000000000000000000000000000000000000000000000000000000000000000000000000 diff --git a/tests/screenshots/tests-astgrep-test_lua_interpreter.lua---can-replace-with-replace-interpreter-and-file-filter b/tests/screenshots/tests-astgrep-test_lua_interpreter.lua---can-replace-with-replace-interpreter-and-file-filter index c1fb2ed8..43b9b3d3 100644 --- a/tests/screenshots/tests-astgrep-test_lua_interpreter.lua---can-replace-with-replace-interpreter-and-file-filter +++ b/tests/screenshots/tests-astgrep-test_lua_interpreter.lua---can-replace-with-replace-interpreter-and-file-filter @@ -17,7 +17,7 @@ 16| 17| file2.ts 18|▒ 3:7: grug.walks(talks) [1] -19|▒ 3:7: grug.walks_walks(talks) [2] +19|▒ 3:7: grug.walks_walks(talks) 20| 21|~ 22|~ @@ -43,7 +43,7 @@ 16|00222222222222222222222222222222222222222222222222222222222222222222222222222222 17|00777777772222222222222222222222222222222222222222222222222222222222222222222222 18|88525222222222288888888882222222222222222222222222222222222222222222222222223333 -19|11525222222222211111111111111112222222222222222222222222222222222222222222223333 +19|11525222222222211111111111111112222222222222222222222222222222222222222222222222 20|00222222222222222222222222222222222222222222222222222222222222222222222222222222 21|00000000000000000000000000000000000000000000000000000000000000000000000000000000 22|00000000000000000000000000000000000000000000000000000000000000000000000000000000 diff --git a/tests/screenshots/tests-astgrep-test_lua_interpreter.lua---can-search-with-replace-interpreter b/tests/screenshots/tests-astgrep-test_lua_interpreter.lua---can-search-with-replace-interpreter index c514f3ed..124a3ff6 100644 --- a/tests/screenshots/tests-astgrep-test_lua_interpreter.lua---can-search-with-replace-interpreter +++ b/tests/screenshots/tests-astgrep-test_lua_interpreter.lua---can-search-with-replace-interpreter @@ -17,7 +17,7 @@ 16| 17| file2.ts 18|▒ 3:7: grug.walks(talks) [1] -19|▒ 3:7: grug.walks_walks(talks) [2] +19|▒ 3:7: grug.walks_walks(talks) 20| 21|~ 22|~ @@ -43,7 +43,7 @@ 16|00222222222222222222222222222222222222222222222222222222222222222222222222222222 17|00777777772222222222222222222222222222222222222222222222222222222222222222222222 18|88525222222222288888888882222222222222222222222222222222222222222222222222223333 -19|11525222222222211111111111111112222222222222222222222222222222222222222222223333 +19|11525222222222211111111111111112222222222222222222222222222222222222222222222222 20|00222222222222222222222222222222222222222222222222222222222222222222222222222222 21|00000000000000000000000000000000000000000000000000000000000000000000000000000000 22|00000000000000000000000000000000000000000000000000000000000000000000000000000000 diff --git a/tests/screenshots/tests-astgrep-test_lua_interpreter.lua---can-search-with-replace-interpreter-and-file-filter b/tests/screenshots/tests-astgrep-test_lua_interpreter.lua---can-search-with-replace-interpreter-and-file-filter index c773b717..0d66fc61 100644 --- a/tests/screenshots/tests-astgrep-test_lua_interpreter.lua---can-search-with-replace-interpreter-and-file-filter +++ b/tests/screenshots/tests-astgrep-test_lua_interpreter.lua---can-search-with-replace-interpreter-and-file-filter @@ -17,7 +17,7 @@ 16| 17| file2.ts 18|▒ 3:7: grug.walks(talks) [1] -19|▒ 3:7: grug.walks_walks(talks) [2] +19|▒ 3:7: grug.walks_walks(talks) 20| 21|~ 22|~ @@ -43,7 +43,7 @@ 16|00222222222222222222222222222222222222222222222222222222222222222222222222222222 17|00777777772222222222222222222222222222222222222222222222222222222222222222222222 18|88525222222222288888888882222222222222222222222222222222222222222222222222223333 -19|11525222222222211111111111111112222222222222222222222222222222222222222222223333 +19|11525222222222211111111111111112222222222222222222222222222222222222222222222222 20|00222222222222222222222222222222222222222222222222222222222222222222222222222222 21|00000000000000000000000000000000000000000000000000000000000000000000000000000000 22|00000000000000000000000000000000000000000000000000000000000000000000000000000000 diff --git a/tests/screenshots/tests-astgrep-test_replace.lua---can-replace-with-empty-string b/tests/screenshots/tests-astgrep-test_replace.lua---can-replace-with-empty-string index 134b4b9d..759b3bb5 100644 --- a/tests/screenshots/tests-astgrep-test_replace.lua---can-replace-with-empty-string +++ b/tests/screenshots/tests-astgrep-test_replace.lua---can-replace-with-empty-string @@ -17,10 +17,10 @@ 16| 17| file2.ts 18|▒ 2:9: if (grug || talks) { [1] -19|▒ 2:9: if ( || talks) { [2] +19|▒ 2:9: if ( || talks) { 20|┊ -21|▒ 3:7: grug.walks(talks) [3] -22|▒ 3:7: .walks(talks) [4] +21|▒ 3:7: grug.walks(talks) [2] +22|▒ 3:7: .walks(talks) 23|Grug FAR - 1: grug 2,4 Top 24|grug-far: replace completed! @@ -43,9 +43,9 @@ 16|00222222222222222222222222222222222222222222222222222222222222222222222222222222 17|00555555552222222222222222222222222222222222222222222222222222222222222222222222 18|66727222222222222666622222222222222222222222222222222222222222222222222222223333 -19|11727222222222222222222222222222222222222222222222222222222222222222222222223333 +19|11727222222222222222222222222222222222222222222222222222222222222222222222222222 20|88222222222222222222222222222222222222222222222222222222222222222222222222222222 21|66727222222222266662222222222222222222222222222222222222222222222222222222223333 -22|11727222222222222222222222222222222222222222222222222222222222222222222222223333 +22|11727222222222222222222222222222222222222222222222222222222222222222222222222222 23|99999999999999999999999999999999999999999999999999999999999999999999999999999999 24|:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: diff --git a/tests/screenshots/tests-astgrep-test_replace.lua---can-replace-with-empty-string-003 b/tests/screenshots/tests-astgrep-test_replace.lua---can-replace-with-empty-string-003 index 6e106379..08157b0f 100644 --- a/tests/screenshots/tests-astgrep-test_replace.lua---can-replace-with-empty-string-003 +++ b/tests/screenshots/tests-astgrep-test_replace.lua---can-replace-with-empty-string-003 @@ -17,10 +17,10 @@ 16| 17| file2.ts 18|▒ 2:13: if ( || talks) { [1] -19|▒ 2:13: if ( || ) { [2] +19|▒ 2:13: if ( || ) { 20|┊ -21|▒ 3:14: .walks(talks) [3] -22|▒ 3:14: .walks() [4] +21|▒ 3:14: .walks(talks) [2] +22|▒ 3:14: .walks() 23|Grug FAR - 1: talks 2,6 Top 24|-- INSERT -- @@ -43,9 +43,9 @@ 16|00222222222222222222222222222222222222222222222222222222222222222222222222222222 17|00555555552222222222222222222222222222222222222222222222222222222222222222222222 18|66727722222222222222266666222222222222222222222222222222222222222222222222223333 -19|11727722222222222222222222222222222222222222222222222222222222222222222222223333 +19|11727722222222222222222222222222222222222222222222222222222222222222222222222222 20|88222222222222222222222222222222222222222222222222222222222222222222222222222222 21|66727722222222222222226666622222222222222222222222222222222222222222222222223333 -22|11727722222222222222222222222222222222222222222222222222222222222222222222223333 +22|11727722222222222222222222222222222222222222222222222222222222222222222222222222 23|99999999999999999999999999999999999999999999999999999999999999999999999999999999 24|111111111111:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: diff --git a/tests/screenshots/tests-astgrep-test_replace.lua---can-replace-with-file-filter b/tests/screenshots/tests-astgrep-test_replace.lua---can-replace-with-file-filter index ac7a6972..4a4ecf99 100644 --- a/tests/screenshots/tests-astgrep-test_replace.lua---can-replace-with-file-filter +++ b/tests/screenshots/tests-astgrep-test_replace.lua---can-replace-with-file-filter @@ -17,10 +17,10 @@ 16| 17| file2.ts 18|▒ 2:9: if (grug || talks) { [1] -19|▒ 2:9: if (curly || talks) { [2] +19|▒ 2:9: if (curly || talks) { 20|┊ -21|▒ 3:7: grug.walks(talks) [3] -22|▒ 3:7: curly.walks(talks) [4] +21|▒ 3:7: grug.walks(talks) [2] +22|▒ 3:7: curly.walks(talks) 23|Grug FAR - 1: grug 2,4 Top 24|grug-far: replace completed! @@ -43,9 +43,9 @@ 16|00222222222222222222222222222222222222222222222222222222222222222222222222222222 17|00555555552222222222222222222222222222222222222222222222222222222222222222222222 18|66727222222222222666622222222222222222222222222222222222222222222222222222223333 -19|11727222222222222111112222222222222222222222222222222222222222222222222222223333 +19|11727222222222222111112222222222222222222222222222222222222222222222222222222222 20|88222222222222222222222222222222222222222222222222222222222222222222222222222222 21|66727222222222266662222222222222222222222222222222222222222222222222222222223333 -22|11727222222222211111222222222222222222222222222222222222222222222222222222223333 +22|11727222222222211111222222222222222222222222222222222222222222222222222222222222 23|99999999999999999999999999999999999999999999999999999999999999999999999999999999 24|:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: diff --git a/tests/screenshots/tests-astgrep-test_replace.lua---can-replace-with-file-filter-003 b/tests/screenshots/tests-astgrep-test_replace.lua---can-replace-with-file-filter-003 index 4b695411..19b99c22 100644 --- a/tests/screenshots/tests-astgrep-test_replace.lua---can-replace-with-file-filter-003 +++ b/tests/screenshots/tests-astgrep-test_replace.lua---can-replace-with-file-filter-003 @@ -17,10 +17,10 @@ 16| 17| file2.ts 18|▒ 2:9: if (curly || talks) { [1] -19|▒ 2:9: if (curly || talks) { [2] +19|▒ 2:9: if (curly || talks) { 20|┊ -21|▒ 3:7: curly.walks(talks) [3] -22|▒ 3:7: curly.walks(talks) [4] +21|▒ 3:7: curly.walks(talks) [2] +22|▒ 3:7: curly.walks(talks) 23|Grug FAR - 1: curly 2,6 Top 24|-- INSERT -- @@ -43,9 +43,9 @@ 16|00222222222222222222222222222222222222222222222222222222222222222222222222222222 17|00555555552222222222222222222222222222222222222222222222222222222222222222222222 18|66727222222222222666662222222222222222222222222222222222222222222222222222223333 -19|11727222222222222111112222222222222222222222222222222222222222222222222222223333 +19|11727222222222222111112222222222222222222222222222222222222222222222222222222222 20|88222222222222222222222222222222222222222222222222222222222222222222222222222222 21|66727222222222266666222222222222222222222222222222222222222222222222222222223333 -22|11727222222222211111222222222222222222222222222222222222222222222222222222223333 +22|11727222222222211111222222222222222222222222222222222222222222222222222222222222 23|99999999999999999999999999999999999999999999999999999999999999999999999999999999 24|111111111111:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: diff --git a/tests/screenshots/tests-astgrep-test_replace.lua---can-replace-with-replace-string b/tests/screenshots/tests-astgrep-test_replace.lua---can-replace-with-replace-string index 16393776..d14872c2 100644 --- a/tests/screenshots/tests-astgrep-test_replace.lua---can-replace-with-replace-string +++ b/tests/screenshots/tests-astgrep-test_replace.lua---can-replace-with-replace-string @@ -17,10 +17,10 @@ 16| 17| file2.ts 18|▒ 2:9: if (grug || talks) { [1] -19|▒ 2:9: if (curly || talks) { [2] +19|▒ 2:9: if (curly || talks) { 20|┊ -21|▒ 3:7: grug.walks(talks) [3] -22|▒ 3:7: curly.walks(talks) [4] +21|▒ 3:7: grug.walks(talks) [2] +22|▒ 3:7: curly.walks(talks) 23|Grug FAR - 1: grug 2,4 Top 24|grug-far: replace completed! @@ -43,9 +43,9 @@ 16|00222222222222222222222222222222222222222222222222222222222222222222222222222222 17|00555555552222222222222222222222222222222222222222222222222222222222222222222222 18|66727222222222222666622222222222222222222222222222222222222222222222222222223333 -19|11727222222222222111112222222222222222222222222222222222222222222222222222223333 +19|11727222222222222111112222222222222222222222222222222222222222222222222222222222 20|88222222222222222222222222222222222222222222222222222222222222222222222222222222 21|66727222222222266662222222222222222222222222222222222222222222222222222222223333 -22|11727222222222211111222222222222222222222222222222222222222222222222222222223333 +22|11727222222222211111222222222222222222222222222222222222222222222222222222222222 23|99999999999999999999999999999999999999999999999999999999999999999999999999999999 24|:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: diff --git a/tests/screenshots/tests-astgrep-test_replace.lua---can-replace-with-replace-string-003 b/tests/screenshots/tests-astgrep-test_replace.lua---can-replace-with-replace-string-003 index e1b7d836..cd091264 100644 --- a/tests/screenshots/tests-astgrep-test_replace.lua---can-replace-with-replace-string-003 +++ b/tests/screenshots/tests-astgrep-test_replace.lua---can-replace-with-replace-string-003 @@ -17,10 +17,10 @@ 16| 17| file2.ts 18|▒ 2:9: if (curly || talks) { [1] -19|▒ 2:9: if (curly || talks) { [2] +19|▒ 2:9: if (curly || talks) { 20|┊ -21|▒ 3:7: curly.walks(talks) [3] -22|▒ 3:7: curly.walks(talks) [4] +21|▒ 3:7: curly.walks(talks) [2] +22|▒ 3:7: curly.walks(talks) 23|Grug FAR - 1: curly 2,6 Top 24|-- INSERT -- @@ -43,9 +43,9 @@ 16|00222222222222222222222222222222222222222222222222222222222222222222222222222222 17|00555555552222222222222222222222222222222222222222222222222222222222222222222222 18|66727222222222222666662222222222222222222222222222222222222222222222222222223333 -19|11727222222222222111112222222222222222222222222222222222222222222222222222223333 +19|11727222222222222111112222222222222222222222222222222222222222222222222222222222 20|88222222222222222222222222222222222222222222222222222222222222222222222222222222 21|66727222222222266666222222222222222222222222222222222222222222222222222222223333 -22|11727222222222211111222222222222222222222222222222222222222222222222222222223333 +22|11727222222222211111222222222222222222222222222222222222222222222222222222222222 23|99999999999999999999999999999999999999999999999999999999999999999999999999999999 24|111111111111:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: diff --git a/tests/screenshots/tests-astgrep-test_replace.lua---can-replace-within-multiple-dirs-with-spaces b/tests/screenshots/tests-astgrep-test_replace.lua---can-replace-within-multiple-dirs-with-spaces index 3ffd4c29..75ed8f14 100644 --- a/tests/screenshots/tests-astgrep-test_replace.lua---can-replace-within-multiple-dirs-with-spaces +++ b/tests/screenshots/tests-astgrep-test_replace.lua---can-replace-within-multiple-dirs-with-spaces @@ -17,10 +17,10 @@ 16| 17| hello world/file2.ts 18|▒ 2:11: if (grug || talks) { [1] -19|▒ 2:11: if (curly || talks) { [2] +19|▒ 2:11: if (curly || talks) { 20|┊ -21|▒ 3:9: grug.walks(talks) [3] -22|▒ 3:9: curly.walks(talks) [4] +21|▒ 3:9: grug.walks(talks) [2] +22|▒ 3:9: curly.walks(talks) 23|Grug FAR - 1: grug 2,5 Top 24|-- INSERT -- @@ -43,9 +43,9 @@ 16|00222222222222222222222222222222222222222222222222222222222222222222222222222222 17|00555555555555555555552222222222222222222222222222222222222222222222222222222222 18|66727722222222222226666222222222222222222222222222222222222222222222222222223333 -19|11727722222222222221111122222222222222222222222222222222222222222222222222223333 +19|11727722222222222221111122222222222222222222222222222222222222222222222222222222 20|88222222222222222222222222222222222222222222222222222222222222222222222222222222 21|66727222222222222666622222222222222222222222222222222222222222222222222222223333 -22|11727222222222222111112222222222222222222222222222222222222222222222222222223333 +22|11727222222222222111112222222222222222222222222222222222222222222222222222222222 23|99999999999999999999999999999999999999999999999999999999999999999999999999999999 24|111111111111:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: diff --git a/tests/screenshots/tests-astgrep-test_replace.lua---can-replace-within-multiple-dirs-with-spaces-002 b/tests/screenshots/tests-astgrep-test_replace.lua---can-replace-within-multiple-dirs-with-spaces-002 index d274ace0..078de1cc 100644 --- a/tests/screenshots/tests-astgrep-test_replace.lua---can-replace-within-multiple-dirs-with-spaces-002 +++ b/tests/screenshots/tests-astgrep-test_replace.lua---can-replace-within-multiple-dirs-with-spaces-002 @@ -17,10 +17,10 @@ 16| 17| hello world/file2.ts 18|▒ 2:11: if (grug || talks) { [1] -19|▒ 2:11: if (curly || talks) { [2] +19|▒ 2:11: if (curly || talks) { 20|┊ -21|▒ 3:9: grug.walks(talks) [3] -22|▒ 3:9: curly.walks(talks) [4] +21|▒ 3:9: grug.walks(talks) [2] +22|▒ 3:9: curly.walks(talks) 23|Grug FAR - 1: grug 2,4 Top 24|grug-far: replace completed! @@ -43,9 +43,9 @@ 16|00222222222222222222222222222222222222222222222222222222222222222222222222222222 17|00555555555555555555552222222222222222222222222222222222222222222222222222222222 18|66727722222222222226666222222222222222222222222222222222222222222222222222223333 -19|11727722222222222221111122222222222222222222222222222222222222222222222222223333 +19|11727722222222222221111122222222222222222222222222222222222222222222222222222222 20|88222222222222222222222222222222222222222222222222222222222222222222222222222222 21|66727222222222222666622222222222222222222222222222222222222222222222222222223333 -22|11727222222222222111112222222222222222222222222222222222222222222222222222223333 +22|11727222222222222111112222222222222222222222222222222222222222222222222222222222 23|99999999999999999999999999999999999999999999999999999999999999999999999999999999 24|:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: diff --git a/tests/screenshots/tests-astgrep-test_replace.lua---can-replace-within-multiple-dirs-with-spaces-003 b/tests/screenshots/tests-astgrep-test_replace.lua---can-replace-within-multiple-dirs-with-spaces-003 index 5ced2588..50bdc6f2 100644 --- a/tests/screenshots/tests-astgrep-test_replace.lua---can-replace-within-multiple-dirs-with-spaces-003 +++ b/tests/screenshots/tests-astgrep-test_replace.lua---can-replace-within-multiple-dirs-with-spaces-003 @@ -17,10 +17,10 @@ 16| 17| hello world/file2.ts 18|▒ 2:11: if (curly || talks) { [1] -19|▒ 2:11: if (curly || talks) { [2] +19|▒ 2:11: if (curly || talks) { 20|┊ -21|▒ 3:9: curly.walks(talks) [3] -22|▒ 3:9: curly.walks(talks) [4] +21|▒ 3:9: curly.walks(talks) [2] +22|▒ 3:9: curly.walks(talks) 23|Grug FAR - 1: curly 2,6 Top 24|-- INSERT -- @@ -43,9 +43,9 @@ 16|00222222222222222222222222222222222222222222222222222222222222222222222222222222 17|00555555555555555555552222222222222222222222222222222222222222222222222222222222 18|66727722222222222226666622222222222222222222222222222222222222222222222222223333 -19|11727722222222222221111122222222222222222222222222222222222222222222222222223333 +19|11727722222222222221111122222222222222222222222222222222222222222222222222222222 20|88222222222222222222222222222222222222222222222222222222222222222222222222222222 21|66727222222222222666662222222222222222222222222222222222222222222222222222223333 -22|11727222222222222111112222222222222222222222222222222222222222222222222222223333 +22|11727222222222222111112222222222222222222222222222222222222222222222222222222222 23|99999999999999999999999999999999999999999999999999999999999999999999999999999999 24|111111111111:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: diff --git a/tests/screenshots/tests-astgrep-test_replace.lua---can-replace-within-one-dir b/tests/screenshots/tests-astgrep-test_replace.lua---can-replace-within-one-dir index bf10b5f2..a9fe410e 100644 --- a/tests/screenshots/tests-astgrep-test_replace.lua---can-replace-within-one-dir +++ b/tests/screenshots/tests-astgrep-test_replace.lua---can-replace-within-one-dir @@ -17,10 +17,10 @@ 16| 17| file2.ts 18|▒ 2:9: if (grug || talks) { [1] -19|▒ 2:9: if (curly || talks) { [2] +19|▒ 2:9: if (curly || talks) { 20|┊ -21|▒ 3:7: grug.walks(talks) [3] -22|▒ 3:7: curly.walks(talks) [4] +21|▒ 3:7: grug.walks(talks) [2] +22|▒ 3:7: curly.walks(talks) 23|Grug FAR - 1: grug 2,4 Top 24|grug-far: replace completed! @@ -43,9 +43,9 @@ 16|00222222222222222222222222222222222222222222222222222222222222222222222222222222 17|00555555552222222222222222222222222222222222222222222222222222222222222222222222 18|66727222222222222666622222222222222222222222222222222222222222222222222222223333 -19|11727222222222222111112222222222222222222222222222222222222222222222222222223333 +19|11727222222222222111112222222222222222222222222222222222222222222222222222222222 20|88222222222222222222222222222222222222222222222222222222222222222222222222222222 21|66727222222222266662222222222222222222222222222222222222222222222222222222223333 -22|11727222222222211111222222222222222222222222222222222222222222222222222222223333 +22|11727222222222211111222222222222222222222222222222222222222222222222222222222222 23|99999999999999999999999999999999999999999999999999999999999999999999999999999999 24|:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: diff --git a/tests/screenshots/tests-astgrep-test_replace.lua---can-replace-within-one-dir-002 b/tests/screenshots/tests-astgrep-test_replace.lua---can-replace-within-one-dir-002 index 8316de0c..d6432d46 100644 --- a/tests/screenshots/tests-astgrep-test_replace.lua---can-replace-within-one-dir-002 +++ b/tests/screenshots/tests-astgrep-test_replace.lua---can-replace-within-one-dir-002 @@ -17,10 +17,10 @@ 16| 17| file2.ts 18|▒ 2:9: if (curly || talks) { [1] -19|▒ 2:9: if (curly || talks) { [2] +19|▒ 2:9: if (curly || talks) { 20|┊ -21|▒ 3:7: curly.walks(talks) [3] -22|▒ 3:7: curly.walks(talks) [4] +21|▒ 3:7: curly.walks(talks) [2] +22|▒ 3:7: curly.walks(talks) 23|Grug FAR - 1: curly 2,6 Top 24|-- INSERT -- @@ -43,9 +43,9 @@ 16|00222222222222222222222222222222222222222222222222222222222222222222222222222222 17|00555555552222222222222222222222222222222222222222222222222222222222222222222222 18|66727222222222222666662222222222222222222222222222222222222222222222222222223333 -19|11727222222222222111112222222222222222222222222222222222222222222222222222223333 +19|11727222222222222111112222222222222222222222222222222222222222222222222222222222 20|88222222222222222222222222222222222222222222222222222222222222222222222222222222 21|66727222222222266666222222222222222222222222222222222222222222222222222222223333 -22|11727222222222211111222222222222222222222222222222222222222222222222222222223333 +22|11727222222222211111222222222222222222222222222222222222222222222222222222222222 23|99999999999999999999999999999999999999999999999999999999999999999999999999999999 24|111111111111:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: diff --git a/tests/screenshots/tests-astgrep-test_replace.lua---can-replace-within-one-dir-with-spaces b/tests/screenshots/tests-astgrep-test_replace.lua---can-replace-within-one-dir-with-spaces index f0204379..32294ce1 100644 --- a/tests/screenshots/tests-astgrep-test_replace.lua---can-replace-within-one-dir-with-spaces +++ b/tests/screenshots/tests-astgrep-test_replace.lua---can-replace-within-one-dir-with-spaces @@ -17,10 +17,10 @@ 16| 17| foo bar/file2.ts 18|▒ 2:9: if (grug || talks) { [1] -19|▒ 2:9: if (curly || talks) { [2] +19|▒ 2:9: if (curly || talks) { 20|┊ -21|▒ 3:7: grug.walks(talks) [3] -22|▒ 3:7: curly.walks(talks) [4] +21|▒ 3:7: grug.walks(talks) [2] +22|▒ 3:7: curly.walks(talks) 23|Grug FAR - 1: grug 2,5 Top 24|-- INSERT -- @@ -43,9 +43,9 @@ 16|00222222222222222222222222222222222222222222222222222222222222222222222222222222 17|00555555555555555522222222222222222222222222222222222222222222222222222222222222 18|66727222222222222666622222222222222222222222222222222222222222222222222222223333 -19|11727222222222222111112222222222222222222222222222222222222222222222222222223333 +19|11727222222222222111112222222222222222222222222222222222222222222222222222222222 20|88222222222222222222222222222222222222222222222222222222222222222222222222222222 21|66727222222222266662222222222222222222222222222222222222222222222222222222223333 -22|11727222222222211111222222222222222222222222222222222222222222222222222222223333 +22|11727222222222211111222222222222222222222222222222222222222222222222222222222222 23|99999999999999999999999999999999999999999999999999999999999999999999999999999999 24|111111111111:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: diff --git a/tests/screenshots/tests-astgrep-test_replace.lua---can-replace-within-one-dir-with-spaces-002 b/tests/screenshots/tests-astgrep-test_replace.lua---can-replace-within-one-dir-with-spaces-002 index bb3c71b6..a3ea5387 100644 --- a/tests/screenshots/tests-astgrep-test_replace.lua---can-replace-within-one-dir-with-spaces-002 +++ b/tests/screenshots/tests-astgrep-test_replace.lua---can-replace-within-one-dir-with-spaces-002 @@ -17,10 +17,10 @@ 16| 17| foo bar/file2.ts 18|▒ 2:9: if (grug || talks) { [1] -19|▒ 2:9: if (curly || talks) { [2] +19|▒ 2:9: if (curly || talks) { 20|┊ -21|▒ 3:7: grug.walks(talks) [3] -22|▒ 3:7: curly.walks(talks) [4] +21|▒ 3:7: grug.walks(talks) [2] +22|▒ 3:7: curly.walks(talks) 23|Grug FAR - 1: grug 2,4 Top 24|grug-far: replace completed! @@ -43,9 +43,9 @@ 16|00222222222222222222222222222222222222222222222222222222222222222222222222222222 17|00555555555555555522222222222222222222222222222222222222222222222222222222222222 18|66727222222222222666622222222222222222222222222222222222222222222222222222223333 -19|11727222222222222111112222222222222222222222222222222222222222222222222222223333 +19|11727222222222222111112222222222222222222222222222222222222222222222222222222222 20|88222222222222222222222222222222222222222222222222222222222222222222222222222222 21|66727222222222266662222222222222222222222222222222222222222222222222222222223333 -22|11727222222222211111222222222222222222222222222222222222222222222222222222223333 +22|11727222222222211111222222222222222222222222222222222222222222222222222222222222 23|99999999999999999999999999999999999999999999999999999999999999999999999999999999 24|:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: diff --git a/tests/screenshots/tests-astgrep-test_replace.lua---can-replace-within-one-dir-with-spaces-003 b/tests/screenshots/tests-astgrep-test_replace.lua---can-replace-within-one-dir-with-spaces-003 index 26eff6f6..755bb134 100644 --- a/tests/screenshots/tests-astgrep-test_replace.lua---can-replace-within-one-dir-with-spaces-003 +++ b/tests/screenshots/tests-astgrep-test_replace.lua---can-replace-within-one-dir-with-spaces-003 @@ -17,10 +17,10 @@ 16| 17| foo bar/file2.ts 18|▒ 2:9: if (curly || talks) { [1] -19|▒ 2:9: if (curly || talks) { [2] +19|▒ 2:9: if (curly || talks) { 20|┊ -21|▒ 3:7: curly.walks(talks) [3] -22|▒ 3:7: curly.walks(talks) [4] +21|▒ 3:7: curly.walks(talks) [2] +22|▒ 3:7: curly.walks(talks) 23|Grug FAR - 1: curly 2,6 Top 24|-- INSERT -- @@ -43,9 +43,9 @@ 16|00222222222222222222222222222222222222222222222222222222222222222222222222222222 17|00555555555555555522222222222222222222222222222222222222222222222222222222222222 18|66727222222222222666662222222222222222222222222222222222222222222222222222223333 -19|11727222222222222111112222222222222222222222222222222222222222222222222222223333 +19|11727222222222222111112222222222222222222222222222222222222222222222222222222222 20|88222222222222222222222222222222222222222222222222222222222222222222222222222222 21|66727222222222266666222222222222222222222222222222222222222222222222222222223333 -22|11727222222222211111222222222222222222222222222222222222222222222222222222223333 +22|11727222222222211111222222222222222222222222222222222222222222222222222222222222 23|99999999999999999999999999999999999999999999999999999999999999999999999999999999 24|111111111111:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: diff --git a/tests/screenshots/tests-astgrep-test_replace.lua---can-replace-within-one-file b/tests/screenshots/tests-astgrep-test_replace.lua---can-replace-within-one-file index e8cfa5e9..8473b957 100644 --- a/tests/screenshots/tests-astgrep-test_replace.lua---can-replace-within-one-file +++ b/tests/screenshots/tests-astgrep-test_replace.lua---can-replace-within-one-file @@ -17,10 +17,10 @@ 16| 17| file2.ts 18|▒ 2:9: if (grug || talks) { [1] -19|▒ 2:9: if (curly || talks) { [2] +19|▒ 2:9: if (curly || talks) { 20|┊ -21|▒ 3:7: grug.walks(talks) [3] -22|▒ 3:7: curly.walks(talks) [4] +21|▒ 3:7: grug.walks(talks) [2] +22|▒ 3:7: curly.walks(talks) 23|Grug FAR - 1: grug 2,4 Top 24|grug-far: replace completed! @@ -43,9 +43,9 @@ 16|00222222222222222222222222222222222222222222222222222222222222222222222222222222 17|00555555552222222222222222222222222222222222222222222222222222222222222222222222 18|66727222222222222666622222222222222222222222222222222222222222222222222222223333 -19|11727222222222222111112222222222222222222222222222222222222222222222222222223333 +19|11727222222222222111112222222222222222222222222222222222222222222222222222222222 20|88222222222222222222222222222222222222222222222222222222222222222222222222222222 21|66727222222222266662222222222222222222222222222222222222222222222222222222223333 -22|11727222222222211111222222222222222222222222222222222222222222222222222222223333 +22|11727222222222211111222222222222222222222222222222222222222222222222222222222222 23|99999999999999999999999999999999999999999999999999999999999999999999999999999999 24|:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: diff --git a/tests/screenshots/tests-astgrep-test_replace.lua---can-replace-within-one-file-002 b/tests/screenshots/tests-astgrep-test_replace.lua---can-replace-within-one-file-002 index 08aa9705..bcc3b45d 100644 --- a/tests/screenshots/tests-astgrep-test_replace.lua---can-replace-within-one-file-002 +++ b/tests/screenshots/tests-astgrep-test_replace.lua---can-replace-within-one-file-002 @@ -17,10 +17,10 @@ 16| 17| file2.ts 18|▒ 2:9: if (curly || talks) { [1] -19|▒ 2:9: if (curly || talks) { [2] +19|▒ 2:9: if (curly || talks) { 20|┊ -21|▒ 3:7: curly.walks(talks) [3] -22|▒ 3:7: curly.walks(talks) [4] +21|▒ 3:7: curly.walks(talks) [2] +22|▒ 3:7: curly.walks(talks) 23|Grug FAR - 1: curly 2,6 Top 24|-- INSERT -- @@ -43,9 +43,9 @@ 16|00222222222222222222222222222222222222222222222222222222222222222222222222222222 17|00555555552222222222222222222222222222222222222222222222222222222222222222222222 18|66727222222222222666662222222222222222222222222222222222222222222222222222223333 -19|11727222222222222111112222222222222222222222222222222222222222222222222222223333 +19|11727222222222222111112222222222222222222222222222222222222222222222222222222222 20|88222222222222222222222222222222222222222222222222222222222222222222222222222222 21|66727222222222266666222222222222222222222222222222222222222222222222222222223333 -22|11727222222222211111222222222222222222222222222222222222222222222222222222223333 +22|11727222222222211111222222222222222222222222222222222222222222222222222222222222 23|99999999999999999999999999999999999999999999999999999999999999999999999999999999 24|111111111111:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: diff --git a/tests/screenshots/tests-astgrep-test_search.lua---can-search-with-replace-string b/tests/screenshots/tests-astgrep-test_search.lua---can-search-with-replace-string index 07db0c81..f5e217e1 100644 --- a/tests/screenshots/tests-astgrep-test_search.lua---can-search-with-replace-string +++ b/tests/screenshots/tests-astgrep-test_search.lua---can-search-with-replace-string @@ -17,10 +17,10 @@ 16| 17| file2.ts 18|▒ 2:9: if (grug || talks) { [1] -19|▒ 2:9: if (curly || talks) { [2] +19|▒ 2:9: if (curly || talks) { 20|┊ -21|▒ 3:7: grug.walks(talks) [3] -22|▒ 3:7: curly.walks(talks) [4] +21|▒ 3:7: grug.walks(talks) [2] +22|▒ 3:7: curly.walks(talks) 23|Grug FAR - 1: grug 2,5 Top 24|-- INSERT -- @@ -43,9 +43,9 @@ 16|00222222222222222222222222222222222222222222222222222222222222222222222222222222 17|00555555552222222222222222222222222222222222222222222222222222222222222222222222 18|66727222222222222666622222222222222222222222222222222222222222222222222222223333 -19|11727222222222222111112222222222222222222222222222222222222222222222222222223333 +19|11727222222222222111112222222222222222222222222222222222222222222222222222222222 20|88222222222222222222222222222222222222222222222222222222222222222222222222222222 21|66727222222222266662222222222222222222222222222222222222222222222222222222223333 -22|11727222222222211111222222222222222222222222222222222222222222222222222222223333 +22|11727222222222211111222222222222222222222222222222222222222222222222222222222222 23|99999999999999999999999999999999999999999999999999999999999999999999999999999999 24|111111111111:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: diff --git a/tests/screenshots/tests-astgrep-test_vimscript_interpreter.lua---can-replace-with-replace-interpreter b/tests/screenshots/tests-astgrep-test_vimscript_interpreter.lua---can-replace-with-replace-interpreter index 1d4f8b12..ff69af06 100644 --- a/tests/screenshots/tests-astgrep-test_vimscript_interpreter.lua---can-replace-with-replace-interpreter +++ b/tests/screenshots/tests-astgrep-test_vimscript_interpreter.lua---can-replace-with-replace-interpreter @@ -17,7 +17,7 @@ 16| 17| file2.ts 18|▒ 3:7: grug.walks(talks) [1] -19|▒ 3:7: grug.walks_walks(talks) [2] +19|▒ 3:7: grug.walks_walks(talks) 20| 21|~ 22|~ @@ -43,7 +43,7 @@ 16|00222222222222222222222222222222222222222222222222222222222222222222222222222222 17|00777777772222222222222222222222222222222222222222222222222222222222222222222222 18|88525222222222288888888882222222222222222222222222222222222222222222222222223333 -19|11525222222222211111111111111112222222222222222222222222222222222222222222223333 +19|11525222222222211111111111111112222222222222222222222222222222222222222222222222 20|00222222222222222222222222222222222222222222222222222222222222222222222222222222 21|00000000000000000000000000000000000000000000000000000000000000000000000000000000 22|00000000000000000000000000000000000000000000000000000000000000000000000000000000 diff --git a/tests/screenshots/tests-astgrep-test_vimscript_interpreter.lua---can-replace-with-replace-interpreter-and-file-filter b/tests/screenshots/tests-astgrep-test_vimscript_interpreter.lua---can-replace-with-replace-interpreter-and-file-filter index ea5cb0d8..0aebd01c 100644 --- a/tests/screenshots/tests-astgrep-test_vimscript_interpreter.lua---can-replace-with-replace-interpreter-and-file-filter +++ b/tests/screenshots/tests-astgrep-test_vimscript_interpreter.lua---can-replace-with-replace-interpreter-and-file-filter @@ -17,7 +17,7 @@ 16| 17| file2.ts 18|▒ 3:7: grug.walks(talks) [1] -19|▒ 3:7: grug.walks_walks(talks) [2] +19|▒ 3:7: grug.walks_walks(talks) 20| 21|~ 22|~ @@ -43,7 +43,7 @@ 16|00222222222222222222222222222222222222222222222222222222222222222222222222222222 17|00777777772222222222222222222222222222222222222222222222222222222222222222222222 18|88525222222222288888888882222222222222222222222222222222222222222222222222223333 -19|11525222222222211111111111111112222222222222222222222222222222222222222222223333 +19|11525222222222211111111111111112222222222222222222222222222222222222222222222222 20|00222222222222222222222222222222222222222222222222222222222222222222222222222222 21|00000000000000000000000000000000000000000000000000000000000000000000000000000000 22|00000000000000000000000000000000000000000000000000000000000000000000000000000000 diff --git a/tests/screenshots/tests-astgrep-test_vimscript_interpreter.lua---can-search-with-replace-interpreter b/tests/screenshots/tests-astgrep-test_vimscript_interpreter.lua---can-search-with-replace-interpreter index 8f334c4d..95f88bd6 100644 --- a/tests/screenshots/tests-astgrep-test_vimscript_interpreter.lua---can-search-with-replace-interpreter +++ b/tests/screenshots/tests-astgrep-test_vimscript_interpreter.lua---can-search-with-replace-interpreter @@ -17,7 +17,7 @@ 16| 17| file2.ts 18|▒ 3:7: grug.walks(talks) [1] -19|▒ 3:7: grug.walks_walks(talks) [2] +19|▒ 3:7: grug.walks_walks(talks) 20| 21|~ 22|~ @@ -43,7 +43,7 @@ 16|00222222222222222222222222222222222222222222222222222222222222222222222222222222 17|00777777772222222222222222222222222222222222222222222222222222222222222222222222 18|88525222222222288888888882222222222222222222222222222222222222222222222222223333 -19|11525222222222211111111111111112222222222222222222222222222222222222222222223333 +19|11525222222222211111111111111112222222222222222222222222222222222222222222222222 20|00222222222222222222222222222222222222222222222222222222222222222222222222222222 21|00000000000000000000000000000000000000000000000000000000000000000000000000000000 22|00000000000000000000000000000000000000000000000000000000000000000000000000000000 diff --git a/tests/screenshots/tests-astgrep-test_vimscript_interpreter.lua---can-search-with-replace-interpreter-and-file-filter b/tests/screenshots/tests-astgrep-test_vimscript_interpreter.lua---can-search-with-replace-interpreter-and-file-filter index a761cc18..946765f0 100644 --- a/tests/screenshots/tests-astgrep-test_vimscript_interpreter.lua---can-search-with-replace-interpreter-and-file-filter +++ b/tests/screenshots/tests-astgrep-test_vimscript_interpreter.lua---can-search-with-replace-interpreter-and-file-filter @@ -17,7 +17,7 @@ 16| 17| file2.ts 18|▒ 3:7: grug.walks(talks) [1] -19|▒ 3:7: grug.walks_walks(talks) [2] +19|▒ 3:7: grug.walks_walks(talks) 20| 21|~ 22|~ @@ -43,7 +43,7 @@ 16|00222222222222222222222222222222222222222222222222222222222222222222222222222222 17|00777777772222222222222222222222222222222222222222222222222222222222222222222222 18|88525222222222288888888882222222222222222222222222222222222222222222222222223333 -19|11525222222222211111111111111112222222222222222222222222222222222222222222223333 +19|11525222222222211111111111111112222222222222222222222222222222222222222222222222 20|00222222222222222222222222222222222222222222222222222222222222222222222222222222 21|00000000000000000000000000000000000000000000000000000000000000000000000000000000 22|00000000000000000000000000000000000000000000000000000000000000000000000000000000 diff --git a/tests/screenshots/tests-base-test_apply.lua---can-apply-next b/tests/screenshots/tests-base-test_apply.lua---can-apply-next index 55f2a762..785a1207 100644 --- a/tests/screenshots/tests-base-test_apply.lua---can-apply-next +++ b/tests/screenshots/tests-base-test_apply.lua---can-apply-next @@ -17,9 +17,9 @@ 16| 17| file1.txt 18|▒ 2:7: grug walks [1] -19|▒ 2:7: curly walks [2] -20|▒ 3:7: grug winks [3] -21|▒ 3:7: curly winks [4] +19|▒ 2:7: curly walks +20|▒ 3:7: grug winks [2] +21|▒ 3:7: curly winks 22| 23|Grug FAR - 1: grug 2,4 Top 24| @@ -43,9 +43,9 @@ 16|00222222222222222222222222222222222222222222222222222222222222222222222222222222 17|00555555555222222222222222222222222222222222222222222222222222222222222222222222 18|66727222222266662222222222222222222222222222222222222222222222222222222222223333 -19|11727222222211111222222222222222222222222222222222222222222222222222222222223333 +19|11727222222211111222222222222222222222222222222222222222222222222222222222222222 20|66727222222266662222222222222222222222222222222222222222222222222222222222223333 -21|11727222222211111222222222222222222222222222222222222222222222222222222222223333 +21|11727222222211111222222222222222222222222222222222222222222222222222222222222222 22|00222222222222222222222222222222222222222222222222222222222222222222222222222222 23|88888888888888888888888888888888888888888888888888888888888888888888888888888888 24|99999999999999999999999999999999999999999999999999999999999999999999999999999999 diff --git a/tests/screenshots/tests-base-test_apply.lua---can-apply-next-002 b/tests/screenshots/tests-base-test_apply.lua---can-apply-next-002 index e0385e13..81f16ae8 100644 --- a/tests/screenshots/tests-base-test_apply.lua---can-apply-next-002 +++ b/tests/screenshots/tests-base-test_apply.lua---can-apply-next-002 @@ -17,9 +17,9 @@ 16| │~ 17| file1.txt │~ 18|▒ 2:7: grug walks [1]│~ -19|▒ 2:7: curly walks [2]│~ -20|▒ 3:7: grug winks [3]│~ -21|▒ 3:7: curly winks [4]│~ +19|▒ 2:7: curly walks │~ +20|▒ 3:7: grug winks [2]│~ +21|▒ 3:7: curly winks │~ 22| │~ 23|Grug FAR - 1: grug 8,2 Top file1.txt 2,7 All 24| @@ -43,9 +43,9 @@ 16|00222222222222222222222222222222222222230000000000000000000000000000000000000000 17|00666666666222222222222222222222222222230000000000000000000000000000000000000000 18|77828222222277772222222222222222222444430000000000000000000000000000000000000000 -19|11828222222211111222222222222222222444430000000000000000000000000000000000000000 +19|11828222222211111222222222222222222222230000000000000000000000000000000000000000 20|77828222222277772222222222222222222444430000000000000000000000000000000000000000 -21|11828222222211111222222222222222222444430000000000000000000000000000000000000000 +21|11828222222211111222222222222222222222230000000000000000000000000000000000000000 22|00222222222222222222222222222222222222230000000000000000000000000000000000000000 23|9999999999999999999999999999999999999999:::::::::::::::::::::::::::::::::::::::: 24|;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/tests/screenshots/tests-base-test_apply.lua---can-apply-next-003 b/tests/screenshots/tests-base-test_apply.lua---can-apply-next-003 index 1202e821..72e841e6 100644 --- a/tests/screenshots/tests-base-test_apply.lua---can-apply-next-003 +++ b/tests/screenshots/tests-base-test_apply.lua---can-apply-next-003 @@ -16,11 +16,11 @@ 15| 5 matches in 2 files  sync completed│~ 16| │~ 17| file1.txt │~ -18|▒ 3:7: grug winks [3]│~ -19|▒ 3:7: curly winks [4]│~ +18|▒ 3:7: grug winks [2]│~ +19|▒ 3:7: curly winks │~ 20| │~ 21| file2.doc │~ -22|▒ 2:7: grug talks and grug dri [5]│~ +22|▒ 2:7: grug talks and grug dri [3]│~ 23|Grug FAR - 1: grug 9,2 Top file1.txt 3,7 All 24| @@ -43,7 +43,7 @@ 16|00222222222222222222222222222222222222230000000000000000000000000000000000000000 17|00666666666222222222222222222222222222230000000000000000000000000000000000000000 18|77828222222277772222222222222222222444430000000000000000000000000000000000000000 -19|11828222222211111222222222222222222444430000000000000000000000000000000000000000 +19|11828222222211111222222222222222222222230000000000000000000000000000000000000000 20|00222222222222222222222222222222222222230000000000000000000000000000000000000000 21|00666666666222222222222222222222222222230000000000000000000000000000000000000000 22|77828222222277772222222222277772222444430000000000000000000000000000000000000000 diff --git a/tests/screenshots/tests-base-test_apply.lua---can-apply-next-004 b/tests/screenshots/tests-base-test_apply.lua---can-apply-next-004 index 894839c2..17f2cf4d 100644 --- a/tests/screenshots/tests-base-test_apply.lua---can-apply-next-004 +++ b/tests/screenshots/tests-base-test_apply.lua---can-apply-next-004 @@ -16,11 +16,11 @@ 15| 5 matches in 2 files  sync completed│~ 16| │~ 17| file2.doc │~ -18|▒ 2:7: grug talks and grug dri [5]│~ -19|▒ 2:7: curly talks and curly d [6]│~ +18|▒ 2:7: grug talks and grug dri [3]│~ +19|▒ 2:7: curly talks and curly drink│~ 20| s │~ -21|▒ 3:12: then grug thinks [7]│~ -22|▒ 3:12: then curly thinks [8]│~ +21|▒ 3:12: then grug thinks [4]│~ +22|▒ 3:12: then curly thinks │~ 23|Grug FAR - 1: grug 9,2 Top file2.doc 2,7 All 24| @@ -43,9 +43,9 @@ 16|00222222222222222222222222222222222222230000000000000000000000000000000000000000 17|00666666666222222222222222222222222222230000000000000000000000000000000000000000 18|77828222222277772222222222277772222444430000000000000000000000000000000000000000 -19|11828222222211111222222222221111122444430000000000000000000000000000000000000000 +19|11828222222211111222222222221111122222230000000000000000000000000000000000000000 20|00222222222222222222222222222222222222230000000000000000000000000000000000000000 21|77828822222222222277772222222222222444430000000000000000000000000000000000000000 -22|11828822222222222211111222222222222444430000000000000000000000000000000000000000 +22|11828822222222222211111222222222222222230000000000000000000000000000000000000000 23|9999999999999999999999999999999999999999:::::::::::::::::::::::::::::::::::::::: 24|;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/tests/screenshots/tests-base-test_apply.lua---can-apply-next-005 b/tests/screenshots/tests-base-test_apply.lua---can-apply-next-005 index 92254d10..4111ff8f 100644 --- a/tests/screenshots/tests-base-test_apply.lua---can-apply-next-005 +++ b/tests/screenshots/tests-base-test_apply.lua---can-apply-next-005 @@ -16,8 +16,8 @@ 15| 5 matches in 2 files  sync completed│~ 16| │~ 17| file2.doc │~ -18|▒ 3:12: then grug thinks [7]│~ -19|▒ 3:12: then curly thinks [8]│~ +18|▒ 3:12: then grug thinks [4]│~ +19|▒ 3:12: then curly thinks │~ 20| │~ 21|~ │~ 22|~ │~ @@ -43,7 +43,7 @@ 16|00222222222222222222222222222222222222230000000000000000000000000000000000000000 17|00666666666222222222222222222222222222230000000000000000000000000000000000000000 18|77828822222222222277772222222222222444430000000000000000000000000000000000000000 -19|11828822222222222211111222222222222444430000000000000000000000000000000000000000 +19|11828822222222222211111222222222222222230000000000000000000000000000000000000000 20|00222222222222222222222222222222222222230000000000000000000000000000000000000000 21|00000000000000000000000000000000000000030000000000000000000000000000000000000000 22|00000000000000000000000000000000000000030000000000000000000000000000000000000000 diff --git a/tests/screenshots/tests-base-test_apply.lua---can-apply-prev b/tests/screenshots/tests-base-test_apply.lua---can-apply-prev index 55f2a762..785a1207 100644 --- a/tests/screenshots/tests-base-test_apply.lua---can-apply-prev +++ b/tests/screenshots/tests-base-test_apply.lua---can-apply-prev @@ -17,9 +17,9 @@ 16| 17| file1.txt 18|▒ 2:7: grug walks [1] -19|▒ 2:7: curly walks [2] -20|▒ 3:7: grug winks [3] -21|▒ 3:7: curly winks [4] +19|▒ 2:7: curly walks +20|▒ 3:7: grug winks [2] +21|▒ 3:7: curly winks 22| 23|Grug FAR - 1: grug 2,4 Top 24| @@ -43,9 +43,9 @@ 16|00222222222222222222222222222222222222222222222222222222222222222222222222222222 17|00555555555222222222222222222222222222222222222222222222222222222222222222222222 18|66727222222266662222222222222222222222222222222222222222222222222222222222223333 -19|11727222222211111222222222222222222222222222222222222222222222222222222222223333 +19|11727222222211111222222222222222222222222222222222222222222222222222222222222222 20|66727222222266662222222222222222222222222222222222222222222222222222222222223333 -21|11727222222211111222222222222222222222222222222222222222222222222222222222223333 +21|11727222222211111222222222222222222222222222222222222222222222222222222222222222 22|00222222222222222222222222222222222222222222222222222222222222222222222222222222 23|88888888888888888888888888888888888888888888888888888888888888888888888888888888 24|99999999999999999999999999999999999999999999999999999999999999999999999999999999 diff --git a/tests/screenshots/tests-base-test_apply.lua---can-apply-prev-002 b/tests/screenshots/tests-base-test_apply.lua---can-apply-prev-002 index e0385e13..81f16ae8 100644 --- a/tests/screenshots/tests-base-test_apply.lua---can-apply-prev-002 +++ b/tests/screenshots/tests-base-test_apply.lua---can-apply-prev-002 @@ -17,9 +17,9 @@ 16| │~ 17| file1.txt │~ 18|▒ 2:7: grug walks [1]│~ -19|▒ 2:7: curly walks [2]│~ -20|▒ 3:7: grug winks [3]│~ -21|▒ 3:7: curly winks [4]│~ +19|▒ 2:7: curly walks │~ +20|▒ 3:7: grug winks [2]│~ +21|▒ 3:7: curly winks │~ 22| │~ 23|Grug FAR - 1: grug 8,2 Top file1.txt 2,7 All 24| @@ -43,9 +43,9 @@ 16|00222222222222222222222222222222222222230000000000000000000000000000000000000000 17|00666666666222222222222222222222222222230000000000000000000000000000000000000000 18|77828222222277772222222222222222222444430000000000000000000000000000000000000000 -19|11828222222211111222222222222222222444430000000000000000000000000000000000000000 +19|11828222222211111222222222222222222222230000000000000000000000000000000000000000 20|77828222222277772222222222222222222444430000000000000000000000000000000000000000 -21|11828222222211111222222222222222222444430000000000000000000000000000000000000000 +21|11828222222211111222222222222222222222230000000000000000000000000000000000000000 22|00222222222222222222222222222222222222230000000000000000000000000000000000000000 23|9999999999999999999999999999999999999999:::::::::::::::::::::::::::::::::::::::: 24|;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/tests/screenshots/tests-base-test_apply.lua---can-apply-prev-003 b/tests/screenshots/tests-base-test_apply.lua---can-apply-prev-003 index c988f60f..666fa5f8 100644 --- a/tests/screenshots/tests-base-test_apply.lua---can-apply-prev-003 +++ b/tests/screenshots/tests-base-test_apply.lua---can-apply-prev-003 @@ -10,13 +10,13 @@ 09| │~ 10| file1.txt │~ 11|▒ 2:7: grug walks [1]│~ -12|▒ 2:7: curly walks [2]│~ -13|▒ 3:7: grug winks [3]│~ -14|▒ 3:7: curly winks [4]│~ +12|▒ 2:7: curly walks │~ +13|▒ 3:7: grug winks [2]│~ +14|▒ 3:7: curly winks │~ 15| │~ 16| file2.doc │~ -17|▒ 2:7: grug talks and grug dri [5]│~ -18|▒ 2:7: curly talks and curly d [6]│~ +17|▒ 2:7: grug talks and grug dri [3]│~ +18|▒ 2:7: curly talks and curly drink│~ 19| s │~ 20| │~ 21|~ │~ @@ -36,13 +36,13 @@ 09|00111111111111111111111111111111111111120000000000000000000000000000000000000000 10|00666666666111111111111111111111111111120000000000000000000000000000000000000000 11|77818111111177771111111111111111111333320000000000000000000000000000000000000000 -12|55818111111155555111111111111111111333320000000000000000000000000000000000000000 +12|55818111111155555111111111111111111111120000000000000000000000000000000000000000 13|77818111111177771111111111111111111333320000000000000000000000000000000000000000 -14|55818111111155555111111111111111111333320000000000000000000000000000000000000000 +14|55818111111155555111111111111111111111120000000000000000000000000000000000000000 15|00111111111111111111111111111111111111120000000000000000000000000000000000000000 16|00666666666111111111111111111111111111120000000000000000000000000000000000000000 17|77818111111177771111111111177771111333320000000000000000000000000000000000000000 -18|55818111111155555111111111115555511333320000000000000000000000000000000000000000 +18|55818111111155555111111111115555511111120000000000000000000000000000000000000000 19|00111111111111111111111111111111111111120000000000000000000000000000000000000000 20|00111111111111111111111111111111111111120000000000000000000000000000000000000000 21|00000000000000000000000000000000000000020000000000000000000000000000000000000000 diff --git a/tests/screenshots/tests-base-test_apply.lua---can-apply-prev-004 b/tests/screenshots/tests-base-test_apply.lua---can-apply-prev-004 index 5e02204f..0fcd2fbb 100644 --- a/tests/screenshots/tests-base-test_apply.lua---can-apply-prev-004 +++ b/tests/screenshots/tests-base-test_apply.lua---can-apply-prev-004 @@ -10,9 +10,9 @@ 09| │~ 10| file1.txt │~ 11|▒ 2:7: grug walks [1]│~ -12|▒ 2:7: curly walks [2]│~ -13|▒ 3:7: grug winks [3]│~ -14|▒ 3:7: curly winks [4]│~ +12|▒ 2:7: curly walks │~ +13|▒ 3:7: grug winks [2]│~ +14|▒ 3:7: curly winks │~ 15| │~ 16|~ │~ 17|~ │~ @@ -36,9 +36,9 @@ 09|00111111111111111111111111111111111111120000000000000000000000000000000000000000 10|00666666666111111111111111111111111111120000000000000000000000000000000000000000 11|77818111111177771111111111111111111333320000000000000000000000000000000000000000 -12|55818111111155555111111111111111111333320000000000000000000000000000000000000000 +12|55818111111155555111111111111111111111120000000000000000000000000000000000000000 13|77818111111177771111111111111111111333320000000000000000000000000000000000000000 -14|55818111111155555111111111111111111333320000000000000000000000000000000000000000 +14|55818111111155555111111111111111111111120000000000000000000000000000000000000000 15|00111111111111111111111111111111111111120000000000000000000000000000000000000000 16|00000000000000000000000000000000000000020000000000000000000000000000000000000000 17|00000000000000000000000000000000000000020000000000000000000000000000000000000000 diff --git a/tests/screenshots/tests-base-test_apply.lua---can-apply-prev-005 b/tests/screenshots/tests-base-test_apply.lua---can-apply-prev-005 index 537660c0..81394b53 100644 --- a/tests/screenshots/tests-base-test_apply.lua---can-apply-prev-005 +++ b/tests/screenshots/tests-base-test_apply.lua---can-apply-prev-005 @@ -10,7 +10,7 @@ 09| │~ 10| file1.txt │~ 11|▒ 2:7: grug walks [1]│~ -12|▒ 2:7: curly walks [2]│~ +12|▒ 2:7: curly walks │~ 13| │~ 14|~ │~ 15|~ │~ @@ -36,7 +36,7 @@ 09|00111111111111111111111111111111111111120000000000000000000000000000000000000000 10|00666666666111111111111111111111111111120000000000000000000000000000000000000000 11|77818111111177771111111111111111111333320000000000000000000000000000000000000000 -12|55818111111155555111111111111111111333320000000000000000000000000000000000000000 +12|55818111111155555111111111111111111111120000000000000000000000000000000000000000 13|00111111111111111111111111111111111111120000000000000000000000000000000000000000 14|00000000000000000000000000000000000000020000000000000000000000000000000000000000 15|00000000000000000000000000000000000000020000000000000000000000000000000000000000 diff --git a/tests/screenshots/tests-base-test_history.lua---auto-saves-to-history-on-replace b/tests/screenshots/tests-base-test_history.lua---auto-saves-to-history-on-replace index ca91ea24..641e7fcb 100644 --- a/tests/screenshots/tests-base-test_history.lua---auto-saves-to-history-on-replace +++ b/tests/screenshots/tests-base-test_history.lua---auto-saves-to-history-on-replace @@ -17,10 +17,10 @@ 16| 17| file1.txt 18|▒ 1:2: grug walks [1] -19|▒ 1:2: curly walks [2] +19|▒ 1:2: curly walks 20| 21| file2.doc -22|▒ 2:7: grug talks and grug drinks [3] +22|▒ 2:7: grug talks and grug drinks [2] 23|Grug FAR - 1: grug 2,4 Top 24|grug-far: replace completed! @@ -43,7 +43,7 @@ 16|00222222222222222222222222222222222222222222222222222222222222222222222222222222 17|00555555555222222222222222222222222222222222222222222222222222222222222222222222 18|66727226666222222222222222222222222222222222222222222222222222222222222222223333 -19|11727221111122222222222222222222222222222222222222222222222222222222222222223333 +19|11727221111122222222222222222222222222222222222222222222222222222222222222222222 20|00222222222222222222222222222222222222222222222222222222222222222222222222222222 21|00555555555222222222222222222222222222222222222222222222222222222222222222222222 22|66727222222266662222222222266662222222222222222222222222222222222222222222223333 diff --git a/tests/screenshots/tests-base-test_history.lua---auto-saves-to-history-on-replace-002 b/tests/screenshots/tests-base-test_history.lua---auto-saves-to-history-on-replace-002 index 88933d1c..2ce9151e 100644 --- a/tests/screenshots/tests-base-test_history.lua---auto-saves-to-history-on-replace-002 +++ b/tests/screenshots/tests-base-test_history.lua---auto-saves-to-history-on-replace-002 @@ -17,10 +17,10 @@ 16|╰──────────────────  History (press <:q> or <:bd> to close)──────────────────╯ 17| file1.txt 18|▒ 1:2: grug walks [1] -19|▒ 1:2: curly walks [2] +19|▒ 1:2: curly walks 20| 21| file2.doc -22|▒ 2:7: grug talks and grug drinks [3] +22|▒ 2:7: grug talks and grug drinks [2] 23|Grug FAR - 1: grug 2,4 Top 24|grug-far: replace completed! 3,1 All @@ -43,7 +43,7 @@ 16|00000000000000000004444444444444444444444444444444444444444440000000000000000000 17|55666666666777777777777777777777777777777777777777777777777777777777777777777777 18|8897977888877777777777777777777777777777777777777777777777777777777777777777:::: -19|;;97977;;;;;7777777777777777777777777777777777777777777777777777777777777777:::: +19|;;97977;;;;;77777777777777777777777777777777777777777777777777777777777777777777 20|55777777777777777777777777777777777777777777777777777777777777777777777777777777 21|55666666666777777777777777777777777777777777777777777777777777777777777777777777 22|8897977777778888777777777778888777777777777777777777777777777777777777777777:::: diff --git a/tests/screenshots/tests-base-test_history.lua---auto-saves-to-history-on-sync-all b/tests/screenshots/tests-base-test_history.lua---auto-saves-to-history-on-sync-all index b2141097..7113cc8d 100644 --- a/tests/screenshots/tests-base-test_history.lua---auto-saves-to-history-on-sync-all +++ b/tests/screenshots/tests-base-test_history.lua---auto-saves-to-history-on-sync-all @@ -17,10 +17,10 @@ 16| 17| file1.txt 18|▒ 1:2: grug walks [1] -19|▒ 1:2: curly walks [2] +19|▒ 1:2: curly walks 20| 21| file2.doc -22|▒ 2:7: grug talks and grug drinks [3] +22|▒ 2:7: grug talks and grug drinks [2] 23|Grug FAR - 1: grug 2,4 Top 24|grug-far: synced changes! @@ -43,7 +43,7 @@ 16|00222222222222222222222222222222222222222222222222222222222222222222222222222222 17|00555555555222222222222222222222222222222222222222222222222222222222222222222222 18|66727226666222222222222222222222222222222222222222222222222222222222222222223333 -19|11727221111122222222222222222222222222222222222222222222222222222222222222223333 +19|11727221111122222222222222222222222222222222222222222222222222222222222222222222 20|00222222222222222222222222222222222222222222222222222222222222222222222222222222 21|00555555555222222222222222222222222222222222222222222222222222222222222222222222 22|66727222222266662222222222266662222222222222222222222222222222222222222222223333 diff --git a/tests/screenshots/tests-base-test_history.lua---auto-saves-to-history-on-sync-all-002 b/tests/screenshots/tests-base-test_history.lua---auto-saves-to-history-on-sync-all-002 index 6a35f6d7..90207e7b 100644 --- a/tests/screenshots/tests-base-test_history.lua---auto-saves-to-history-on-sync-all-002 +++ b/tests/screenshots/tests-base-test_history.lua---auto-saves-to-history-on-sync-all-002 @@ -17,10 +17,10 @@ 16|╰──────────────────  History (press <:q> or <:bd> to close)──────────────────╯ 17| file1.txt 18|▒ 1:2: grug walks [1] -19|▒ 1:2: curly walks [2] +19|▒ 1:2: curly walks 20| 21| file2.doc -22|▒ 2:7: grug talks and grug drinks [3] +22|▒ 2:7: grug talks and grug drinks [2] 23|Grug FAR - 1: grug 2,4 Top 24|grug-far: synced changes! 3,1 All @@ -43,7 +43,7 @@ 16|00000000000000000004444444444444444444444444444444444444444440000000000000000000 17|55666666666777777777777777777777777777777777777777777777777777777777777777777777 18|8897977888877777777777777777777777777777777777777777777777777777777777777777:::: -19|;;97977;;;;;7777777777777777777777777777777777777777777777777777777777777777:::: +19|;;97977;;;;;77777777777777777777777777777777777777777777777777777777777777777777 20|55777777777777777777777777777777777777777777777777777777777777777777777777777777 21|55666666666777777777777777777777777777777777777777777777777777777777777777777777 22|8897977777778888777777777778888777777777777777777777777777777777777777777777:::: diff --git a/tests/screenshots/tests-base-test_history.lua---dedupes-last-history-entry b/tests/screenshots/tests-base-test_history.lua---dedupes-last-history-entry index 136287ea..3e54789b 100644 --- a/tests/screenshots/tests-base-test_history.lua---dedupes-last-history-entry +++ b/tests/screenshots/tests-base-test_history.lua---dedupes-last-history-entry @@ -17,10 +17,10 @@ 16|╰──────────────────  History (press <:q> or <:bd> to close)──────────────────╯ 17| file1.txt 18|▒ 1:2: grug walks [1] -19|▒ 1:2: curly walks [2] +19|▒ 1:2: curly walks 20| 21| file2.doc -22|▒ 2:7: grug talks and grug drinks [3] +22|▒ 2:7: grug talks and grug drinks [2] 23|Grug FAR - 1: grug 2,4 Top 24|grug-far: added current search to history! 3,1 All @@ -43,7 +43,7 @@ 16|00000000000000000004444444444444444444444444444444444444444440000000000000000000 17|55666666666777777777777777777777777777777777777777777777777777777777777777777777 18|8897977888877777777777777777777777777777777777777777777777777777777777777777:::: -19|;;97977;;;;;7777777777777777777777777777777777777777777777777777777777777777:::: +19|;;97977;;;;;77777777777777777777777777777777777777777777777777777777777777777777 20|55777777777777777777777777777777777777777777777777777777777777777777777777777777 21|55666666666777777777777777777777777777777777777777777777777777777777777777777777 22|8897977777778888777777777778888777777777777777777777777777777777777777777777:::: diff --git a/tests/screenshots/tests-base-test_history.lua---replacement-interpreter-swaps-when-reloading-from-history-002 b/tests/screenshots/tests-base-test_history.lua---replacement-interpreter-swaps-when-reloading-from-history-002 index d3e0c151..44cb80e8 100644 --- a/tests/screenshots/tests-base-test_history.lua---replacement-interpreter-swaps-when-reloading-from-history-002 +++ b/tests/screenshots/tests-base-test_history.lua---replacement-interpreter-swaps-when-reloading-from-history-002 @@ -17,9 +17,9 @@ 16| 17| file2.ts 18|▒ 2:9: if (grug || talks) { [1] -19|▒ 2:9: if (bob || talks) { [2] -20|▒ 3:7: grug.walks(talks) [3] -21|▒ 3:7: bob.walks(talks) [4] +19|▒ 2:9: if (bob || talks) { +20|▒ 3:7: grug.walks(talks) [2] +21|▒ 3:7: bob.walks(talks) 22| 23|Grug FAR - 1: grug 3,5 All 24|grug-far: added current search to history! 12,1 Top @@ -43,9 +43,9 @@ 16|00222222222222222222222222222222222222222222222222222222222222222222222222222222 17|00666666662222222222222222222222222222222222222222222222222222222222222222222222 18|77828222222222777722222222222222222222222222222222222222222222222222222222223333 -19|11828222222222111222222222222222222222222222222222222222222222222222222222223333 +19|11828222222222111222222222222222222222222222222222222222222222222222222222222222 20|77828222222277772222222222222222222222222222222222222222222222222222222222223333 -21|11828222222211122222222222222222222222222222222222222222222222222222222222223333 +21|11828222222211122222222222222222222222222222222222222222222222222222222222222222 22|00222222222222222222222222222222222222222222222222222222222222222222222222222222 23|99999999999999999999999999999999999999999999999999999999999999999999999999999999 24|:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: diff --git a/tests/screenshots/tests-base-test_history.lua---replacement-interpreter-swaps-when-reloading-from-history-003 b/tests/screenshots/tests-base-test_history.lua---replacement-interpreter-swaps-when-reloading-from-history-003 index cc1937e9..cb3d5e1a 100644 --- a/tests/screenshots/tests-base-test_history.lua---replacement-interpreter-swaps-when-reloading-from-history-003 +++ b/tests/screenshots/tests-base-test_history.lua---replacement-interpreter-swaps-when-reloading-from-history-003 @@ -17,7 +17,7 @@ 16| 17| file2.ts 18|▒ 3:12: grug.walks(talks) [1] -19|▒ 3:12: grug.return "bob"(talks) [2] +19|▒ 3:12: grug.return "bob"(talks) 20| 21|~ 22|~ @@ -43,7 +43,7 @@ 16|00222222222222222222222222222222222222222222222222222222222222222222222222222222 17|00555555552222222222222222222222222222222222222222222222222222222222222222222222 18|66727722222222222266666222222222222222222222222222222222222222222222222222223333 -19|11727722222222222211111111111122222222222222222222222222222222222222222222223333 +19|11727722222222222211111111111122222222222222222222222222222222222222222222222222 20|00222222222222222222222222222222222222222222222222222222222222222222222222222222 21|00000000000000000000000000000000000000000000000000000000000000000000000000000000 22|00000000000000000000000000000000000000000000000000000000000000000000000000000000 diff --git a/tests/screenshots/tests-base-test_lua_interpreter.lua---can-replace-with-replace-interpreter b/tests/screenshots/tests-base-test_lua_interpreter.lua---can-replace-with-replace-interpreter index f4d899b9..1b060147 100644 --- a/tests/screenshots/tests-base-test_lua_interpreter.lua---can-replace-with-replace-interpreter +++ b/tests/screenshots/tests-base-test_lua_interpreter.lua---can-replace-with-replace-interpreter @@ -17,10 +17,10 @@ 16| 17| file1.txt 18|▒ 1:2: grug walks [1] -19|▒ 1:2: grug_and_curly walks [2] +19|▒ 1:2: grug_and_curly walks 20| 21| file2.doc -22|▒ 2:7: grug talks and grug drinks [3] +22|▒ 2:7: grug talks and grug drinks [2] 23|Grug FAR - 1: grug 2,4 Top 24|grug-far: replace completed! @@ -43,7 +43,7 @@ 16|00222222222222222222222222222222222222222222222222222222222222222222222222222222 17|00777777777222222222222222222222222222222222222222222222222222222222222222222222 18|88525228888222222222222222222222222222222222222222222222222222222222222222223333 -19|11525221111111111111122222222222222222222222222222222222222222222222222222223333 +19|11525221111111111111122222222222222222222222222222222222222222222222222222222222 20|00222222222222222222222222222222222222222222222222222222222222222222222222222222 21|00777777777222222222222222222222222222222222222222222222222222222222222222222222 22|88525222222288882222222222288882222222222222222222222222222222222222222222223333 diff --git a/tests/screenshots/tests-base-test_lua_interpreter.lua---can-replace-with-replace-interpreter-003 b/tests/screenshots/tests-base-test_lua_interpreter.lua---can-replace-with-replace-interpreter-003 index 0904c593..97363842 100644 --- a/tests/screenshots/tests-base-test_lua_interpreter.lua---can-replace-with-replace-interpreter-003 +++ b/tests/screenshots/tests-base-test_lua_interpreter.lua---can-replace-with-replace-interpreter-003 @@ -17,10 +17,10 @@ 16| 17| file1.txt 18|▒ 1:11: grug_and_curly walks [1] -19|▒ 1:11: grug_and_curly_and_curly walks [2] +19|▒ 1:11: grug_and_curly_and_curly walks 20| 21| file2.doc -22|▒ 2:16: grug_and_curly talks and grug_and_curly drinks [3] +22|▒ 2:16: grug_and_curly talks and grug_and_curly drinks [2] 23|Grug FAR - 1: curly 2,6 Top 24|-- INSERT -- @@ -43,7 +43,7 @@ 16|00222222222222222222222222222222222222222222222222222222222222222222222222222222 17|00777777777222222222222222222222222222222222222222222222222222222222222222222222 18|88525522222222222888882222222222222222222222222222222222222222222222222222223333 -19|11525522222222222111111111111111222222222222222222222222222222222222222222223333 +19|11525522222222222111111111111111222222222222222222222222222222222222222222222222 20|00222222222222222222222222222222222222222222222222222222222222222222222222222222 21|00777777777222222222222222222222222222222222222222222222222222222222222222222222 22|88525522222222222222228888822222222222222222222888882222222222222222222222223333 diff --git a/tests/screenshots/tests-base-test_lua_interpreter.lua---can-search-with-replace-interpreter b/tests/screenshots/tests-base-test_lua_interpreter.lua---can-search-with-replace-interpreter index 1eea153c..7e9937b0 100644 --- a/tests/screenshots/tests-base-test_lua_interpreter.lua---can-search-with-replace-interpreter +++ b/tests/screenshots/tests-base-test_lua_interpreter.lua---can-search-with-replace-interpreter @@ -17,10 +17,10 @@ 16| 17| file1.txt 18|▒ 1:2: grug walks [1] -19|▒ 1:2: grug_and_curly walks [2] +19|▒ 1:2: grug_and_curly walks 20| 21| file2.doc -22|▒ 2:7: grug talks and grug drinks [3] +22|▒ 2:7: grug talks and grug drinks [2] 23|Grug FAR - 1: grug 2,5 Top 24|-- INSERT -- @@ -43,7 +43,7 @@ 16|00222222222222222222222222222222222222222222222222222222222222222222222222222222 17|00777777777222222222222222222222222222222222222222222222222222222222222222222222 18|88525228888222222222222222222222222222222222222222222222222222222222222222223333 -19|11525221111111111111122222222222222222222222222222222222222222222222222222223333 +19|11525221111111111111122222222222222222222222222222222222222222222222222222222222 20|00222222222222222222222222222222222222222222222222222222222222222222222222222222 21|00777777777222222222222222222222222222222222222222222222222222222222222222222222 22|88525222222288882222222222288882222222222222222222222222222222222222222222223333 diff --git a/tests/screenshots/tests-base-test_replace.lua---can-replace-with-empty-string b/tests/screenshots/tests-base-test_replace.lua---can-replace-with-empty-string index 6457e3ce..6d058e72 100644 --- a/tests/screenshots/tests-base-test_replace.lua---can-replace-with-empty-string +++ b/tests/screenshots/tests-base-test_replace.lua---can-replace-with-empty-string @@ -17,10 +17,10 @@ 16| 17| file1.txt 18|▒ 1:6: and grug walks [1] -19|▒ 1:6: and walks [2] +19|▒ 1:6: and walks 20| 21| file2.doc -22|▒ 2:7: grug talks and grug drinks [3] +22|▒ 2:7: grug talks and grug drinks [2] 23|Grug FAR - 1: grug 2,4 Top 24|grug-far: replace completed! @@ -43,7 +43,7 @@ 16|00222222222222222222222222222222222222222222222222222222222222222222222222222222 17|00555555555222222222222222222222222222222222222222222222222222222222222222222222 18|66727222222666622222222222222222222222222222222222222222222222222222222222223333 -19|11727222222222222222222222222222222222222222222222222222222222222222222222223333 +19|11727222222222222222222222222222222222222222222222222222222222222222222222222222 20|00222222222222222222222222222222222222222222222222222222222222222222222222222222 21|00555555555222222222222222222222222222222222222222222222222222222222222222222222 22|66727222222266662222222222266662222222222222222222222222222222222222222222223333 diff --git a/tests/screenshots/tests-base-test_replace.lua---can-replace-with-empty-string-003 b/tests/screenshots/tests-base-test_replace.lua---can-replace-with-empty-string-003 index a5fb5e65..6eee06f1 100644 --- a/tests/screenshots/tests-base-test_replace.lua---can-replace-with-empty-string-003 +++ b/tests/screenshots/tests-base-test_replace.lua---can-replace-with-empty-string-003 @@ -17,7 +17,7 @@ 16| 17| file2.doc 18|▒ 2:19: talks and drinks [1] -19|▒ 2:19: talks and [2] +19|▒ 2:19: talks and 20| 21|~ 22|~ @@ -43,7 +43,7 @@ 16|00222222222222222222222222222222222222222222222222222222222222222222222222222222 17|00555555555222222222222222222222222222222222222222222222222222222222222222222222 18|66727722222222222222222226666662222222222222222222222222222222222222222222223333 -19|11727722222222222222222222222222222222222222222222222222222222222222222222223333 +19|11727722222222222222222222222222222222222222222222222222222222222222222222222222 20|00222222222222222222222222222222222222222222222222222222222222222222222222222222 21|00000000000000000000000000000000000000000000000000000000000000000000000000000000 22|00000000000000000000000000000000000000000000000000000000000000000000000000000000 diff --git a/tests/screenshots/tests-base-test_replace.lua---can-replace-with-replace-string b/tests/screenshots/tests-base-test_replace.lua---can-replace-with-replace-string index ca91ea24..641e7fcb 100644 --- a/tests/screenshots/tests-base-test_replace.lua---can-replace-with-replace-string +++ b/tests/screenshots/tests-base-test_replace.lua---can-replace-with-replace-string @@ -17,10 +17,10 @@ 16| 17| file1.txt 18|▒ 1:2: grug walks [1] -19|▒ 1:2: curly walks [2] +19|▒ 1:2: curly walks 20| 21| file2.doc -22|▒ 2:7: grug talks and grug drinks [3] +22|▒ 2:7: grug talks and grug drinks [2] 23|Grug FAR - 1: grug 2,4 Top 24|grug-far: replace completed! @@ -43,7 +43,7 @@ 16|00222222222222222222222222222222222222222222222222222222222222222222222222222222 17|00555555555222222222222222222222222222222222222222222222222222222222222222222222 18|66727226666222222222222222222222222222222222222222222222222222222222222222223333 -19|11727221111122222222222222222222222222222222222222222222222222222222222222223333 +19|11727221111122222222222222222222222222222222222222222222222222222222222222222222 20|00222222222222222222222222222222222222222222222222222222222222222222222222222222 21|00555555555222222222222222222222222222222222222222222222222222222222222222222222 22|66727222222266662222222222266662222222222222222222222222222222222222222222223333 diff --git a/tests/screenshots/tests-base-test_replace.lua---can-replace-with-replace-string-003 b/tests/screenshots/tests-base-test_replace.lua---can-replace-with-replace-string-003 index d9302765..ce0447c8 100644 --- a/tests/screenshots/tests-base-test_replace.lua---can-replace-with-replace-string-003 +++ b/tests/screenshots/tests-base-test_replace.lua---can-replace-with-replace-string-003 @@ -17,10 +17,10 @@ 16| 17| file1.txt 18|▒ 1:2: curly walks [1] -19|▒ 1:2: curly walks [2] +19|▒ 1:2: curly walks 20| 21| file2.doc -22|▒ 2:7: curly talks and curly drinks [3] +22|▒ 2:7: curly talks and curly drinks [2] 23|Grug FAR - 1: curly 2,6 Top 24|-- INSERT -- @@ -43,7 +43,7 @@ 16|00222222222222222222222222222222222222222222222222222222222222222222222222222222 17|00555555555222222222222222222222222222222222222222222222222222222222222222222222 18|66727226666622222222222222222222222222222222222222222222222222222222222222223333 -19|11727221111122222222222222222222222222222222222222222222222222222222222222223333 +19|11727221111122222222222222222222222222222222222222222222222222222222222222222222 20|00222222222222222222222222222222222222222222222222222222222222222222222222222222 21|00555555555222222222222222222222222222222222222222222222222222222222222222222222 22|66727222222266666222222222226666622222222222222222222222222222222222222222223333 diff --git a/tests/screenshots/tests-base-test_replace.lua---can-replace-within-multiple-dirs-with-spaces b/tests/screenshots/tests-base-test_replace.lua---can-replace-within-multiple-dirs-with-spaces index 725b8f32..6f4afbc6 100644 --- a/tests/screenshots/tests-base-test_replace.lua---can-replace-within-multiple-dirs-with-spaces +++ b/tests/screenshots/tests-base-test_replace.lua---can-replace-within-multiple-dirs-with-spaces @@ -17,10 +17,10 @@ 16| 17| ./foo bar/file1.txt 18|▒ 1:2: grug walks [1] -19|▒ 1:2: curly walks [2] +19|▒ 1:2: curly walks 20| 21| ./hello world/file2.doc -22|▒ 2:7: grug talks and grug drinks [3] +22|▒ 2:7: grug talks and grug drinks [2] 23|Grug FAR - 1: grug 2,5 Top 24|-- INSERT -- @@ -43,7 +43,7 @@ 16|00222222222222222222222222222222222222222222222222222222222222222222222222222222 17|00555555555555555555522222222222222222222222222222222222222222222222222222222222 18|66727226666222222222222222222222222222222222222222222222222222222222222222223333 -19|11727221111122222222222222222222222222222222222222222222222222222222222222223333 +19|11727221111122222222222222222222222222222222222222222222222222222222222222222222 20|00222222222222222222222222222222222222222222222222222222222222222222222222222222 21|00555555555555555555555552222222222222222222222222222222222222222222222222222222 22|66727222222266662222222222266662222222222222222222222222222222222222222222223333 diff --git a/tests/screenshots/tests-base-test_replace.lua---can-replace-within-multiple-dirs-with-spaces-002 b/tests/screenshots/tests-base-test_replace.lua---can-replace-within-multiple-dirs-with-spaces-002 index 71d12bd3..b7e81f69 100644 --- a/tests/screenshots/tests-base-test_replace.lua---can-replace-within-multiple-dirs-with-spaces-002 +++ b/tests/screenshots/tests-base-test_replace.lua---can-replace-within-multiple-dirs-with-spaces-002 @@ -17,10 +17,10 @@ 16| 17| ./foo bar/file1.txt 18|▒ 1:2: grug walks [1] -19|▒ 1:2: curly walks [2] +19|▒ 1:2: curly walks 20| 21| ./hello world/file2.doc -22|▒ 2:7: grug talks and grug drinks [3] +22|▒ 2:7: grug talks and grug drinks [2] 23|Grug FAR - 1: grug 2,4 Top 24|grug-far: replace completed! @@ -43,7 +43,7 @@ 16|00222222222222222222222222222222222222222222222222222222222222222222222222222222 17|00555555555555555555522222222222222222222222222222222222222222222222222222222222 18|66727226666222222222222222222222222222222222222222222222222222222222222222223333 -19|11727221111122222222222222222222222222222222222222222222222222222222222222223333 +19|11727221111122222222222222222222222222222222222222222222222222222222222222222222 20|00222222222222222222222222222222222222222222222222222222222222222222222222222222 21|00555555555555555555555552222222222222222222222222222222222222222222222222222222 22|66727222222266662222222222266662222222222222222222222222222222222222222222223333 diff --git a/tests/screenshots/tests-base-test_replace.lua---can-replace-within-multiple-dirs-with-spaces-003 b/tests/screenshots/tests-base-test_replace.lua---can-replace-within-multiple-dirs-with-spaces-003 index a4984624..bbb3135b 100644 --- a/tests/screenshots/tests-base-test_replace.lua---can-replace-within-multiple-dirs-with-spaces-003 +++ b/tests/screenshots/tests-base-test_replace.lua---can-replace-within-multiple-dirs-with-spaces-003 @@ -17,10 +17,10 @@ 16| 17| ./foo bar/file1.txt 18|▒ 1:2: curly walks [1] -19|▒ 1:2: curly walks [2] +19|▒ 1:2: curly walks 20| 21| ./hello world/file2.doc -22|▒ 2:7: curly talks and curly drinks [3] +22|▒ 2:7: curly talks and curly drinks [2] 23|Grug FAR - 1: curly 2,6 Top 24|-- INSERT -- @@ -43,7 +43,7 @@ 16|00222222222222222222222222222222222222222222222222222222222222222222222222222222 17|00555555555555555555522222222222222222222222222222222222222222222222222222222222 18|66727226666622222222222222222222222222222222222222222222222222222222222222223333 -19|11727221111122222222222222222222222222222222222222222222222222222222222222223333 +19|11727221111122222222222222222222222222222222222222222222222222222222222222222222 20|00222222222222222222222222222222222222222222222222222222222222222222222222222222 21|00555555555555555555555552222222222222222222222222222222222222222222222222222222 22|66727222222266666222222222226666622222222222222222222222222222222222222222223333 diff --git a/tests/screenshots/tests-base-test_replace.lua---can-replace-within-one-dir b/tests/screenshots/tests-base-test_replace.lua---can-replace-within-one-dir index 680fbf74..d6b0ddf3 100644 --- a/tests/screenshots/tests-base-test_replace.lua---can-replace-within-one-dir +++ b/tests/screenshots/tests-base-test_replace.lua---can-replace-within-one-dir @@ -17,10 +17,10 @@ 16| 17| ./file1.txt 18|▒ 1:2: grug walks [1] -19|▒ 1:2: curly walks [2] +19|▒ 1:2: curly walks 20| 21| ./file2.doc -22|▒ 2:7: grug talks and grug drinks [3] +22|▒ 2:7: grug talks and grug drinks [2] 23|Grug FAR - 1: grug 2,4 Top 24|grug-far: replace completed! @@ -43,7 +43,7 @@ 16|00222222222222222222222222222222222222222222222222222222222222222222222222222222 17|00555555555552222222222222222222222222222222222222222222222222222222222222222222 18|66727226666222222222222222222222222222222222222222222222222222222222222222223333 -19|11727221111122222222222222222222222222222222222222222222222222222222222222223333 +19|11727221111122222222222222222222222222222222222222222222222222222222222222222222 20|00222222222222222222222222222222222222222222222222222222222222222222222222222222 21|00555555555552222222222222222222222222222222222222222222222222222222222222222222 22|66727222222266662222222222266662222222222222222222222222222222222222222222223333 diff --git a/tests/screenshots/tests-base-test_replace.lua---can-replace-within-one-dir-002 b/tests/screenshots/tests-base-test_replace.lua---can-replace-within-one-dir-002 index 84bea619..13b471bd 100644 --- a/tests/screenshots/tests-base-test_replace.lua---can-replace-within-one-dir-002 +++ b/tests/screenshots/tests-base-test_replace.lua---can-replace-within-one-dir-002 @@ -17,10 +17,10 @@ 16| 17| ./file1.txt 18|▒ 1:2: curly walks [1] -19|▒ 1:2: curly walks [2] +19|▒ 1:2: curly walks 20| 21| ./file2.doc -22|▒ 2:7: curly talks and curly drinks [3] +22|▒ 2:7: curly talks and curly drinks [2] 23|Grug FAR - 1: curly 2,6 Top 24|-- INSERT -- @@ -43,7 +43,7 @@ 16|00222222222222222222222222222222222222222222222222222222222222222222222222222222 17|00555555555552222222222222222222222222222222222222222222222222222222222222222222 18|66727226666622222222222222222222222222222222222222222222222222222222222222223333 -19|11727221111122222222222222222222222222222222222222222222222222222222222222223333 +19|11727221111122222222222222222222222222222222222222222222222222222222222222222222 20|00222222222222222222222222222222222222222222222222222222222222222222222222222222 21|00555555555552222222222222222222222222222222222222222222222222222222222222222222 22|66727222222266666222222222226666622222222222222222222222222222222222222222223333 diff --git a/tests/screenshots/tests-base-test_replace.lua---can-replace-within-one-dir-with-spaces b/tests/screenshots/tests-base-test_replace.lua---can-replace-within-one-dir-with-spaces index f9d608cd..5dcae4eb 100644 --- a/tests/screenshots/tests-base-test_replace.lua---can-replace-within-one-dir-with-spaces +++ b/tests/screenshots/tests-base-test_replace.lua---can-replace-within-one-dir-with-spaces @@ -17,10 +17,10 @@ 16| 17| ./foo bar/file1.txt 18|▒ 1:2: grug walks [1] -19|▒ 1:2: curly walks [2] +19|▒ 1:2: curly walks 20| 21| ./foo bar/file2.doc -22|▒ 2:7: grug talks and grug drinks [3] +22|▒ 2:7: grug talks and grug drinks [2] 23|Grug FAR - 1: grug 2,5 Top 24|-- INSERT -- @@ -43,7 +43,7 @@ 16|00222222222222222222222222222222222222222222222222222222222222222222222222222222 17|00555555555555555555522222222222222222222222222222222222222222222222222222222222 18|66727226666222222222222222222222222222222222222222222222222222222222222222223333 -19|11727221111122222222222222222222222222222222222222222222222222222222222222223333 +19|11727221111122222222222222222222222222222222222222222222222222222222222222222222 20|00222222222222222222222222222222222222222222222222222222222222222222222222222222 21|00555555555555555555522222222222222222222222222222222222222222222222222222222222 22|66727222222266662222222222266662222222222222222222222222222222222222222222223333 diff --git a/tests/screenshots/tests-base-test_replace.lua---can-replace-within-one-dir-with-spaces-002 b/tests/screenshots/tests-base-test_replace.lua---can-replace-within-one-dir-with-spaces-002 index 249aaeb4..1fbab52b 100644 --- a/tests/screenshots/tests-base-test_replace.lua---can-replace-within-one-dir-with-spaces-002 +++ b/tests/screenshots/tests-base-test_replace.lua---can-replace-within-one-dir-with-spaces-002 @@ -17,10 +17,10 @@ 16| 17| ./foo bar/file1.txt 18|▒ 1:2: grug walks [1] -19|▒ 1:2: curly walks [2] +19|▒ 1:2: curly walks 20| 21| ./foo bar/file2.doc -22|▒ 2:7: grug talks and grug drinks [3] +22|▒ 2:7: grug talks and grug drinks [2] 23|Grug FAR - 1: grug 2,4 Top 24|grug-far: replace completed! @@ -43,7 +43,7 @@ 16|00222222222222222222222222222222222222222222222222222222222222222222222222222222 17|00555555555555555555522222222222222222222222222222222222222222222222222222222222 18|66727226666222222222222222222222222222222222222222222222222222222222222222223333 -19|11727221111122222222222222222222222222222222222222222222222222222222222222223333 +19|11727221111122222222222222222222222222222222222222222222222222222222222222222222 20|00222222222222222222222222222222222222222222222222222222222222222222222222222222 21|00555555555555555555522222222222222222222222222222222222222222222222222222222222 22|66727222222266662222222222266662222222222222222222222222222222222222222222223333 diff --git a/tests/screenshots/tests-base-test_replace.lua---can-replace-within-one-dir-with-spaces-003 b/tests/screenshots/tests-base-test_replace.lua---can-replace-within-one-dir-with-spaces-003 index aeca1662..f1202352 100644 --- a/tests/screenshots/tests-base-test_replace.lua---can-replace-within-one-dir-with-spaces-003 +++ b/tests/screenshots/tests-base-test_replace.lua---can-replace-within-one-dir-with-spaces-003 @@ -17,10 +17,10 @@ 16| 17| ./foo bar/file1.txt 18|▒ 1:2: curly walks [1] -19|▒ 1:2: curly walks [2] +19|▒ 1:2: curly walks 20| 21| ./foo bar/file2.doc -22|▒ 2:7: curly talks and curly drinks [3] +22|▒ 2:7: curly talks and curly drinks [2] 23|Grug FAR - 1: curly 2,6 Top 24|-- INSERT -- @@ -43,7 +43,7 @@ 16|00222222222222222222222222222222222222222222222222222222222222222222222222222222 17|00555555555555555555522222222222222222222222222222222222222222222222222222222222 18|66727226666622222222222222222222222222222222222222222222222222222222222222223333 -19|11727221111122222222222222222222222222222222222222222222222222222222222222223333 +19|11727221111122222222222222222222222222222222222222222222222222222222222222222222 20|00222222222222222222222222222222222222222222222222222222222222222222222222222222 21|00555555555555555555522222222222222222222222222222222222222222222222222222222222 22|66727222222266666222222222226666622222222222222222222222222222222222222222223333 diff --git a/tests/screenshots/tests-base-test_replace.lua---can-replace-within-one-file b/tests/screenshots/tests-base-test_replace.lua---can-replace-within-one-file index 36b46ab9..a0a678d1 100644 --- a/tests/screenshots/tests-base-test_replace.lua---can-replace-within-one-file +++ b/tests/screenshots/tests-base-test_replace.lua---can-replace-within-one-file @@ -17,9 +17,9 @@ 16| 17| ./file2.doc 18|▒ 2:7: grug talks and grug drinks [1] -19|▒ 2:7: curly talks and curly drinks [2] -20|▒ 3:12: then grug thinks [3] -21|▒ 3:12: then curly thinks [4] +19|▒ 2:7: curly talks and curly drinks +20|▒ 3:12: then grug thinks [2] +21|▒ 3:12: then curly thinks 22| 23|Grug FAR - 1: grug 2,4 All 24|grug-far: replace completed! @@ -43,9 +43,9 @@ 16|00222222222222222222222222222222222222222222222222222222222222222222222222222222 17|00555555555552222222222222222222222222222222222222222222222222222222222222222222 18|66727222222266662222222222266662222222222222222222222222222222222222222222223333 -19|11727222222211111222222222221111122222222222222222222222222222222222222222223333 +19|11727222222211111222222222221111122222222222222222222222222222222222222222222222 20|66727722222222222266662222222222222222222222222222222222222222222222222222223333 -21|11727722222222222211111222222222222222222222222222222222222222222222222222223333 +21|11727722222222222211111222222222222222222222222222222222222222222222222222222222 22|00222222222222222222222222222222222222222222222222222222222222222222222222222222 23|88888888888888888888888888888888888888888888888888888888888888888888888888888888 24|99999999999999999999999999999999999999999999999999999999999999999999999999999999 diff --git a/tests/screenshots/tests-base-test_replace.lua---can-replace-within-one-file-002 b/tests/screenshots/tests-base-test_replace.lua---can-replace-within-one-file-002 index f5d84ae0..841c7999 100644 --- a/tests/screenshots/tests-base-test_replace.lua---can-replace-within-one-file-002 +++ b/tests/screenshots/tests-base-test_replace.lua---can-replace-within-one-file-002 @@ -17,9 +17,9 @@ 16| 17| ./file2.doc 18|▒ 2:7: curly talks and curly drinks [1] -19|▒ 2:7: curly talks and curly drinks [2] -20|▒ 3:12: then curly thinks [3] -21|▒ 3:12: then curly thinks [4] +19|▒ 2:7: curly talks and curly drinks +20|▒ 3:12: then curly thinks [2] +21|▒ 3:12: then curly thinks 22| 23|Grug FAR - 1: curly 2,6 All 24|-- INSERT -- @@ -43,9 +43,9 @@ 16|00222222222222222222222222222222222222222222222222222222222222222222222222222222 17|00555555555552222222222222222222222222222222222222222222222222222222222222222222 18|66727222222266666222222222226666622222222222222222222222222222222222222222223333 -19|11727222222211111222222222221111122222222222222222222222222222222222222222223333 +19|11727222222211111222222222221111122222222222222222222222222222222222222222222222 20|66727722222222222266666222222222222222222222222222222222222222222222222222223333 -21|11727722222222222211111222222222222222222222222222222222222222222222222222223333 +21|11727722222222222211111222222222222222222222222222222222222222222222222222222222 22|00222222222222222222222222222222222222222222222222222222222222222222222222222222 23|88888888888888888888888888888888888888888888888888888888888888888888888888888888 24|11111111111199999999999999999999999999999999999999999999999999999999999999999999 diff --git a/tests/screenshots/tests-base-test_search.lua---can-search-with-empty-replace-string b/tests/screenshots/tests-base-test_search.lua---can-search-with-empty-replace-string index a080da4e..6042eade 100644 --- a/tests/screenshots/tests-base-test_search.lua---can-search-with-empty-replace-string +++ b/tests/screenshots/tests-base-test_search.lua---can-search-with-empty-replace-string @@ -17,10 +17,10 @@ 16| 17| file1.txt 18|▒ 1:2: grug walks [1] -19|▒ 1:2: walks [2] +19|▒ 1:2: walks 20| 21| file2.doc -22|▒ 2:7: grug talks and grug drinks [3] +22|▒ 2:7: grug talks and grug drinks [2] 23|Grug FAR - 1: grug 2,5 Top 24|-- INSERT -- @@ -43,7 +43,7 @@ 16|00222222222222222222222222222222222222222222222222222222222222222222222222222222 17|00555555555222222222222222222222222222222222222222222222222222222222222222222222 18|66727226666222222222222222222222222222222222222222222222222222222222222222223333 -19|11727222222222222222222222222222222222222222222222222222222222222222222222223333 +19|11727222222222222222222222222222222222222222222222222222222222222222222222222222 20|00222222222222222222222222222222222222222222222222222222222222222222222222222222 21|00555555555222222222222222222222222222222222222222222222222222222222222222222222 22|66727222222266662222222222266662222222222222222222222222222222222222222222223333 diff --git a/tests/screenshots/tests-base-test_search.lua---can-search-with-replace-string b/tests/screenshots/tests-base-test_search.lua---can-search-with-replace-string index 031a899f..3b748d2e 100644 --- a/tests/screenshots/tests-base-test_search.lua---can-search-with-replace-string +++ b/tests/screenshots/tests-base-test_search.lua---can-search-with-replace-string @@ -17,10 +17,10 @@ 16| 17| file1.txt 18|▒ 1:2: grug walks [1] -19|▒ 1:2: curly walks [2] +19|▒ 1:2: curly walks 20| 21| file2.doc -22|▒ 2:7: grug talks and grug drinks [3] +22|▒ 2:7: grug talks and grug drinks [2] 23|Grug FAR - 1: grug 2,5 Top 24|-- INSERT -- @@ -43,7 +43,7 @@ 16|00222222222222222222222222222222222222222222222222222222222222222222222222222222 17|00555555555222222222222222222222222222222222222222222222222222222222222222222222 18|66727226666222222222222222222222222222222222222222222222222222222222222222223333 -19|11727221111122222222222222222222222222222222222222222222222222222222222222223333 +19|11727221111122222222222222222222222222222222222222222222222222222222222222222222 20|00222222222222222222222222222222222222222222222222222222222222222222222222222222 21|00555555555222222222222222222222222222222222222222222222222222222222222222222222 22|66727222222266662222222222266662222222222222222222222222222222222222222222223333 diff --git a/tests/screenshots/tests-base-test_search.lua---can-search-with-replace-string,-with-dotall b/tests/screenshots/tests-base-test_search.lua---can-search-with-replace-string,-with-dotall index 2c9448d9..e2fa9e79 100644 --- a/tests/screenshots/tests-base-test_search.lua---can-search-with-replace-string,-with-dotall +++ b/tests/screenshots/tests-base-test_search.lua---can-search-with-replace-string,-with-dotall @@ -17,10 +17,10 @@ 16| 17| file1 18|▒ 1:2: grug walks [1] -19|▒ 1:2: curly walks [2] +19|▒ 1:2: curly walks 20| 21| file2 -22|▒ 2:7: grug talks and grug drinks [3] +22|▒ 2:7: grug talks and grug drinks [2] 23|Grug FAR - 1: grug(.*) 2,9 Top 24|-- INSERT -- @@ -43,7 +43,7 @@ 16|00222222222222222222222222222222222222222222222222222222222222222222222222222222 17|00666662222222222222222222222222222222222222222222222222222222222222222222222222 18|77828227777777777722222222222222222222222222222222222222222222222222222222223333 -19|11828221111111111112222222222222222222222222222222222222222222222222222222223333 +19|11828221111111111112222222222222222222222222222222222222222222222222222222222222 20|00222222222222222222222222222222222222222222222222222222222222222222222222222222 21|00666662222222222222222222222222222222222222222222222222222222222222222222222222 22|77828222222277777777777777777777777777222222222222222222222222222222222222223333 diff --git a/tests/screenshots/tests-base-test_sync.lua---can-sync-all b/tests/screenshots/tests-base-test_sync.lua---can-sync-all index b2141097..7113cc8d 100644 --- a/tests/screenshots/tests-base-test_sync.lua---can-sync-all +++ b/tests/screenshots/tests-base-test_sync.lua---can-sync-all @@ -17,10 +17,10 @@ 16| 17| file1.txt 18|▒ 1:2: grug walks [1] -19|▒ 1:2: curly walks [2] +19|▒ 1:2: curly walks 20| 21| file2.doc -22|▒ 2:7: grug talks and grug drinks [3] +22|▒ 2:7: grug talks and grug drinks [2] 23|Grug FAR - 1: grug 2,4 Top 24|grug-far: synced changes! @@ -43,7 +43,7 @@ 16|00222222222222222222222222222222222222222222222222222222222222222222222222222222 17|00555555555222222222222222222222222222222222222222222222222222222222222222222222 18|66727226666222222222222222222222222222222222222222222222222222222222222222223333 -19|11727221111122222222222222222222222222222222222222222222222222222222222222223333 +19|11727221111122222222222222222222222222222222222222222222222222222222222222222222 20|00222222222222222222222222222222222222222222222222222222222222222222222222222222 21|00555555555222222222222222222222222222222222222222222222222222222222222222222222 22|66727222222266662222222222266662222222222222222222222222222222222222222222223333 diff --git a/tests/screenshots/tests-base-test_sync.lua---can-sync-all-003 b/tests/screenshots/tests-base-test_sync.lua---can-sync-all-003 index d9302765..ce0447c8 100644 --- a/tests/screenshots/tests-base-test_sync.lua---can-sync-all-003 +++ b/tests/screenshots/tests-base-test_sync.lua---can-sync-all-003 @@ -17,10 +17,10 @@ 16| 17| file1.txt 18|▒ 1:2: curly walks [1] -19|▒ 1:2: curly walks [2] +19|▒ 1:2: curly walks 20| 21| file2.doc -22|▒ 2:7: curly talks and curly drinks [3] +22|▒ 2:7: curly talks and curly drinks [2] 23|Grug FAR - 1: curly 2,6 Top 24|-- INSERT -- @@ -43,7 +43,7 @@ 16|00222222222222222222222222222222222222222222222222222222222222222222222222222222 17|00555555555222222222222222222222222222222222222222222222222222222222222222222222 18|66727226666622222222222222222222222222222222222222222222222222222222222222223333 -19|11727221111122222222222222222222222222222222222222222222222222222222222222223333 +19|11727221111122222222222222222222222222222222222222222222222222222222222222222222 20|00222222222222222222222222222222222222222222222222222222222222222222222222222222 21|00555555555222222222222222222222222222222222222222222222222222222222222222222222 22|66727222222266666222222222226666622222222222222222222222222222222222222222223333 diff --git a/tests/screenshots/tests-base-test_sync.lua---can-sync-all-with-changes-ignoring-deleted-lines b/tests/screenshots/tests-base-test_sync.lua---can-sync-all-with-changes-ignoring-deleted-lines index d277e4f9..5bef3e78 100644 --- a/tests/screenshots/tests-base-test_sync.lua---can-sync-all-with-changes-ignoring-deleted-lines +++ b/tests/screenshots/tests-base-test_sync.lua---can-sync-all-with-changes-ignoring-deleted-lines @@ -16,11 +16,11 @@ 15| 6 matches in 2 files  sync completed! 16| 17| file1.txt -18|▒ 3:13: then grug swims [3] -19|▒ 3:13: then curly swims a deep depth indeed! [4] +18|▒ 3:13: then grug swims [2] +19|▒ 3:13: then curly swims a deep depth indeed! 20| 21| file2.doc -22|▒ 3:12: then grug believes he thinks [7] +22|▒ 3:12: then grug believes he thinks [4] 23|Grug FAR - 1: grug 13,33 Top 24|grug-far: synced changes! @@ -43,7 +43,7 @@ 16|00222222222222222222222222222222222222222222222222222222222222222222222222222222 17|00555555555222222222222222222222222222222222222222222222222222222222222222222222 18|66727722222222222226666222222222222222222222222222222222222222222222222222223333 -19|11727722222222222221111122222222222222222222222222222222222222222222222222223333 +19|11727722222222222221111122222222222222222222222222222222222222222222222222222222 20|00222222222222222222222222222222222222222222222222222222222222222222222222222222 21|00555555555222222222222222222222222222222222222222222222222222222222222222222222 22|66727722222222222266662222222222222222222222222222222222222222222222222222223333 diff --git a/tests/screenshots/tests-base-test_sync.lua---can-sync-all-with-changes-ignoring-deleted-lines-002 b/tests/screenshots/tests-base-test_sync.lua---can-sync-all-with-changes-ignoring-deleted-lines-002 index 0993bc48..76e9014e 100644 --- a/tests/screenshots/tests-base-test_sync.lua---can-sync-all-with-changes-ignoring-deleted-lines-002 +++ b/tests/screenshots/tests-base-test_sync.lua---can-sync-all-with-changes-ignoring-deleted-lines-002 @@ -17,10 +17,10 @@ 16| 17| file1.txt 18|▒ 3:13: then curly swims a deep depth indeed! [1] -19|▒ 3:13: then curly swims a deep depth indeed! [2] +19|▒ 3:13: then curly swims a deep depth indeed! 20| 21| file2.doc -22|▒ 3:12: then curly thinks [3] +22|▒ 3:12: then curly thinks [2] 23|Grug FAR - 1: curly 2,6 Top 24|-- INSERT -- @@ -43,7 +43,7 @@ 16|00222222222222222222222222222222222222222222222222222222222222222222222222222222 17|00555555555222222222222222222222222222222222222222222222222222222222222222222222 18|66727722222222222226666622222222222222222222222222222222222222222222222222223333 -19|11727722222222222221111122222222222222222222222222222222222222222222222222223333 +19|11727722222222222221111122222222222222222222222222222222222222222222222222222222 20|00222222222222222222222222222222222222222222222222222222222222222222222222222222 21|00555555555222222222222222222222222222222222222222222222222222222222222222222222 22|66727722222222222266666222222222222222222222222222222222222222222222222222223333 diff --git a/tests/screenshots/tests-base-test_vimscript_interpreter.lua---can-replace-with-replace-interpreter b/tests/screenshots/tests-base-test_vimscript_interpreter.lua---can-replace-with-replace-interpreter index 80b361f0..ba6b1eef 100644 --- a/tests/screenshots/tests-base-test_vimscript_interpreter.lua---can-replace-with-replace-interpreter +++ b/tests/screenshots/tests-base-test_vimscript_interpreter.lua---can-replace-with-replace-interpreter @@ -17,10 +17,10 @@ 16| 17| file1.txt 18|▒ 1:2: grug walks [1] -19|▒ 1:2: grug_and_curly walks [2] +19|▒ 1:2: grug_and_curly walks 20| 21| file2.doc -22|▒ 2:7: grug talks and grug drinks [3] +22|▒ 2:7: grug talks and grug drinks [2] 23|Grug FAR - 1: grug 2,4 Top 24|grug-far: replace completed! @@ -43,7 +43,7 @@ 16|00222222222222222222222222222222222222222222222222222222222222222222222222222222 17|00777777777222222222222222222222222222222222222222222222222222222222222222222222 18|88525228888222222222222222222222222222222222222222222222222222222222222222223333 -19|11525221111111111111122222222222222222222222222222222222222222222222222222223333 +19|11525221111111111111122222222222222222222222222222222222222222222222222222222222 20|00222222222222222222222222222222222222222222222222222222222222222222222222222222 21|00777777777222222222222222222222222222222222222222222222222222222222222222222222 22|88525222222288882222222222288882222222222222222222222222222222222222222222223333 diff --git a/tests/screenshots/tests-base-test_vimscript_interpreter.lua---can-replace-with-replace-interpreter-003 b/tests/screenshots/tests-base-test_vimscript_interpreter.lua---can-replace-with-replace-interpreter-003 index eaf4f2dd..ded45155 100644 --- a/tests/screenshots/tests-base-test_vimscript_interpreter.lua---can-replace-with-replace-interpreter-003 +++ b/tests/screenshots/tests-base-test_vimscript_interpreter.lua---can-replace-with-replace-interpreter-003 @@ -17,10 +17,10 @@ 16| 17| file1.txt 18|▒ 1:11: grug_and_curly walks [1] -19|▒ 1:11: grug_and_curly_and_curly walks [2] +19|▒ 1:11: grug_and_curly_and_curly walks 20| 21| file2.doc -22|▒ 2:16: grug_and_curly talks and grug_and_curly drinks [3] +22|▒ 2:16: grug_and_curly talks and grug_and_curly drinks [2] 23|Grug FAR - 1: curly 2,6 Top 24|-- INSERT -- @@ -43,7 +43,7 @@ 16|00222222222222222222222222222222222222222222222222222222222222222222222222222222 17|00777777777222222222222222222222222222222222222222222222222222222222222222222222 18|88525522222222222888882222222222222222222222222222222222222222222222222222223333 -19|11525522222222222111111111111111222222222222222222222222222222222222222222223333 +19|11525522222222222111111111111111222222222222222222222222222222222222222222222222 20|00222222222222222222222222222222222222222222222222222222222222222222222222222222 21|00777777777222222222222222222222222222222222222222222222222222222222222222222222 22|88525522222222222222228888822222222222222222222888882222222222222222222222223333 diff --git a/tests/screenshots/tests-base-test_vimscript_interpreter.lua---can-search-with-replace-interpreter b/tests/screenshots/tests-base-test_vimscript_interpreter.lua---can-search-with-replace-interpreter index 7f46724a..a1fccaaf 100644 --- a/tests/screenshots/tests-base-test_vimscript_interpreter.lua---can-search-with-replace-interpreter +++ b/tests/screenshots/tests-base-test_vimscript_interpreter.lua---can-search-with-replace-interpreter @@ -17,10 +17,10 @@ 16| 17| file1.txt 18|▒ 1:2: grug walks [1] -19|▒ 1:2: grug_and_curly walks [2] +19|▒ 1:2: grug_and_curly walks 20| 21| file2.doc -22|▒ 2:7: grug talks and grug drinks [3] +22|▒ 2:7: grug talks and grug drinks [2] 23|Grug FAR - 1: grug 2,5 Top 24|-- INSERT -- @@ -43,7 +43,7 @@ 16|00222222222222222222222222222222222222222222222222222222222222222222222222222222 17|00777777777222222222222222222222222222222222222222222222222222222222222222222222 18|88525228888222222222222222222222222222222222222222222222222222222222222222223333 -19|11525221111111111111122222222222222222222222222222222222222222222222222222223333 +19|11525221111111111111122222222222222222222222222222222222222222222222222222222222 20|00222222222222222222222222222222222222222222222222222222222222222222222222222222 21|00777777777222222222222222222222222222222222222222222222222222222222222222222222 22|88525222222288882222222222288882222222222222222222222222222222222222222222223333