Remove rego syntax, fixes #486

This commit is contained in:
Adam Stankiewicz
2020-04-30 16:49:01 +02:00
parent c7b5826d53
commit 0a7c62b3b2
7 changed files with 11 additions and 79 deletions

View File

@@ -10,7 +10,7 @@ A collection of language packs for Vim.
> One to rule them all, one to find them, one to bring them all and in the darkness bind them. > One to rule them all, one to find them, one to bring them all and in the darkness bind them.
- It **won't affect your startup time**, as scripts are loaded only on demand\*. - It **won't affect your startup time**, as scripts are loaded only on demand\*.
- It **installs and updates 120+ times faster** than the <!--Package Count-->149<!--/Package Count--> packages it consists of. - It **installs and updates 120+ times faster** than the <!--Package Count-->148<!--/Package Count--> packages it consists of.
- Solid syntax and indentation support (other features skipped). Only the best language packs. - Solid syntax and indentation support (other features skipped). Only the best language packs.
- All unnecessary files are ignored (like enormous documentation from php support). - All unnecessary files are ignored (like enormous documentation from php support).
- No support for esoteric languages, only most popular ones (modern too, like `slim`). - No support for esoteric languages, only most popular ones (modern too, like `slim`).
@@ -151,7 +151,6 @@ If you need full functionality of any plugin, please use it directly with your p
- [raml](https://github.com/IN3D/vim-raml) (syntax, ftplugin) - [raml](https://github.com/IN3D/vim-raml) (syntax, ftplugin)
- [razor](https://github.com/adamclerk/vim-razor) (syntax, indent, ftplugin) - [razor](https://github.com/adamclerk/vim-razor) (syntax, indent, ftplugin)
- [reason](https://github.com/reasonml-editor/vim-reason-plus) (syntax, indent) - [reason](https://github.com/reasonml-editor/vim-reason-plus) (syntax, indent)
- [rego](https://github.com/tsandall/vim-rego) (syntax)
- [rspec](https://github.com/keith/rspec.vim) (syntax) - [rspec](https://github.com/keith/rspec.vim) (syntax)
- [rst](https://github.com/marshallward/vim-restructuredtext) (syntax, indent, autoload, ftplugin) - [rst](https://github.com/marshallward/vim-restructuredtext) (syntax, indent, autoload, ftplugin)
- [ruby](https://github.com/vim-ruby/vim-ruby) (syntax, indent, compiler, autoload, ftplugin) - [ruby](https://github.com/vim-ruby/vim-ruby) (syntax, indent, compiler, autoload, ftplugin)

View File

@@ -762,6 +762,10 @@ fu! csv#CalculateColumnWidth(row, silent) "{{{3
" does not work with fixed width columns " does not work with fixed width columns
" row for the row for which to calculate the width " row for the row for which to calculate the width
let b:col_width=[] let b:col_width=[]
if has( 'vartabs' ) && b:delimiter == "\t"
let vts_save=&vts
set vts=
endif
try try
if exists("b:csv_headerline") if exists("b:csv_headerline")
if line('.') < b:csv_headerline if line('.') < b:csv_headerline
@@ -780,6 +784,9 @@ fu! csv#CalculateColumnWidth(row, silent) "{{{3
" delete buffer content in variable b:csv_list, " delete buffer content in variable b:csv_list,
" this was only necessary for calculating the max width " this was only necessary for calculating the max width
unlet! b:csv_list s:columnize_count s:decimal_column unlet! b:csv_list s:columnize_count s:decimal_column
if has( 'vartabs' ) && b:delimiter == "\t"
let &vts=vts_save
endif
endfu endfu
fu! csv#Columnize(field) "{{{3 fu! csv#Columnize(field) "{{{3
" Internal function, not called from external, " Internal function, not called from external,

View File

@@ -14,7 +14,7 @@ function! vimtex#view#zathura#new() abort " {{{1
endif endif
if executable('ldd') if executable('ldd')
let l:shared = split(system('ldd =zathura')) let l:shared = split(system("sh -c 'ldd $(which zathura)'"))
if v:shell_error == 0 if v:shell_error == 0
\ && empty(filter(l:shared, 'v:val =~# ''libsynctex''')) \ && empty(filter(l:shared, 'v:val =~# ''libsynctex'''))
call vimtex#log#warning('Zathura is not linked to libsynctex!') call vimtex#log#warning('Zathura is not linked to libsynctex!')

1
build
View File

@@ -269,7 +269,6 @@ PACKS="
raml:IN3D/vim-raml raml:IN3D/vim-raml
razor:adamclerk/vim-razor razor:adamclerk/vim-razor
reason:reasonml-editor/vim-reason-plus reason:reasonml-editor/vim-reason-plus
rego:tsandall/vim-rego
rspec:keith/rspec.vim rspec:keith/rspec.vim
rst:marshallward/vim-restructuredtext rst:marshallward/vim-restructuredtext
ruby:vim-ruby/vim-ruby ruby:vim-ruby/vim-ruby

View File

@@ -1232,17 +1232,6 @@ au BufNewFile,BufRead .merlin set ft=merlin
augroup end augroup end
endif endif
if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rego') == -1
augroup filetypedetect
" rego, from rego.vim in tsandall/vim-rego
autocmd BufRead,BufNewFile *.rego set filetype=rego
" Use # as a comment prefix
setlocal comments=b:#,fb:-
setlocal commentstring=#\ %s
augroup end
endif
if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ruby') == -1 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ruby') == -1
augroup filetypedetect augroup filetypedetect
" ruby, from ruby.vim in vim-ruby/vim-ruby " ruby, from ruby.vim in vim-ruby/vim-ruby

View File

@@ -1,61 +0,0 @@
if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rego') == -1
" Vim syntax file
" Language: Rego (http://github.com/open-policy-agent/opa)
" Maintainers: Torin Sandall <torinsandall@gmail.com>
if version < 600
syntax clear
elseif exists("b:current_syntax")
finish
endif
syn case match
" language keywords
syn keyword regoKeyword package import as not with default else some
" comments
syn match regoComment "#.*$" contains=regoTodo,@Spell
syn keyword regoTodo FIXME XXX TODO contained
" data types
syn keyword regoNull null
syn keyword regoBoolean true false
syn match regoNumber "\<\(0[0-7]*\|0[xx]\x\+\|\d\+\)[ll]\=\>"
syn match regoNumber "\(\<\d\+\.\d*\|\.\d\+\)\([ee][-+]\=\d\+\)\=[ffdd]\="
syn match regoNumber "\<\d\+[ee][-+]\=\d\+[ffdd]\=\>"
syn match regoNumber "\<\d\+\([ee][-+]\=\d\+\)\=[ffdd]\>"
syn region regoString start="\"" skip="\\\"" end="\"" contains=regoStringEscape
syn match regoStringEscape "\\u[0-9a-fA-F]\{4}" contained
syn match regoStringEscape "\\[nrfvb\\\"]" contained
" rules
syn match regoRuleName "^\(\w\+\)"
syn region regoBody start="{" end="}" transparent
" operators
syn match regoEquality "="
syn match regoInequality "[<>!]"
syn match regoArith "[+-/*&|]"
syn match regoBuiltin "\w\+(" nextgroup=regoBuiltinArgs contains=regoBuiltinArgs
syn region regoBuiltinArgs start="(" end=")" contained contains=regoNull,regoBoolean,regoNumber,regoString
" highlighting
hi link regoKeyword Keyword
hi link regoNull Function
hi link regoBoolean Boolean
hi link regoNumber Number
hi link regoString String
hi link regoRuleName Function
hi link regoEquality Keyword
hi link regoInequality Keyword
hi link regoArith Keyword
hi link regoBuiltin Type
hi link regoComment Comment
hi link regoTodo Todo
endif

View File

@@ -40,7 +40,8 @@ syn region thriftComment start="/\*" end="\*/" contains=thriftTodo,@Spell
syn match thriftComment "//.\{-}\(?>\|$\)\@=" syn match thriftComment "//.\{-}\(?>\|$\)\@="
" String " String
syn region thriftStringDouble matchgroup=None start=+"+ end=+"+ syn region thriftString start=+"+ skip=+\\"+ end=+"+
syn region thriftString start=+'+ skip=+\\'+ end=+'+
" Number " Number
syn match thriftNumber "-\=\<\d\+\>" contained syn match thriftNumber "-\=\<\d\+\>" contained
@@ -55,7 +56,6 @@ syn keyword thriftBasicTypes void bool byte string binary
syn keyword thriftBasicTypes i16 i32 i64 double syn keyword thriftBasicTypes i16 i32 i64 double
syn keyword thriftType map list set syn keyword thriftType map list set
syn keyword thriftClass union struct exception enum syn keyword thriftClass union struct exception enum
syn region thriftString start=+"+ end=+"+
" Special " Special
syn match thriftNumber "\d\+:" syn match thriftNumber "\d\+:"
@@ -91,7 +91,6 @@ if version >= 508 || !exists("did_thrift_syn_inits")
HiLink thriftStatement Statement HiLink thriftStatement Statement
HiLink thriftInclude Include HiLink thriftInclude Include
HiLink thriftClass Type HiLink thriftClass Type
HiLink thriftString String
delcommand HiLink delcommand HiLink
endif endif