From cbde2571d4f79770ac552fe75440de72893bc73a Mon Sep 17 00:00:00 2001 From: Adam Stankiewicz Date: Sun, 25 Oct 2020 03:19:58 +0100 Subject: Respect symlinks for resolving vim-polyglot as fallback, closes #605 --- syntax/yats/es6-regexp.vim | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'syntax/yats/es6-regexp.vim') diff --git a/syntax/yats/es6-regexp.vim b/syntax/yats/es6-regexp.vim index 9a8d8725..dfa4932b 100644 --- a/syntax/yats/es6-regexp.vim +++ b/syntax/yats/es6-regexp.vim @@ -1,11 +1,6 @@ -let s:base = expand(":h:h") -let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" } -let files = filter(globpath(&rtp, 'syntax/yats/es6-regexp.vim', 1, 1), Filter) -if len(files) > 0 - exec 'source ' . files[0] +if !polyglot#util#IsEnabled('typescript', expand(':p')) finish endif -if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1 syntax keyword typescriptGlobal containedin=typescriptIdentifierName RegExp nextgroup=typescriptGlobalRegExpDot,typescriptFuncCallArg syntax match typescriptGlobalRegExpDot /\./ contained nextgroup=typescriptRegExpStaticProp,typescriptProp @@ -20,5 +15,3 @@ syntax keyword typescriptRegExpMethod contained exec test nextgroup=typescriptFu syntax cluster props add=typescriptRegExpMethod if exists("did_typescript_hilink") | HiLink typescriptRegExpMethod Keyword endif - -endif -- cgit v1.2.3