From 1597b7b766ee3999cdfea862af14999c37041d0e Mon Sep 17 00:00:00 2001 From: Adam Stankiewicz Date: Mon, 4 Mar 2019 09:28:35 +0100 Subject: Change plugin guard for disabling, fixes #371 --- after/ftplugin/cabal.vim | 8 ++++---- after/ftplugin/coffee.vim | 8 ++++---- after/ftplugin/haskell.vim | 8 ++++---- after/ftplugin/javascript.vim | 8 ++++---- after/ftplugin/jsx.vim | 8 ++++---- after/ftplugin/puppet.vim | 8 ++++---- after/ftplugin/terraform.vim | 8 ++++---- after/ftplugin/yaml.vim | 8 ++++---- after/indent/html.vim | 8 ++++---- after/indent/jsx.vim | 8 ++++---- after/indent/objc.vim | 8 ++++---- after/syntax/c.vim | 8 ++++---- after/syntax/coffee.vim | 8 ++++---- after/syntax/cpp.vim | 8 ++++---- after/syntax/haml.vim | 8 ++++---- after/syntax/help.vim | 8 ++++---- after/syntax/html.vim | 26 +++++++++++++------------- after/syntax/javascript/graphql.vim | 8 ++++---- after/syntax/jsx.vim | 8 ++++---- after/syntax/mma.vim | 8 ++++---- after/syntax/objc.vim | 8 ++++---- after/syntax/rspec.vim | 8 ++++---- after/syntax/ruby.vim | 8 ++++---- after/syntax/rust.vim | 8 ++++---- after/syntax/tex.vim | 8 ++++---- after/syntax/typescript/graphql.vim | 8 ++++---- after/syntax/yaml.vim | 8 ++++---- 27 files changed, 117 insertions(+), 117 deletions(-) (limited to 'after') diff --git a/after/ftplugin/cabal.vim b/after/ftplugin/cabal.vim index 17bca8f5..3c66372a 100644 --- a/after/ftplugin/cabal.vim +++ b/after/ftplugin/cabal.vim @@ -1,7 +1,7 @@ -if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'haskell') == -1 - +if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'haskell') != -1 + finish +endif + setlocal comments=s1fl:{-,mb:-,ex:-},:-- setlocal iskeyword+=-,.,* setlocal commentstring=--\ %s - -endif diff --git a/after/ftplugin/coffee.vim b/after/ftplugin/coffee.vim index 9c8f5843..2060d276 100644 --- a/after/ftplugin/coffee.vim +++ b/after/ftplugin/coffee.vim @@ -1,9 +1,9 @@ -if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cjsx') == -1 - +if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'cjsx') != -1 + finish +endif + if exists("loaded_matchit") let b:match_ignorecase = 0 let b:match_words = '(:),\[:\],{:},<:>,' . \ '<\@<=\([^/][^ \t>]*\)[^>]*\%(>\|$\):<\@<=/\1>' endif - -endif diff --git a/after/ftplugin/haskell.vim b/after/ftplugin/haskell.vim index 9fa505f7..2d3d6b33 100644 --- a/after/ftplugin/haskell.vim +++ b/after/ftplugin/haskell.vim @@ -1,6 +1,6 @@ -if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'haskell') == -1 - +if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'haskell') != -1 + finish +endif + setlocal comments=s1fl:{-,mb:\ \ ,ex:-},:-- setlocal iskeyword+=' - -endif diff --git a/after/ftplugin/javascript.vim b/after/ftplugin/javascript.vim index e9214981..9efbb8d9 100644 --- a/after/ftplugin/javascript.vim +++ b/after/ftplugin/javascript.vim @@ -1,5 +1,7 @@ -if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'javascript') == -1 - +if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'javascript') != -1 + finish +endif + " Vim filetype plugin file " Language: JavaScript " Maintainer: vim-javascript community @@ -12,5 +14,3 @@ if exists('b:undo_ftplugin') else let b:undo_ftplugin = 'setlocal iskeyword< suffixesadd<' endif - -endif diff --git a/after/ftplugin/jsx.vim b/after/ftplugin/jsx.vim index 380d476b..12173822 100644 --- a/after/ftplugin/jsx.vim +++ b/after/ftplugin/jsx.vim @@ -1,5 +1,7 @@ -if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jsx') == -1 - +if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'jsx') != -1 + finish +endif + """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" " Vim ftplugin file " @@ -19,5 +21,3 @@ if exists("loaded_matchit") endif setlocal suffixesadd+=.jsx - -endif diff --git a/after/ftplugin/puppet.vim b/after/ftplugin/puppet.vim index 574fee25..1265038b 100644 --- a/after/ftplugin/puppet.vim +++ b/after/ftplugin/puppet.vim @@ -1,5 +1,7 @@ -if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'puppet') == -1 - +if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'puppet') != -1 + finish +endif + if !exists('g:puppet_align_hashes') let g:puppet_align_hashes = 1 endif @@ -16,5 +18,3 @@ if g:puppet_align_hashes && exists(':Tabularize') call search(repeat('\([^=]\|=[^>]\)*=>',column).'\s\{-\}'.repeat('.',position),'ce',line('.')) endfunction endif - -endif diff --git a/after/ftplugin/terraform.vim b/after/ftplugin/terraform.vim index 48ae0f20..610fd900 100644 --- a/after/ftplugin/terraform.vim +++ b/after/ftplugin/terraform.vim @@ -1,5 +1,7 @@ -if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'terraform') == -1 - +if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'terraform') != -1 + finish +endif + if !exists('g:terraform_align') let g:terraform_align = 0 endif @@ -81,5 +83,3 @@ if exists('g:terraform_commentstring') else setlocal commentstring=#%s endif - -endif diff --git a/after/ftplugin/yaml.vim b/after/ftplugin/yaml.vim index 047641dc..a6b6d194 100644 --- a/after/ftplugin/yaml.vim +++ b/after/ftplugin/yaml.vim @@ -1,5 +1,7 @@ -if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'yaml') == -1 - +if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'yaml') != -1 + finish +endif + " Vim indent file " Language: Yaml " Author: Henrique Barcelos @@ -7,5 +9,3 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'yaml') == -1 " URL: https://github.com/hjpbarcelos setlocal autoindent sw=2 ts=2 expandtab " vim:set sw=2: - -endif diff --git a/after/indent/html.vim b/after/indent/html.vim index 47da18f0..d6c1e812 100644 --- a/after/indent/html.vim +++ b/after/indent/html.vim @@ -1,5 +1,7 @@ -if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'coffee-script') == -1 - +if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'coffee-script') != -1 + finish +endif + " Language: CoffeeScript " Maintainer: Mick Koch " URL: http://github.com/kchmck/vim-coffee-script @@ -33,5 +35,3 @@ function! GetCoffeeHtmlIndent(curlinenum) " Otherwise use html indenting. exec 'return ' s:htmlIndentExpr endfunction - -endif diff --git a/after/indent/jsx.vim b/after/indent/jsx.vim index dc244d81..35df1f5f 100644 --- a/after/indent/jsx.vim +++ b/after/indent/jsx.vim @@ -1,5 +1,7 @@ -if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jsx') == -1 - +if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'jsx') != -1 + finish +endif + """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" " Vim indent file " @@ -114,5 +116,3 @@ fu! GetJsxIndent() return ind endfu - -endif diff --git a/after/indent/objc.vim b/after/indent/objc.vim index 64c7e79c..1bcc217a 100644 --- a/after/indent/objc.vim +++ b/after/indent/objc.vim @@ -1,5 +1,7 @@ -if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'objc') == -1 - +if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'objc') != -1 + finish +endif + " Vim indent file " Language: Objective-C " Maintainer: Bjorn Winckler @@ -93,5 +95,3 @@ endfunction " Restore 'cpo' options let &cpo = s:save_cpo unlet s:save_cpo - -endif diff --git a/after/syntax/c.vim b/after/syntax/c.vim index 304a351d..4b801734 100644 --- a/after/syntax/c.vim +++ b/after/syntax/c.vim @@ -1,5 +1,7 @@ -if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'c++11') == -1 - +if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'c++11') != -1 + finish +endif + " Vim syntax file " Language: C Additions " Maintainer: Jon Haggblad @@ -304,5 +306,3 @@ hi def link cBoolean Boolean "hi def link cDelimiter Delimiter " foldmethod=syntax fix, courtesy of Ivan Freitas "hi def link cBraces Delimiter - -endif diff --git a/after/syntax/coffee.vim b/after/syntax/coffee.vim index b77c12bb..4ee795f0 100644 --- a/after/syntax/coffee.vim +++ b/after/syntax/coffee.vim @@ -1,5 +1,7 @@ -if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cjsx') == -1 - +if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'cjsx') != -1 + finish +endif + if exists('b:current_syntax') let s:current_syntax=b:current_syntax unlet b:current_syntax @@ -27,5 +29,3 @@ hi def link cjsxTagName Function hi def link cjsxEntity Statement hi def link cjsxEntityPunct Type hi def link cjsxAttribProperty Type - -endif diff --git a/after/syntax/cpp.vim b/after/syntax/cpp.vim index 1e3f0780..01108d58 100644 --- a/after/syntax/cpp.vim +++ b/after/syntax/cpp.vim @@ -1,5 +1,7 @@ -if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'c++11') == -1 - +if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'c++11') != -1 + finish +endif + " Vim syntax file " Language: C++ Additions " Maintainer: Jon Haggblad @@ -2092,5 +2094,3 @@ if version >= 508 || !exists("did_cpp_syntax_inits") HiLink cppRawDelimiter Delimiter delcommand HiLink endif - -endif diff --git a/after/syntax/haml.vim b/after/syntax/haml.vim index 5128f7e5..da2ea2b1 100644 --- a/after/syntax/haml.vim +++ b/after/syntax/haml.vim @@ -1,5 +1,7 @@ -if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'coffee-script') == -1 - +if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'coffee-script') != -1 + finish +endif + " Language: CoffeeScript " Maintainer: Sven Felix Oberquelle " URL: http://github.com/kchmck/vim-coffee-script @@ -23,5 +25,3 @@ if exists('s:current_syntax_save') let b:current_syntax = s:current_syntax_save unlet s:current_syntax_save endif - -endif diff --git a/after/syntax/help.vim b/after/syntax/help.vim index 58b79943..a4bc0bc7 100644 --- a/after/syntax/help.vim +++ b/after/syntax/help.vim @@ -1,5 +1,7 @@ -if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'scala') == -1 - +if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'scala') != -1 + finish +endif + " Extends standard help syntax with highlighting of Scala code. " " Place code between !sc! and !/sc! delimiters. These will be hidden if Vim is @@ -14,5 +16,3 @@ if has('conceal') else syntax region rgnScala matchgroup=Ignore start='!sc!' end='!/sc!' contains=@ScalaCode endif - -endif diff --git a/after/syntax/html.vim b/after/syntax/html.vim index 43c0c41e..a324db1a 100644 --- a/after/syntax/html.vim +++ b/after/syntax/html.vim @@ -1,5 +1,7 @@ -if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'coffee-script') == -1 - +if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'coffee-script') != -1 + finish +endif + " Language: CoffeeScript " Maintainer: Mick Koch " URL: http://github.com/kchmck/vim-coffee-script @@ -20,10 +22,10 @@ if exists('s:current_syntax_save') let b:current_syntax = s:current_syntax_save unlet s:current_syntax_save endif - +if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'glsl') != -1 + finish endif -if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'glsl') == -1 - + " Language: OpenGL Shading Language " Maintainer: Sergey Tikhomirov @@ -33,10 +35,10 @@ syn region ShaderScript \ keepend \ end=""me=s-1 \ contains=@GLSL,htmlScriptTag,@htmlPreproc - +if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'html5') != -1 + finish endif -if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html5') == -1 - + " Vim syntax file " Language: HTML (version 5.1) " Last Change: 2017 Feb 15 @@ -49,10 +51,10 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html5') == -1 " https://github.com/w3c/html/issues/694 syntax region htmlComment start=++ contains=@Spell syntax region htmlComment start=++ - +if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'less') != -1 + finish endif -if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'less') == -1 - + if !exists("g:less_html_style_tags") let g:less_html_style_tags = 1 endif @@ -79,5 +81,3 @@ syn region lessStyle start=+