From cbde2571d4f79770ac552fe75440de72893bc73a Mon Sep 17 00:00:00 2001 From: Adam Stankiewicz Date: Sun, 25 Oct 2020 03:19:58 +0100 Subject: Respect symlinks for resolving vim-polyglot as fallback, closes #605 --- after/ftplugin/cabal.vim | 6 +++--- after/ftplugin/coffee.vim | 6 +++--- after/ftplugin/haskell.vim | 6 +++--- after/ftplugin/html.vim | 6 +++--- after/ftplugin/idris.vim | 6 +++--- after/ftplugin/idris2.vim | 6 +++--- after/ftplugin/javascript-1.vim | 6 +++--- after/ftplugin/javascript-2.vim | 6 +++--- after/ftplugin/javascriptreact.vim | 6 +++--- after/ftplugin/jsx.vim | 6 +++--- after/ftplugin/llvm.vim | 6 +++--- after/ftplugin/puppet.vim | 6 +++--- after/ftplugin/tsx.vim | 6 +++--- after/ftplugin/typescriptreact.vim | 6 +++--- 14 files changed, 42 insertions(+), 42 deletions(-) (limited to 'after/ftplugin') diff --git a/after/ftplugin/cabal.vim b/after/ftplugin/cabal.vim index 8009502d..461f6a24 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 !polyglot#util#IsEnabled('haskell', expand(':p')) + 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 27c00bcb..a039dd95 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 !polyglot#util#IsEnabled('cjsx', expand(':p')) + 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 a617329c..96ea4d04 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 !polyglot#util#IsEnabled('haskell', expand(':p')) + finish +endif setlocal comments=s1fl:{-,mb:\ \ ,ex:-},:-- setlocal iskeyword+=' - -endif diff --git a/after/ftplugin/html.vim b/after/ftplugin/html.vim index 50cdb2ae..6b0b48a2 100644 --- a/after/ftplugin/html.vim +++ b/after/ftplugin/html.vim @@ -1,4 +1,6 @@ -if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html5') == -1 +if !polyglot#util#IsEnabled('html5', expand(':p')) + finish +endif " Maintainer: othree " URL: http://github.com/othree/html5.vim @@ -9,5 +11,3 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html5') == -1 " setlocal iskeyword+=- setlocal commentstring= - -endif diff --git a/after/ftplugin/idris.vim b/after/ftplugin/idris.vim index 6c6815d5..4b38f4ce 100644 --- a/after/ftplugin/idris.vim +++ b/after/ftplugin/idris.vim @@ -1,5 +1,5 @@ -if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'idris') == -1 +if !polyglot#util#IsEnabled('idris', expand(':p')) + finish +endif setlocal iskeyword+=' - -endif diff --git a/after/ftplugin/idris2.vim b/after/ftplugin/idris2.vim index b96ae5b6..b7f25573 100644 --- a/after/ftplugin/idris2.vim +++ b/after/ftplugin/idris2.vim @@ -1,5 +1,5 @@ -if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'idris2') == -1 +if !polyglot#util#IsEnabled('idris2', expand(':p')) + finish +endif setlocal iskeyword+=' - -endif diff --git a/after/ftplugin/javascript-1.vim b/after/ftplugin/javascript-1.vim index 9f6c9314..8480c6e7 100644 --- a/after/ftplugin/javascript-1.vim +++ b/after/ftplugin/javascript-1.vim @@ -1,4 +1,6 @@ -if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'javascript') == -1 +if !polyglot#util#IsEnabled('javascript', expand(':p')) + finish +endif " Vim filetype plugin file " Language: JavaScript @@ -12,5 +14,3 @@ if exists('b:undo_ftplugin') else let b:undo_ftplugin = 'setlocal iskeyword< suffixesadd<' endif - -endif diff --git a/after/ftplugin/javascript-2.vim b/after/ftplugin/javascript-2.vim index 2992e942..f56dd82a 100644 --- a/after/ftplugin/javascript-2.vim +++ b/after/ftplugin/javascript-2.vim @@ -1,9 +1,9 @@ -if !exists('g:polyglot_disabled') || (index(g:polyglot_disabled, 'javascript') == -1 && index(g:polyglot_disabled, 'jsx') == -1) +if !polyglot#util#IsEnabled('jsx', expand(':p')) + finish +endif if get(g:, 'vim_jsx_pretty_disable_js', 0) finish endif source :h/jsx.vim - -endif diff --git a/after/ftplugin/javascriptreact.vim b/after/ftplugin/javascriptreact.vim index 265415d0..be2ea1fc 100644 --- a/after/ftplugin/javascriptreact.vim +++ b/after/ftplugin/javascriptreact.vim @@ -1,5 +1,5 @@ -if !exists('g:polyglot_disabled') || (index(g:polyglot_disabled, 'javascript') == -1 && index(g:polyglot_disabled, 'jsx') == -1) +if !polyglot#util#IsEnabled('jsx', expand(':p')) + finish +endif source :h/jsx.vim - -endif diff --git a/after/ftplugin/jsx.vim b/after/ftplugin/jsx.vim index 94f90c13..f6f07131 100644 --- a/after/ftplugin/jsx.vim +++ b/after/ftplugin/jsx.vim @@ -1,4 +1,6 @@ -if !exists('g:polyglot_disabled') || (index(g:polyglot_disabled, 'javascript') == -1 && index(g:polyglot_disabled, 'jsx') == -1) +if !polyglot#util#IsEnabled('jsx', expand(':p')) + finish +endif """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" " Vim ftplugin file @@ -31,5 +33,3 @@ augroup jsx_comment augroup end setlocal suffixesadd+=.jsx - -endif diff --git a/after/ftplugin/llvm.vim b/after/ftplugin/llvm.vim index fbd4b7ff..192bf2f5 100644 --- a/after/ftplugin/llvm.vim +++ b/after/ftplugin/llvm.vim @@ -1,4 +1,6 @@ -if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'llvm') == -1 +if !polyglot#util#IsEnabled('llvm', expand(':p')) + finish +endif " Copyright (c) 2018 rhysd " @@ -483,5 +485,3 @@ endfunction if !exists(':LLI') command! -buffer -nargs=? -bar -complete=file LLI call run_lli() endif - -endif diff --git a/after/ftplugin/puppet.vim b/after/ftplugin/puppet.vim index 6ddb64e0..8cbc9972 100644 --- a/after/ftplugin/puppet.vim +++ b/after/ftplugin/puppet.vim @@ -1,4 +1,6 @@ -if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'puppet') == -1 +if !polyglot#util#IsEnabled('puppet', expand(':p')) + finish +endif if !exists('g:puppet_align_hashes') let g:puppet_align_hashes = 1 @@ -7,5 +9,3 @@ endif if g:puppet_align_hashes inoremap => =>:call puppet#align#AlignHashrockets()$a endif - -endif diff --git a/after/ftplugin/tsx.vim b/after/ftplugin/tsx.vim index 96b5515a..2b35ec46 100644 --- a/after/ftplugin/tsx.vim +++ b/after/ftplugin/tsx.vim @@ -1,4 +1,6 @@ -if !exists('g:polyglot_disabled') || (index(g:polyglot_disabled, 'javascript') == -1 && index(g:polyglot_disabled, 'jsx') == -1) +if !polyglot#util#IsEnabled('jsx', expand(':p')) + finish +endif " modified from html.vim " For matchit plugin @@ -28,5 +30,3 @@ augroup jsx_comment augroup end setlocal suffixesadd+=.tsx - -endif diff --git a/after/ftplugin/typescriptreact.vim b/after/ftplugin/typescriptreact.vim index 3d850291..07de9bb7 100644 --- a/after/ftplugin/typescriptreact.vim +++ b/after/ftplugin/typescriptreact.vim @@ -1,5 +1,5 @@ -if !exists('g:polyglot_disabled') || (index(g:polyglot_disabled, 'javascript') == -1 && index(g:polyglot_disabled, 'jsx') == -1) +if !polyglot#util#IsEnabled('jsx', expand(':p')) + finish +endif source :h/tsx.vim - -endif -- cgit v1.2.3