Use vim-polyglot only as fallback to other plugins, fixes #580

14 files changed, 70 insertions, 0 deletions

diff --git a/syntax/basic/class.vim b/syntax/basic/class.vim
index 303d2077..dea703aa 100644
--- a/syntax/basic/class.vim
+++ b/syntax/basic/class.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/basic/class.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 "don't add typescriptMembers to nextgroup, let outer scope match it
diff --git a/syntax/basic/cluster.vim b/syntax/basic/cluster.vim
index 8538c517..f5eb59d1 100644
--- a/syntax/basic/cluster.vim
+++ b/syntax/basic/cluster.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/basic/cluster.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 "Block VariableStatement EmptyStatement ExpressionStatement IfStatement IterationStatement ContinueStatement BreakStatement ReturnStatement WithStatement LabelledStatement SwitchStatement ThrowStatement TryStatement DebuggerStatement
diff --git a/syntax/basic/decorator.vim b/syntax/basic/decorator.vim
index 2a7a1dd1..7f5456cd 100644
--- a/syntax/basic/decorator.vim
+++ b/syntax/basic/decorator.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/basic/decorator.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax match typescriptDecorator /@\([_$a-zA-Z][_$a-zA-Z0-9]*\.\)*[_$a-zA-Z][_$a-zA-Z0-9]*\>/
diff --git a/syntax/basic/doc.vim b/syntax/basic/doc.vim
index 50f03e29..2bf5d614 100644
--- a/syntax/basic/doc.vim
+++ b/syntax/basic/doc.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/basic/doc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 "Syntax coloring for Node.js shebang line
diff --git a/syntax/basic/function.vim b/syntax/basic/function.vim
index e1743ab5..ac94b9a1 100644
--- a/syntax/basic/function.vim
+++ b/syntax/basic/function.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/basic/function.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax keyword typescriptAsyncFuncKeyword      async
diff --git a/syntax/basic/identifiers.vim b/syntax/basic/identifiers.vim
index 6a7ba4b0..b03df011 100644
--- a/syntax/basic/identifiers.vim
+++ b/syntax/basic/identifiers.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/basic/identifiers.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax cluster afterIdentifier contains=
diff --git a/syntax/basic/keyword.vim b/syntax/basic/keyword.vim
index a810b545..ddb4e8a1 100644
--- a/syntax/basic/keyword.vim
+++ b/syntax/basic/keyword.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/basic/keyword.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 "Import
diff --git a/syntax/basic/literal.vim b/syntax/basic/literal.vim
index 89d96bb0..6f092fcc 100644
--- a/syntax/basic/literal.vim
+++ b/syntax/basic/literal.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/basic/literal.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 "Syntax in the JavaScript code
diff --git a/syntax/basic/members.vim b/syntax/basic/members.vim
index 343559b9..7362eaf9 100644
--- a/syntax/basic/members.vim
+++ b/syntax/basic/members.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/basic/members.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax keyword typescriptConstructor           contained constructor
diff --git a/syntax/basic/object.vim b/syntax/basic/object.vim
index 90c75a0a..6f5d1f28 100644
--- a/syntax/basic/object.vim
+++ b/syntax/basic/object.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/basic/object.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax region  typescriptObjectLiteral         matchgroup=typescriptBraces
diff --git a/syntax/basic/patch.vim b/syntax/basic/patch.vim
index 5531db79..a2ebd1da 100644
--- a/syntax/basic/patch.vim
+++ b/syntax/basic/patch.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/basic/patch.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 " patch for generated code
diff --git a/syntax/basic/reserved.vim b/syntax/basic/reserved.vim
index 14ea7565..0cfb36ac 100644
--- a/syntax/basic/reserved.vim
+++ b/syntax/basic/reserved.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/basic/reserved.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax cluster typescriptStrings               contains=typescriptProp,typescriptString,typescriptTemplate,@typescriptComments,typescriptDocComment,typescriptRegexpString,typescriptPropertyName
diff --git a/syntax/basic/symbols.vim b/syntax/basic/symbols.vim
index 2799ed39..15490f80 100644
--- a/syntax/basic/symbols.vim
+++ b/syntax/basic/symbols.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/basic/symbols.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 " + - ^ ~
diff --git a/syntax/basic/type.vim b/syntax/basic/type.vim
index 02e78237..378ecafe 100644
--- a/syntax/basic/type.vim
+++ b/syntax/basic/type.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/basic/type.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 " Types