From cbde2571d4f79770ac552fe75440de72893bc73a Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Sun, 25 Oct 2020 03:19:58 +0100
Subject: Respect symlinks for resolving vim-polyglot as fallback, closes #605

---
 extras/flow.vim | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

(limited to 'extras/flow.vim')

diff --git a/extras/flow.vim b/extras/flow.vim
index 458067d4..69823efe 100644
--- a/extras/flow.vim
+++ b/extras/flow.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'extras/flow.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('javascript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'javascript') == -1
 
 syntax region  jsFlowDefinition     contained                        start=/:/    end=/\%(\s*[,=;)\n]\)\@=/ contains=@jsFlowCluster containedin=jsParen
 syntax region  jsFlowArgumentDef    contained                        start=/:/    end=/\%(\s*[,)]\|=>\@!\)\@=/ contains=@jsFlowCluster
@@ -116,5 +111,3 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsFlowObjectFuncName     jsObjectFuncName
   delcommand HiLink
 endif
-
-endif
-- 
cgit v1.2.3