fix comma is always prepended to b:match_words

rhysd · May 20, 2024 · 0b6710b · 0b6710b
1 parent b877faa
commit 0b6710b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/plugin/conflict_marker.vim b/plugin/conflict_marker.vim
@@ -68,12 +68,13 @@ function! s:set_conflict_marker_to_match_words()
         return
     endif
 
-    let b:match_words = get(b:, 'match_words', '')
-                \       . printf(',%s:%s:%s:%s',
-                \                g:conflict_marker_begin,
-                \                g:conflict_marker_common_ancestors,
-                \                g:conflict_marker_separator,
-                \                g:conflict_marker_end)
+    let group = printf('%s:%s:%s:%s',
+                        \ g:conflict_marker_begin,
+                        \ g:conflict_marker_common_ancestors,
+                        \ g:conflict_marker_separator,
+                        \ g:conflict_marker_end)
+
+    let b:match_words = exists('b:match_words') ? b:match_words . ',' . group : group
     let b:conflict_marker_match_words_loaded = 1
 endfunction
 

diff --git a/test/test_matchit.vimspec b/test/test_matchit.vimspec
@@ -35,7 +35,7 @@ Describe matchit
 
     It defines b:match_words
         Assert Exists('b:match_words')
-        Assert Equals(b:match_words, ',^<<<<<<<\+:^|||||||\+:^=======\+$:^>>>>>>>\+')
+        Assert Equals(b:match_words, '^<<<<<<<\+:^|||||||\+:^=======\+$:^>>>>>>>\+')
     End
 
     It can jump within a conflict marker