Bug fix: ignore 'do' matches inside words

mateoxh · mateoxh · commit d0251363fe83 · 2025-03-03T08:24:50.000+01:00
diff --git a/indent/haskell.vim b/indent/haskell.vim
@@ -129,6 +129,9 @@ function! GetHaskellIndent() abort
 
   if nonblankline =~# '\v<do>\s*[[:alnum:](]'
     let i = strridx(nonblankline, 'do ')
+    while i >= 1 && nonblankline[i - 1] =~# '\k'
+      let i = strridx(nonblankline, 'do ', i - 1)
+    endwhile
     return match(nonblankline, '\v<do>\s*\zs', i)
   endif
 
diff --git a/test/do/double_do.in.hs b/test/do/double_do.in.hs
@@ -1,3 +1,3 @@
-do foo <- do bar <- baz
+do foo <- do undo <- baz
 qux
 quux
diff --git a/test/do/double_do.out.hs b/test/do/double_do.out.hs
@@ -1,3 +1,3 @@
-do foo <- do bar <- baz
+do foo <- do undo <- baz
              qux
              quux

-Original file line number
+Diff line change
@@ @@ -1,3 +1,3 @@ @@
 -do foo <- do bar <- baz
 +do foo <- do undo <- baz
 qux
 quux