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 --- ftplugin/typescriptreact.vim | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'ftplugin/typescriptreact.vim') diff --git a/ftplugin/typescriptreact.vim b/ftplugin/typescriptreact.vim index 159f91b0..7f60b3f9 100644 --- a/ftplugin/typescriptreact.vim +++ b/ftplugin/typescriptreact.vim @@ -1,11 +1,6 @@ -let s:base = expand(":h:h") -let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" } -let files = filter(globpath(&rtp, 'ftplugin/typescriptreact.vim', 1, 1), Filter) -if len(files) > 0 - exec 'source ' . files[0] +if !polyglot#util#IsEnabled('typescript', expand(':p')) finish endif -if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1 " modified from mxw/vim-jsx from html.vim if exists("loaded_matchit") && !exists('b:tsx_match_words') @@ -22,5 +17,3 @@ setlocal comments=s1:/*,mb:*,ex:*/,:// setlocal formatoptions-=t formatoptions+=croql set suffixesadd+=.tsx - -endif -- cgit v1.2.3