Merge pull request #9 from zschreur/zschreur/push-skrmqnnosqwu

Fix conflict match
zschreur · May 29, 2024 · 064bf3c · 064bf3c
2 parents f3a109e + 04ed71d
commit 064bf3c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/lua/telescope-jj/conflicts.lua b/lua/telescope-jj/conflicts.lua
@@ -17,7 +17,7 @@ return function(opts)
     local results = {}
     for _, str in ipairs(cmd_output) do
         -- https://github.com/martinvonz/jj/blob/9a5b001d58353afb7ea6cb894c22d80878b811ae/cli/src/cli_util.rs#L1778
-        local word = string.match(str, "^(.-)%s+%a+%-sided conflict$")
+        local word = string.match(str, "^(.-)%s+%d+%-sided conflict$")
         table.insert(results, word)
     end
 

diff --git a/lua/telescope-jj/conflicts.test.lua b/lua/telescope-jj/conflicts.test.lua
@@ -1,12 +1,12 @@
-local s1 = "file two-sided conflict"
-local s2 = "file  two-sided conflict"
-local s3 = "file   two-sided conflict"
-local s4 = "file   three-sided conflict"
-local s5 = "file two-sided conflict two-sided conflict"
+local s1 = "file 2-sided conflict"
+local s2 = "file  2-sided conflict"
+local s3 = "file   2-sided conflict"
+local s4 = "file   3-sided conflict"
+local s5 = "file 2-sided conflict 2-sided conflict"
 
-local pattern = "^(.-)%s+%a+%-sided conflict$"
+local pattern = "^(.-)%s+%d+%-sided conflict$"
 assert(string.match(s1, pattern) == "file")
 assert(string.match(s2, pattern) == "file")
 assert(string.match(s3, pattern) == "file")
 assert(string.match(s4, pattern) == "file")
-assert(string.match(s5, pattern) == "file two-sided conflict")
+assert(string.match(s5, pattern) == "file 2-sided conflict")