From 48e07bc5014fecfdff24f75124a65634c216c9e2 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Fri, 6 Sep 2019 15:54:31 +0200
Subject: Improve guard to support concatenated files

---
 ftplugin/scala/tagbar.vim | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'ftplugin/scala')

diff --git a/ftplugin/scala/tagbar.vim b/ftplugin/scala/tagbar.vim
index e53b5591..5728e98a 100644
--- a/ftplugin/scala/tagbar.vim
+++ b/ftplugin/scala/tagbar.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'scala') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'scala') == -1
 "
 " Support for Tagbar -- https://github.com/majutsushi/tagbar
 "
@@ -33,3 +30,4 @@ let g:tagbar_type_scala = {
 if get(g:, 'scala_use_builtin_tagbar_defs', 1)
   let g:tagbar_type_scala.deffile = expand('<sfile>:p:h:h:h') . '/ctags/scala.ctags'
 endif
+endif
-- 
cgit v1.2.3