git.iko.soy/Idris-dev
on master help sign in
Merge pull request #61 from raichoo/vimcodata
cad5efbEdwin Brady
contribs/tool-support/vim/indent/idris.vim+3−3
compare with master
unifiedsplit
@@ -95,7 +95,7 @@ function! GetIdrisIndent()
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*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
@@ -107,8 +107,8 @@ function! GetIdrisIndent()
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\|data\)\s\+\S\+\s*$'
110+ if prevline =~ '^\s*\(namespace\|\(co\)\?data\)\s\+\S\+\s*$'
111− return match(prevline, '\(namespace\|data\)') + &shiftwidth
111+ return match(prevline, '\(namespace\|\(co\)\?data\)') + &shiftwidth
112 endif
112 endif
113
113
114 if prevline =~ '^\s*using\s\+([^(]*)\s*$'
114 if prevline =~ '^\s*using\s\+([^(]*)\s*$'
contribs/tool-support/vim/syntax/idris.vim+9−9
@@ -8,9 +8,9 @@
8
8
9syn match idrisModule "\<\(module\|namespace\)\>"
9syn match idrisModule "\<\(module\|namespace\)\>"
10syn match idrisImport "\<import\>"
10syn match idrisImport "\<import\>"
11−syn match idrisStructure "\<\(class\|data\|instance\|where\|record\)\>"
11+syn match idrisStructure "\<\(class\|\(co\)\?data\|instance\|where\|record\)\>"
12syn match idrisVisibility "\<\(public\|abstract\|private\)\>"
12syn match idrisVisibility "\<\(public\|abstract\|private\)\>"
13−syn match idrisStatement "\<\(do\|case\|of\|let\|in\|with\|total\|dsl\|auto\|using\)\>"
13+syn match idrisStatement "\<\(do\|case\|of\|let\|in\|with\|total\|\|partial\|dsl\|auto\|using\)\>"
14syn match idrisSyntax "\(pattern \+\|term \+\)\?syntax"
14syn match idrisSyntax "\(pattern \+\|term \+\)\?syntax"
15syn match idrisConditional "\<\(if\|then\|else\)\>"
15syn match idrisConditional "\<\(if\|then\|else\)\>"
16syn match idrisTactic contained "\<\(intros\?\|rewrite\|exact\|refine\|trivial\|let\|focus\|try\|compute\|solve\|attack\)\>"
16syn match idrisTactic contained "\<\(intros\?\|rewrite\|exact\|refine\|trivial\|let\|focus\|try\|compute\|solve\|attack\)\>"
@@ -23,13 +23,13 @@ syn match idrisType "\<\([A-Z][a-zA-Z0-9_]*\|_|_\)\>"
23syn match idrisLineComment "---*\([^-!#$%&\*\+./<=>\?@\\^|~].*\)\?$"
23syn match idrisLineComment "---*\([^-!#$%&\*\+./<=>\?@\\^|~].*\)\?$"
24syn match idrisMetaVar "?[a-z][A-Za-z0-9_]\+"
24syn match idrisMetaVar "?[a-z][A-Za-z0-9_]\+"
25syn match idrisLink "%\(lib\|link\|include\)"
25syn match idrisLink "%\(lib\|link\|include\)"
26−syn match idrisAccess "%access"
26+syn match idrisDirective "%\(access\|default\)"
27syn region idrisString start=+"+ skip=+\\\\\|\\"+ end=+"+
27syn region idrisString start=+"+ skip=+\\\\\|\\"+ end=+"+
28syn region idrisBlockComment start="{-" end="-}"
28syn region idrisBlockComment start="{-" end="-}"
29syn region idrisProofBlock start="\(default\s\+\)\?proof *{" end="}" contains=idrisTactic
29syn region idrisProofBlock start="\(default\s\+\)\?proof *{" end="}" contains=idrisTactic
30
30
31−highlight def link idrisImport Include
31+highlight def link idrisImport Structure
32−highlight def link idrisModule idrisStructure
32+highlight def link idrisModule Structure
33highlight def link idrisStructure Structure
33highlight def link idrisStructure Structure
34highlight def link idrisStatement Statement
34highlight def link idrisStatement Statement
35highlight def link idrisSyntax Statement
35highlight def link idrisSyntax Statement
@@ -37,15 +37,15 @@ highlight def link idrisVisibility Statement
37highlight def link idrisConditional Conditional
37highlight def link idrisConditional Conditional
38highlight def link idrisProofBlock Macro
38highlight def link idrisProofBlock Macro
39highlight idrisTactic ctermfg=cyan
39highlight idrisTactic ctermfg=cyan
40−highlight idrisLink ctermbg=yellow ctermfg=magenta
40+highlight def link idrisLink Statement
41−highlight idrisAccess ctermbg=magenta ctermfg=yellow
41+highlight def link idrisDirective Statement
42highlight def link idrisNumber Number
42highlight def link idrisNumber Number
43highlight def link idrisFloat Float
43highlight def link idrisFloat Float
44highlight def link idrisDelimiter Delimiter
44highlight def link idrisDelimiter Delimiter
45highlight def link idrisInfix PreProc
45highlight def link idrisInfix PreProc
46highlight def link idrisOperators Operator
46highlight def link idrisOperators Operator
47−highlight def link idrisType Type
47+highlight def link idrisType Include
48highlight def link idrisLineComment Comment
48highlight def link idrisLineComment Comment
49highlight def link idrisBlockComment Comment
49highlight def link idrisBlockComment Comment
50−highlight idrisMetaVar ctermbg=cyan ctermfg=black
50+highlight idrisMetaVar ctermfg=lightred
51highlight def link idrisString String
51highlight def link idrisString String