diff options
Diffstat (limited to '')
-rw-r--r-- | ftplugin/scala.vim | 4 | ||||
-rw-r--r-- | ftplugin/scala.xpt.vim | 4 | ||||
-rw-r--r-- | ftplugin/scala/tagbar.vim | 4 |
3 files changed, 9 insertions, 3 deletions
diff --git a/ftplugin/scala.vim b/ftplugin/scala.vim index 0d569e10..c80daabb 100644 --- a/ftplugin/scala.vim +++ b/ftplugin/scala.vim @@ -1,4 +1,6 @@ -let files = filter(globpath(&rtp, 'ftplugin/scala.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" }) +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, 'ftplugin/scala.vim', 1, 1), Filter) if len(files) > 0 exec 'source ' . files[0] finish diff --git a/ftplugin/scala.xpt.vim b/ftplugin/scala.xpt.vim index b49230a1..9df57081 100644 --- a/ftplugin/scala.xpt.vim +++ b/ftplugin/scala.xpt.vim @@ -1,4 +1,6 @@ -let files = filter(globpath(&rtp, 'ftplugin/scala.xpt.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" }) +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, 'ftplugin/scala.xpt.vim', 1, 1), Filter) if len(files) > 0 exec 'source ' . files[0] finish diff --git a/ftplugin/scala/tagbar.vim b/ftplugin/scala/tagbar.vim index a60bf235..8236d737 100644 --- a/ftplugin/scala/tagbar.vim +++ b/ftplugin/scala/tagbar.vim @@ -1,4 +1,6 @@ -let files = filter(globpath(&rtp, 'ftplugin/scala/tagbar.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" }) +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, 'ftplugin/scala/tagbar.vim', 1, 1), Filter) if len(files) > 0 exec 'source ' . files[0] finish |