@@ -189,13 +189,13 @@ function! GetHaskellIndent()
189
189
190
190
" operator at end of previous line
191
191
if l: prevline = ~ ' [!#$%&*+./<>?@\\^|~-]\s*$'
192
- return indent (v: lnum - 1 ) + & shiftwidth
192
+ return indent (v: lnum - 1 ) + shiftwidth ()
193
193
endif
194
194
195
195
" let foo =
196
196
" >>>>>>bar
197
197
if l: prevline = ~ ' \C\<let\>\s\+[^=]\+=\s*$'
198
- return match (l: prevline , ' \C\<let\>' ) + g: haskell_indent_let + & shiftwidth
198
+ return match (l: prevline , ' \C\<let\>' ) + g: haskell_indent_let + shiftwidth ()
199
199
endif
200
200
201
201
" let x = 1 in
@@ -243,7 +243,7 @@ function! GetHaskellIndent()
243
243
" >>foo
244
244
"
245
245
if l: prevline = ~ ' \C\<where\>\s*$'
246
- return indent (v: lnum - 1 ) + get (g: , ' haskell_indent_after_bare_where' , & shiftwidth )
246
+ return indent (v: lnum - 1 ) + get (g: , ' haskell_indent_after_bare_where' , shiftwidth () )
247
247
endif
248
248
249
249
" do
@@ -252,7 +252,7 @@ function! GetHaskellIndent()
252
252
" foo =
253
253
" >>bar
254
254
if l: prevline = ~ ' \C\(\<do\>\|=\)\s*$'
255
- return indent (v: lnum - 1 ) + & shiftwidth
255
+ return indent (v: lnum - 1 ) + shiftwidth ()
256
256
endif
257
257
258
258
" do foo
@@ -268,7 +268,7 @@ function! GetHaskellIndent()
268
268
" >>bar -> quux
269
269
if l: prevline = ~ ' \C\<case\>.\+\<of\>\s*$'
270
270
if get (g: ,' haskell_indent_case_alternative' , 0 )
271
- return indent (v: lnum - 1 ) + & shiftwidth
271
+ return indent (v: lnum - 1 ) + shiftwidth ()
272
272
else
273
273
return match (l: prevline , ' \C\<case\>' ) + g: haskell_indent_case
274
274
endif
@@ -301,7 +301,7 @@ function! GetHaskellIndent()
301
301
" newtype Foo = Foo
302
302
" >>deriving
303
303
if l: prevline = ~ ' \C^\s*\<\(newtype\|data\)\>[^{]\+' && l: line = ~ ' \C^\s*\<deriving\>'
304
- return indent (v: lnum - 1 ) + & shiftwidth
304
+ return indent (v: lnum - 1 ) + shiftwidth ()
305
305
endif
306
306
307
307
" foo :: Int
@@ -314,7 +314,7 @@ function! GetHaskellIndent()
314
314
if l: line = ~ ' ^\s*[-=]>'
315
315
return match (l: prevline , ' ::\s' )
316
316
elseif match (l: prevline , ' ^\s\+::' ) > -1
317
- return match (l: prevline , ' ::\s' ) - & shiftwidth
317
+ return match (l: prevline , ' ::\s' ) - shiftwidth ()
318
318
endif
319
319
endif
320
320
@@ -394,21 +394,21 @@ function! GetHaskellIndent()
394
394
" >>>>>=> Int
395
395
if l: prevline = ~ ' ^\s*)' && l: line = ~ ' ^\s*=>'
396
396
let l: s = match (l: prevline , ' )' )
397
- return l: s - (& shiftwidth + 1 )
397
+ return l: s - (shiftwidth () + 1 )
398
398
endif
399
399
400
400
" module Foo
401
401
" >>( bar
402
402
if l: prevline = ~ ' \C^\<module\>'
403
- return & shiftwidth
403
+ return shiftwidth ()
404
404
endif
405
405
406
406
" foo
407
407
" >>{
408
408
if l: line = ~ ' ^\s*{'
409
409
let l: s = indent (v: lnum - 1 )
410
410
if l: s >= 0
411
- return l: s + & shiftwidth
411
+ return l: s + shiftwidth ()
412
412
endif
413
413
endif
414
414
@@ -424,7 +424,7 @@ function! GetHaskellIndent()
424
424
return match (l: prevline , ' in' ) - g: haskell_indent_in
425
425
endif
426
426
427
- return indent (v: lnum - 1 ) + get (g: , ' haskell_indent_before_where' , & shiftwidth )
427
+ return indent (v: lnum - 1 ) + get (g: , ' haskell_indent_before_where' , shiftwidth () )
428
428
endif
429
429
430
430
" let x = 1
@@ -458,13 +458,13 @@ function! GetHaskellIndent()
458
458
" >>=
459
459
if l: line = ~ ' ^\s*='
460
460
if l: prevline = ~ ' \C^\<data\>\s\+[^=]\+\s*$'
461
- return match (l: prevline , ' \C\<data\>' ) + & shiftwidth
461
+ return match (l: prevline , ' \C\<data\>' ) + shiftwidth ()
462
462
else
463
463
let l: s = s: indentGuard (match (l: line , ' =' ), l: prevline )
464
464
if l: s > 0
465
465
return l: s
466
466
else
467
- return & shiftwidth
467
+ return shiftwidth ()
468
468
endif
469
469
endif
470
470
endif
@@ -489,7 +489,7 @@ function! GetHaskellIndent()
489
489
" foo
490
490
" >>:: Int
491
491
if l: line = ~ ' ^\s*::\s'
492
- return indent (v: lnum - 1 ) + & shiftwidth
492
+ return indent (v: lnum - 1 ) + shiftwidth ()
493
493
endif
494
494
495
495
" indent closing brace, paren or bracket
0 commit comments