Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions indent/haskell.vim
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,14 @@ function! GetHaskellIndent() abort
return match(line, '\v^\s*%(<where>|.*<let>)?\s*\zs') + &shiftwidth
endif

if line =~# '\v\\\s*<cases>\s*%(--.*)?$'
return match(line, '\v^\s*%(<where>|.*<let>)?\s*\zs') + &shiftwidth
endif

if line =~# '\v\\\s*<cases>\s*[[:alnum:](_\-\"'']'
return match(line, '\v\\\s*<cases>\s*\zs\S')
endif

if nonblankline =~# '\v^.*[^|]\|[^|].*\='
return s:after_guard()
endif
Expand Down Expand Up @@ -467,6 +475,8 @@ function! s:indent_bar() abort
let line = getline(i)
if line =~# '\v^[^[\]]*%([^[\]]*|\[[^[\]]*\])*\[%([^[\]]*|\[[^[\]]*\])*%(--.*)?$'
return match(line, '\v^[^[\]]*%([^[\]]*|\[[^[\]]*\])*\zs\[([^[\]]*|\[[^[\]]*\])*%(--.*)?$') + &shiftwidth
elseif line =~# '\v\\\s*<cases>.*\|'
return match(line, '\v\\\s*<cases>.*\zs\|')
elseif line =~# '\v^\s*%(<where>)?.*[^|]\|[^|].*\='
return match(line, '\v^\s*%(<where>)?.*[^|]\zs\|[^|].*\=')
elseif line =~# '\v<data>.*\='
Expand Down
6 changes: 6 additions & 0 deletions test/case/cases.in.hs
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
printGender :: Language -> Gender -> Text
printGender = \cases
English Male -> "Male"
English Female -> "Female"
Chinese Male -> "男性"
Chinese Female -> "女性"
6 changes: 6 additions & 0 deletions test/case/cases.out.hs
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
printGender :: Language -> Gender -> Text
printGender = \cases
English Male -> "Male"
English Female -> "Female"
Chinese Male -> "男性"
Chinese Female -> "女性"
5 changes: 5 additions & 0 deletions test/case/cases_same_line.in.hs
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
printGender :: Language -> Gender -> Text
printGender = \cases English Male -> "Male"
English Female -> "Female"
Chinese Male -> "男性"
Chinese Female -> "女性"
5 changes: 5 additions & 0 deletions test/case/cases_same_line.out.hs
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
printGender :: Language -> Gender -> Text
printGender = \cases English Male -> "Male"
English Female -> "Female"
Chinese Male -> "男性"
Chinese Female -> "女性"
3 changes: 3 additions & 0 deletions test/case/casesguard.in.hs
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
filter = \cases _ [] -> []
p (x:xs) | p x -> x : filter p xs
| otherwise -> filter p xs
3 changes: 3 additions & 0 deletions test/case/casesguard.out.hs
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
filter = \cases _ [] -> []
p (x:xs) | p x -> x : filter p xs
| otherwise -> filter p xs