Merge pull request #7 from buzden/further-secondification
Further "Idris" -> "Idris 2" renamings were done
This commit is contained in:
commit
2f1a013414
5 changed files with 17 additions and 17 deletions
|
@ -1 +0,0 @@
|
||||||
au BufNewFile,BufRead *.lidr setf lidris
|
|
1
ftdetect/lidris2.vim
Normal file
1
ftdetect/lidris2.vim
Normal file
|
@ -0,0 +1 @@
|
||||||
|
au BufNewFile,BufRead *.lidr setf lidris2
|
|
@ -1,7 +1,7 @@
|
||||||
" syntax highlighting for idris (idris-lang.org)
|
" syntax highlighting for Idris 2 (idris-lang.org)
|
||||||
"
|
"
|
||||||
" Heavily modified version of the haskell syntax
|
" Heavily modified version of the haskell syntax
|
||||||
" highlighter to support idris.
|
" highlighter to support Idris 2.
|
||||||
"
|
"
|
||||||
" author: raichoo (raichoo@googlemail.com)
|
" author: raichoo (raichoo@googlemail.com)
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
" Vim syntax file
|
" Vim syntax file
|
||||||
" Language: Literate Idris
|
" Language: Literate Idris 2
|
||||||
" Maintainer: Idris Hackers (https://github.com/idris-hackers/idris-vim)
|
" Maintainer: Idris Hackers (https://github.com/edwinb/idris2-vim)
|
||||||
" Last Change: 2014 Mar 4
|
" Last Change: 2020 May 19
|
||||||
" Version: 0.1
|
" Version: 0.1
|
||||||
"
|
"
|
||||||
" This is just a minimal adaption of the Literate Haskell syntax file.
|
" This is just a minimal adaption of the Literate Haskell syntax file.
|
||||||
|
@ -9,9 +9,9 @@
|
||||||
|
|
||||||
" Read Idris highlighting.
|
" Read Idris highlighting.
|
||||||
if version < 600
|
if version < 600
|
||||||
syntax include @idrisTop <sfile>:p:h/idris.vim
|
syntax include @idrisTop <sfile>:p:h/idris2.vim
|
||||||
else
|
else
|
||||||
syntax include @idrisTop syntax/idris.vim
|
syntax include @idrisTop syntax/idris2.vim
|
||||||
endif
|
endif
|
||||||
|
|
||||||
" Recognize blocks of Bird tracks, highlight as Idris.
|
" Recognize blocks of Bird tracks, highlight as Idris.
|
||||||
|
@ -19,4 +19,4 @@ syntax region lidrisBirdTrackBlock start="^>" end="\%(^[^>]\)\@=" contains=@idri
|
||||||
syntax match lidrisBirdTrack "^>" contained
|
syntax match lidrisBirdTrack "^>" contained
|
||||||
hi def link lidrisBirdTrack Comment
|
hi def link lidrisBirdTrack Comment
|
||||||
|
|
||||||
let b:current_syntax = "lidris"
|
let b:current_syntax = "lidris2"
|
|
@ -1,5 +1,5 @@
|
||||||
"============================================================================
|
"============================================================================
|
||||||
"File: idris.vim
|
"File: idris2.vim
|
||||||
"Description: Syntax checking plugin for syntastic.vim
|
"Description: Syntax checking plugin for syntastic.vim
|
||||||
"Maintainer: raichoo <raichoo at googlemail dot com>
|
"Maintainer: raichoo <raichoo at googlemail dot com>
|
||||||
"License: This program is free software. It comes without any warranty,
|
"License: This program is free software. It comes without any warranty,
|
||||||
|
@ -16,7 +16,7 @@ endif
|
||||||
let g:loaded_syntastic_idris_idris_checker=1
|
let g:loaded_syntastic_idris_idris_checker=1
|
||||||
|
|
||||||
function! SyntaxCheckers_idris_idris_IsAvailable()
|
function! SyntaxCheckers_idris_idris_IsAvailable()
|
||||||
return executable("idris")
|
return executable("idris2")
|
||||||
endfunction
|
endfunction
|
||||||
|
|
||||||
if !exists("g:syntastic_idris_options")
|
if !exists("g:syntastic_idris_options")
|
||||||
|
@ -25,11 +25,11 @@ endif
|
||||||
|
|
||||||
function! SyntaxCheckers_idris_idris_GetLocList() dict
|
function! SyntaxCheckers_idris_idris_GetLocList() dict
|
||||||
let makeprg = self.makeprgBuild({
|
let makeprg = self.makeprgBuild({
|
||||||
\ 'exe': 'idris',
|
\ 'exe': 'idris2',
|
||||||
\ 'args': "--client ':l". g:syntastic_idris_options,
|
\ 'args': "--find-ipkg --client ':l". g:syntastic_idris_options,
|
||||||
\ 'post_args': "'",
|
\ 'post_args': "'",
|
||||||
\ 'filetype': 'idris',
|
\ 'filetype': 'idris2',
|
||||||
\ 'subchecker': 'idris' })
|
\ 'subchecker': 'idris2' })
|
||||||
|
|
||||||
let errorformat =
|
let errorformat =
|
||||||
\ '"%f" (line %l\, column %c\):,' .
|
\ '"%f" (line %l\, column %c\):,' .
|
||||||
|
@ -50,5 +50,5 @@ function! SyntaxCheckers_idris_idris_GetLocList() dict
|
||||||
endfunction
|
endfunction
|
||||||
|
|
||||||
call g:SyntasticRegistry.CreateAndRegisterChecker({
|
call g:SyntasticRegistry.CreateAndRegisterChecker({
|
||||||
\ 'filetype': 'idris',
|
\ 'filetype': 'idris2',
|
||||||
\ 'name': 'idris'})
|
\ 'name': 'idris2'})
|
||||||
|
|
Loading…
Reference in a new issue