From d73c4d156279bfbc2ea9fafcbacca5fc2bd6cfd1 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Sat, 24 Oct 2020 23:50:54 +0200
Subject: Fix recursive loading, closes #605

---
 autoload/vital/_crystal.vim             | 4 +++-
 autoload/vital/_crystal/ColorEcho.vim   | 4 +++-
 autoload/vital/_crystal/Data/List.vim   | 4 +++-
 autoload/vital/_crystal/Data/String.vim | 4 +++-
 autoload/vital/_crystal/Process.vim     | 4 +++-
 autoload/vital/_crystal/Web/JSON.vim    | 4 +++-
 autoload/vital/crystal.vim              | 4 +++-
 7 files changed, 21 insertions(+), 7 deletions(-)

(limited to 'autoload/vital')

diff --git a/autoload/vital/_crystal.vim b/autoload/vital/_crystal.vim
index ffa30240..b8ac5d32 100644
--- a/autoload/vital/_crystal.vim
+++ b/autoload/vital/_crystal.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/vital/_crystal.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, 'autoload/vital/_crystal.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/vital/_crystal/ColorEcho.vim b/autoload/vital/_crystal/ColorEcho.vim
index 58996327..59c0ec88 100644
--- a/autoload/vital/_crystal/ColorEcho.vim
+++ b/autoload/vital/_crystal/ColorEcho.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/vital/_crystal/ColorEcho.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, 'autoload/vital/_crystal/ColorEcho.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/vital/_crystal/Data/List.vim b/autoload/vital/_crystal/Data/List.vim
index 06461525..b2045a2a 100644
--- a/autoload/vital/_crystal/Data/List.vim
+++ b/autoload/vital/_crystal/Data/List.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/vital/_crystal/Data/List.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, 'autoload/vital/_crystal/Data/List.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/vital/_crystal/Data/String.vim b/autoload/vital/_crystal/Data/String.vim
index 7e6ced35..8f6ddf3e 100644
--- a/autoload/vital/_crystal/Data/String.vim
+++ b/autoload/vital/_crystal/Data/String.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/vital/_crystal/Data/String.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, 'autoload/vital/_crystal/Data/String.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/vital/_crystal/Process.vim b/autoload/vital/_crystal/Process.vim
index a7bbedad..315a4343 100644
--- a/autoload/vital/_crystal/Process.vim
+++ b/autoload/vital/_crystal/Process.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/vital/_crystal/Process.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, 'autoload/vital/_crystal/Process.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/vital/_crystal/Web/JSON.vim b/autoload/vital/_crystal/Web/JSON.vim
index 891bd2dc..c17269cf 100644
--- a/autoload/vital/_crystal/Web/JSON.vim
+++ b/autoload/vital/_crystal/Web/JSON.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/vital/_crystal/Web/JSON.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, 'autoload/vital/_crystal/Web/JSON.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/vital/crystal.vim b/autoload/vital/crystal.vim
index ca8c320e..7674c4ef 100644
--- a/autoload/vital/crystal.vim
+++ b/autoload/vital/crystal.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/vital/crystal.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, 'autoload/vital/crystal.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
-- 
cgit v1.2.3