fix priority of parenthesis and case expression (close #33)

Author: itchyny

indent/haskell.vim

@@ -2,7 +2,7 @@
 " Filename: indent/haskell.vim
 " Author: itchyny
 " License: MIT License
-" Last Change: 2024/08/04 15:46:49.
+" Last Change: 2024/11/01 20:51:18.
 " =============================================================================
 
 if exists('b:did_indent')
@@ -110,32 +110,6 @@ function! GetHaskellIndent() abort
     return match(nonblankline, '^\s*\zs--')
   endif
 
-  if nonblankline =~# '\v^\s*}?' . noparen . '[([{]' . noparen . '[-+/*\$&<>,]?\s*%(--.*)?$'
-    if nonblankline =~# '\v[([{]\s*%(--.*)?$'
-      return match(nonblankline, '\v^\s*%(<where>|.*<let>)?\s*\zs') + &shiftwidth
-    elseif nonblankline =~# '\v[-+/*\$&<>,]\s*%(--.*)?$'
-      return match(nonblankline, '\v^\s*}?' . noparen . '%(\[.*\|\s*\zs|[([{]\s*\zs)')
-    elseif nonblankline =~# '\v^[^[\]]*\[([^[\]]*|\[[^[\]]*\])*\|%([^[\]]*|\[[^[\]]*\])*\s*%(--.*)?$'
-      return match(nonblankline, '\v^[^[\]]*\[%([^[\]]*|\[[^[\]]*\])*\zs\|')
-    else
-      return match(nonblankline, '\v^\s*}?' . noparen . '\zs[([{]')
-    endif
-  endif
-
-  " (
-  if getline(v:lnum) =~# '\v^\s*\('
-    let lnum = s:prevnonblank(v:lnum - 1)
-    if lnum == 0
-      return -1
-    elseif nonblankline =~# '\v^\s*%(<where>|.*<let>).*%([-+/*\$&<>=,]+|`\k+`)\s*%(--.*)?$'
-      return match(nonblankline, '\v^\s*<%(where|let)>\s*\zs') + &shiftwidth
-    elseif nonblankline =~# '\v^\s*<%(where|let)>'
-      return match(nonblankline, '\v^\s*%(<where>|<let>)?\s*\zs')
-    elseif nonblankline =~# '\v^\s*<import>'
-      return indent(lnum) + &shiftwidth
-    endif
-  endif
-
   if nonblankline =~# '\v^\s*<infix[rl]?>'
     return match(nonblankline, '\S')
   endif
@@ -152,10 +126,6 @@ function! GetHaskellIndent() abort
     return match(nonblankline, '\v<do>\s*\zs\S')
   endif
 
-  if nonblankline =~# '\v<deriving>'
-    return s:indent('', '\v^\s*\zs<data>', 0)
-  endif
-
   if line =~# '\v<if>' && line !~# '\v^\s*#'
     if line !~# '\v<then>'
       return match(line, '\v.*<if>\s*\zs')
@@ -172,7 +142,7 @@ function! GetHaskellIndent() abort
         return indent(s:prevnonblank(v:lnum - 1)) + &shiftwidth
       endif
     else
-      return line =~# '\v<case>.*<of>\s*[[:alnum:](]'
+      return line =~# '\v<case>.*<of>\s*([[:alnum:](\"''\[]|-\d)'
             \ ? match(line, '\v<case>.*<of>\s*\zs\S')
             \ : match(line, '\v.*<case>\s*\zs')
     endif
@@ -186,6 +156,36 @@ function! GetHaskellIndent() abort
     return match(line, '\v\\\s*<case>\s*\zs\S')
   endif
 
+  if nonblankline =~# '\v^\s*}?' . noparen . '[([{]' . noparen . '[-+/*\$&<>,]?\s*%(--.*)?$'
+    if nonblankline =~# '\v[([{]\s*%(--.*)?$'
+      return match(nonblankline, '\v^\s*%(<where>|.*<let>)?\s*\zs') + &shiftwidth
+    elseif nonblankline =~# '\v[-+/*\$&<>,]\s*%(--.*)?$'
+      return match(nonblankline, '\v^\s*}?' . noparen . '%(\[.*\|\s*\zs|[([{]\s*\zs)')
+    elseif nonblankline =~# '\v^[^[\]]*\[([^[\]]*|\[[^[\]]*\])*\|%([^[\]]*|\[[^[\]]*\])*\s*%(--.*)?$'
+      return match(nonblankline, '\v^[^[\]]*\[%([^[\]]*|\[[^[\]]*\])*\zs\|')
+    else
+      return match(nonblankline, '\v^\s*}?' . noparen . '\zs[([{]')
+    endif
+  endif
+
+  " (
+  if getline(v:lnum) =~# '\v^\s*\('
+    let lnum = s:prevnonblank(v:lnum - 1)
+    if lnum == 0
+      return -1
+    elseif nonblankline =~# '\v^\s*%(<where>|.*<let>).*%([-+/*\$&<>=,]+|`\k+`)\s*%(--.*)?$'
+      return match(nonblankline, '\v^\s*<%(where|let)>\s*\zs') + &shiftwidth
+    elseif nonblankline =~# '\v^\s*<%(where|let)>'
+      return match(nonblankline, '\v^\s*%(<where>|<let>)?\s*\zs')
+    elseif nonblankline =~# '\v^\s*<import>'
+      return indent(lnum) + &shiftwidth
+    endif
+  endif
+
+  if nonblankline =~# '\v<deriving>'
+    return s:indent('', '\v^\s*\zs<data>', 0)
+  endif
+
   if nonblankline =~# '\v^.*[^|]\|[^|].*\='
     return s:after_guard()
   endif

test/case/case_same_line_parenthesis.in.hs

@@ -0,0 +1,4 @@
+f x = F (case x of -1 -> 0
+2 -> 1
+_ -> (-x))
+g x = x

test/case/case_same_line_parenthesis.out.hs

@@ -0,0 +1,4 @@
+f x = F (case x of -1 -> 0
+                   2 -> 1
+                   _ -> (-x))
+g x = x