git.iko.soy/Idris-dev
on master help sign in
fixed vim indentation
8e94d86raichoo
contribs/tool-support/vim/indent/idris.vim+16−16
compare with master
unifiedsplit
@@ -3,7 +3,7 @@
3" Based on haskell indentation by motemen <motemen@gmail.com>
3" Based on haskell indentation by motemen <motemen@gmail.com>
4"
4"
5" author: raichoo (raichoo@googlemail.com)
5" author: raichoo (raichoo@googlemail.com)
6−" date: Oct 31 2012
6+" date: Nov 2 2012
7"
7"
8" Modify g:idris_indent_if and g:idris_indent_case to
8" Modify g:idris_indent_if and g:idris_indent_case to
9" change indentation for `if'(default 3) and `case'(default 5).
9" change indentation for `if'(default 3) and `case'(default 5).
@@ -67,7 +67,7 @@ function! GetIdrisIndent()
67 return match(prevline, '[{([]')
67 return match(prevline, '[{([]')
68 endif
68 endif
69
69
70− if prevline =~ 'let\s\+.\+in\s*$'
70+ if prevline =~ '\<let\>\s\+.\+\<in\>\s*$'
71 return match(prevline, 'let') + g:idris_indent_let
71 return match(prevline, 'let') + g:idris_indent_let
72 endif
72 endif
73
73
@@ -83,40 +83,40 @@ function! GetIdrisIndent()
83 endif
83 endif
84 endif
84 endif
85
85
86− if prevline =~ '\(where\|do\|=\|[{([]\)\s*$'
86+ if prevline =~ '\(\<where\>\|\<do\>\|=\|[{([]\)\s*$'
87 return match(prevline, '\S') + &shiftwidth
87 return match(prevline, '\S') + &shiftwidth
88 endif
88 endif
89
89
90− if prevline =~ 'where\s\+\S\+.*$'
90+ if prevline =~ '\<where\>\s\+\S\+.*$'
91− return match(prevline, 'where') + g:idris_indent_where
91+ return match(prevline, '\<where\>') + g:idris_indent_where
92 endif
92 endif
93
93
94− if prevline =~ 'do\s\+\S\+.*$'
94+ if prevline =~ '\<do\>\s\+\S\+.*$'
95− return match(prevline, 'do') + g:idris_indent_do
95+ return match(prevline, '\<do\>') + g:idris_indent_do
96 endif
96 endif
97
97
98− if prevline =~ '^\s*\(co\)\?data\s\+[^=]\+\s\+=\s\+\S\+.*$'
98+ if prevline =~ '^\s*\<\(co\)\?data\>\s\+[^=]\+\s\+=\s\+\S\+.*$'
99 return match(prevline, '=')
99 return match(prevline, '=')
100 endif
100 endif
101
101
102− if prevline =~ 'with\s\+([^)]*)\s*$'
102+ if prevline =~ '\<with\>\s\+([^)]*)\s*$'
103 return match(prevline, '\S') + &shiftwidth
103 return match(prevline, '\S') + &shiftwidth
104 endif
104 endif
105
105
106− if prevline =~ 'case\s\+.\+of\s*$'
106+ if prevline =~ '\<case\>\s\+.\+\<of\>\s*$'
107 return match(prevline, 'case') + g:idris_indent_case
107 return match(prevline, 'case') + g:idris_indent_case
108 endif
108 endif
109
109
110− if prevline =~ '^\s*\(namespace\|\(co\)\?data\)\s\+\S\+\s*$'
110+ if prevline =~ '^\s*\(\<namespace\>\|\<\(co\)\?data\>\)\s\+\S\+\s*$'
111− return match(prevline, '\(namespace\|\(co\)\?data\)') + &shiftwidth
111+ return match(prevline, '\(\<namespace\>\|\<\(co\)\?data\>\)') + &shiftwidth
112 endif
112 endif
113
113
114− if prevline =~ '^\s*\(using\|parameters\)\s*([^(]*)\s*$'
114+ if prevline =~ '^\s*\(\<using\>\|\<parameters\>\)\s*([^(]*)\s*$'
115− return match(prevline, '\(using\|parameters\)') + &shiftwidth
115+ return match(prevline, '\(\<using\>\|\<parameters\>\)') + &shiftwidth
116 endif
116 endif
117
117
118− if prevline =~ '^\s*mutual\s*$'
118+ if prevline =~ '^\s*\<mutual\>\s*$'
119− return match(prevline, 'mutual') + &shiftwidth
119+ return match(prevline, '\<mutual\>') + &shiftwidth
120 endif
120 endif
121
121
122 let line = getline(v:lnum)
122 let line = getline(v:lnum)