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

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

(limited to 'compiler/sbt.vim')

diff --git a/compiler/sbt.vim b/compiler/sbt.vim
index 7bb2b1f9..15f81ff3 100644
--- a/compiler/sbt.vim
+++ b/compiler/sbt.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, 'compiler/sbt.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('scala', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'scala') == -1
 
 " Vim compiler file
 " Language:             Scala SBT (http://www.scala-sbt.org/)
@@ -37,5 +32,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim:set sw=2 sts=2 ts=8 et:
-
-endif
-- 
cgit v1.2.3