Skip to content

Commit 7465fd0

Browse files
committed
#76 change where indentation precedence
1 parent d903059 commit 7465fd0

File tree

1 file changed

+12
-13
lines changed

1 file changed

+12
-13
lines changed

indent/haskell.vim

+12-13
Original file line numberDiff line numberDiff line change
@@ -239,19 +239,6 @@ function! GetHaskellIndent()
239239
return match(l:prevline, '\S') + &shiftwidth
240240
endif
241241

242-
"" where foo
243-
"" >>>>>>bar
244-
if l:prevline =~ '\C\<where\>\s\+\S\+.*$'
245-
if l:line =~ '^\s*[=-]>\s' && l:prevline =~ ' :: '
246-
return match(l:prevline, ':: ')
247-
else
248-
let l:s = match(l:prevline, '\C\<where\>')
249-
if s:isSYN('haskellWhere', v:lnum - 1, l:s + 1)
250-
return l:s + g:haskell_indent_where
251-
endif
252-
endif
253-
endif
254-
255242
" do foo
256243
" >>>bar
257244
if l:prevline =~ '\C\<do\>\s\+\S\+.*$'
@@ -267,6 +254,18 @@ function! GetHaskellIndent()
267254
return match(l:prevline, '\C\<case\>') + g:haskell_indent_case
268255
endif
269256

257+
"" where foo
258+
"" >>>>>>bar
259+
if l:prevline =~ '\C\<where\>\s\+\S\+.*$'
260+
if l:line =~ '^\s*[=-]>\s' && l:prevline =~ ' :: '
261+
return match(l:prevline, ':: ')
262+
else
263+
let l:s = match(l:prevline, '\C\<where\>')
264+
if s:isSYN('haskellWhere', v:lnum - 1, l:s + 1)
265+
return l:s + g:haskell_indent_where
266+
endif
267+
endif
268+
270269
" newtype Foo = Foo
271270
" >>deriving
272271
if l:prevline =~ '\C\s*\<\(newtype\|data\)\>[^{]\+' && l:line =~ '\C^\s*\<deriving\>'

0 commit comments

Comments
 (0)