Remove rego syntax, fixes #486

7 files changed, 11 insertions, 79 deletions

diff --git a/README.md b/README.md
index de318b86..334a558d 100644
--- a/README.md
+++ b/README.md
@@ -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.
 
 - 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.
 - All unnecessary files are ignored (like enormous documentation from php support).
 - 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)
 - [razor](https://github.com/adamclerk/vim-razor) (syntax, indent, ftplugin)
 - [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)
 - [rst](https://github.com/marshallward/vim-restructuredtext) (syntax, indent, autoload, ftplugin)
 - [ruby](https://github.com/vim-ruby/vim-ruby) (syntax, indent, compiler, autoload, ftplugin)
diff --git a/autoload/csv.vim b/autoload/csv.vim
index 5926c59a..e05d2e13 100644
--- a/autoload/csv.vim
+++ b/autoload/csv.vim
@@ -762,6 +762,10 @@ fu! csv#CalculateColumnWidth(row, silent) "{{{3
     " does not work with fixed width columns
     " row for the row for which to calculate the width
     let b:col_width=[]
+    if has( 'vartabs' ) && b:delimiter == "\t"
+        let vts_save=&vts
+        set vts=
+    endif
     try
         if exists("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,
     " this was only necessary for calculating the max width
     unlet! b:csv_list s:columnize_count s:decimal_column
+    if has( 'vartabs' ) && b:delimiter == "\t"
+        let &vts=vts_save
+    endif
 endfu
 fu! csv#Columnize(field) "{{{3
     " Internal function, not called from external,
diff --git a/autoload/vimtex/view/zathura.vim b/autoload/vimtex/view/zathura.vim
index 98419981..a001fa7e 100644
--- a/autoload/vimtex/view/zathura.vim
+++ b/autoload/vimtex/view/zathura.vim
@@ -14,7 +14,7 @@ function! vimtex#view#zathura#new() abort " {{{1
   endif
 
   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
           \ && empty(filter(l:shared, 'v:val =~# ''libsynctex'''))
       call vimtex#log#warning('Zathura is not linked to libsynctex!')
diff --git a/build b/build
index 40bea5fd..5746c75c 100755
--- a/build
+++ b/build
@@ -269,7 +269,6 @@ PACKS="
   raml:IN3D/vim-raml
   razor:adamclerk/vim-razor
   reason:reasonml-editor/vim-reason-plus
-  rego:tsandall/vim-rego
   rspec:keith/rspec.vim
   rst:marshallward/vim-restructuredtext
   ruby:vim-ruby/vim-ruby
diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index 65fb0cd5..40c33941 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -1232,17 +1232,6 @@ au BufNewFile,BufRead .merlin       set ft=merlin
   augroup end
 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
   augroup filetypedetect
   " ruby, from ruby.vim in vim-ruby/vim-ruby
diff --git a/syntax/rego.vim b/syntax/rego.vim
deleted file mode 100644
index 5fa20d1a..00000000
--- a/syntax/rego.vim
+++ /dev/null
@@ -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
diff --git a/syntax/thrift.vim b/syntax/thrift.vim
index 4dac50fa..806845a6 100644
--- a/syntax/thrift.vim
+++ b/syntax/thrift.vim
@@ -40,7 +40,8 @@ syn region thriftComment start="/\*" end="\*/" contains=thriftTodo,@Spell
 syn match thriftComment "//.\{-}\(?>\|$\)\@="
 
 " String
-syn region thriftStringDouble matchgroup=None start=+"+  end=+"+
+syn region  thriftString start=+"+ skip=+\\"+ end=+"+
+syn region  thriftString start=+'+ skip=+\\'+ end=+'+
 
 " Number
 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 thriftType map list set
 syn keyword thriftClass union struct exception enum
-syn region  thriftString start=+"+ end=+"+
 
 " Special
 syn match thriftNumber "\d\+:"
@@ -91,7 +91,6 @@ if version >= 508 || !exists("did_thrift_syn_inits")
   HiLink   thriftStatement    Statement
   HiLink   thriftInclude      Include
   HiLink   thriftClass        Type
-  HiLink   thriftString       String
 
   delcommand HiLink
 endif