Merge pull request #16 from ShinKage/disable-color

Disable color and minor syntax additions
This commit is contained in:
Edwin Brady 2020-11-26 15:50:07 +00:00 committed by GitHub
commit 964cebee49
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 6 deletions

View file

@ -33,8 +33,9 @@ endfunction
function! s:IdrisCommand(...) function! s:IdrisCommand(...)
let idriscmd = shellescape(join(a:000)) let idriscmd = shellescape(join(a:000))
" echo("idris2 " . expand ('%:p') . " --client " . idriscmd) " Vim does not support ANSI escape codes natively, so we need to disable
return system("idris2 --find-ipkg " . shellescape(expand('%:p')) . " --client " . idriscmd) " automatic colouring
return system("idris2 --no-color --find-ipkg " . shellescape(expand('%:p')) . " --client " . idriscmd)
endfunction endfunction
function! IdrisDocFold(lineNum) function! IdrisDocFold(lineNum)
@ -95,7 +96,7 @@ endfunction
function! IdrisReload(q) function! IdrisReload(q)
w w
let file = expand('%:p') let file = expand('%:p')
let tc = system("idris2 --find-ipkg " . shellescape(file) . " --client ''") let tc = system("idris2 --no-color --find-ipkg " . shellescape(file) . " --client ''")
if (! (tc is "")) if (! (tc is ""))
call IWrite(tc) call IWrite(tc)
else else

View file

@ -26,7 +26,6 @@ syn keyword idrisStatement do case of rewrite with
syn keyword idrisLet let in syn keyword idrisLet let in
syn keyword idrisForall forall syn keyword idrisForall forall
syn keyword idrisDataOpt noHints uniqueSearch search external noNewtype containedin=idrisBrackets syn keyword idrisDataOpt noHints uniqueSearch search external noNewtype containedin=idrisBrackets
syn match idrisSyntax "\(pattern \+\|term \+\)\?syntax"
syn keyword idrisConditional if then else syn keyword idrisConditional if then else
syn match idrisNumber "\<[0-9]\+\>\|\<0[xX][0-9a-fA-F]\+\>\|\<0[oO][0-7]\+\>" syn match idrisNumber "\<[0-9]\+\>\|\<0[xX][0-9a-fA-F]\+\>\|\<0[oO][0-7]\+\>"
syn match idrisFloat "\<[0-9]\+\.[0-9]\+\([eE][-+]\=[0-9]\+\)\=\>" syn match idrisFloat "\<[0-9]\+\.[0-9]\+\([eE][-+]\=[0-9]\+\)\=\>"
@ -38,7 +37,7 @@ syn keyword idrisTodo TODO FIXME XXX HACK contained
syn match idrisLineComment "---*\([^-!#$%&\*\+./<=>\?@\\^|~].*\)\?$" contains=idrisTodo,@Spell syn match idrisLineComment "---*\([^-!#$%&\*\+./<=>\?@\\^|~].*\)\?$" contains=idrisTodo,@Spell
syn match idrisDocComment "|||\([^-!#$%&\*\+./<=>\?@\\^|~].*\)\?$" contains=idrisTodo,@Spell syn match idrisDocComment "|||\([^-!#$%&\*\+./<=>\?@\\^|~].*\)\?$" contains=idrisTodo,@Spell
syn match idrisMetaVar "?[a-z][A-Za-z0-9_']*" syn match idrisMetaVar "?[a-z][A-Za-z0-9_']*"
syn match idrisPragma "%\(hide\|logging\|auto_lazy\|unbound_implicits\|undotted_record_projections\|amibguity_depth\|pair\|rewrite\|integerLit\|stringLit\|charLit\|name\|start\|allow_overloads\|language\|default\|transform\|hint\|global_hint\|defaulthint\|inline\|extern\|macro\|spec\|foreign\|runElab\|tcinline\)" syn match idrisPragma "%\(hide\|logging\|auto_lazy\|unbound_implicits\|undotted_record_projections\|amibguity_depth\|pair\|rewrite\|integerLit\|stringLit\|charLit\|name\|start\|allow_overloads\|language\|default\|transform\|hint\|global_hint\|defaulthint\|inline\|extern\|macro\|spec\|foreign\|runElab\|tcinline\|defaulthint\|auto_implicit_depth\)"
syn match idrisChar "'[^'\\]'\|'\\.'\|'\\u[0-9a-fA-F]\{4}'" syn match idrisChar "'[^'\\]'\|'\\.'\|'\\u[0-9a-fA-F]\{4}'"
syn match idrisBacktick "`[A-Za-z][A-Za-z0-9_']*`" syn match idrisBacktick "`[A-Za-z][A-Za-z0-9_']*`"
syn region idrisString start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=@Spell syn region idrisString start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=@Spell
@ -59,7 +58,6 @@ highlight def link idrisAnnotation Statement
highlight def link idrisWhere Structure highlight def link idrisWhere Structure
highlight def link idrisLet Structure highlight def link idrisLet Structure
highlight def link idrisTotality Statement highlight def link idrisTotality Statement
highlight def link idrisSyntax Statement
highlight def link idrisVisibility Statement highlight def link idrisVisibility Statement
highlight def link idrisConditional Conditional highlight def link idrisConditional Conditional
highlight def link idrisPragma Statement highlight def link idrisPragma Statement