From 18efda3933a867dd21df483bbfeae52231783d46 Mon Sep 17 00:00:00 2001 From: Adam Stankiewicz Date: Tue, 6 Feb 2018 11:15:01 +0800 Subject: Update --- indent/haskell.vim | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'indent/haskell.vim') diff --git a/indent/haskell.vim b/indent/haskell.vim index 5c33e550..5a337144 100644 --- a/indent/haskell.vim +++ b/indent/haskell.vim @@ -296,9 +296,20 @@ function! GetHaskellIndent() "" where foo "" >>>>>>bar + "" + "" where foo :: Int + "" >>>>>>>>>>-> Int + "" + "" where foo x + "" >>>>>>>>| if l:prevline =~ '\C\\s\+\S\+.*$' if l:line =~ '^\s*[=-]>\s' && l:prevline =~ ' :: ' return match(l:prevline, ':: ') + elseif l:line =~ '^\s*|\s' + let l:s = match(l:prevline, '\C\') + if s:isSYN('haskellWhere', v:lnum - 1, l:s + 1) + return l:s + g:haskell_indent_where + g:haskell_indent_guard + endif else let l:s = match(l:prevline, '\C\') if s:isSYN('haskellWhere', v:lnum - 1, l:s + 1) -- cgit v1.2.3