diff options
| author | Adam Stankiewicz <sheerun@sher.pl> | 2020-10-25 03:19:58 +0100 |
|---|---|---|
| committer | Adam Stankiewicz <sheerun@sher.pl> | 2020-10-25 03:19:58 +0100 |
| commit | cbde2571d4f79770ac552fe75440de72893bc73a (patch) | |
| tree | c6bf43ecbf9ed76071713dc4cba028d32695987a /extras | |
| parent | d73c4d156279bfbc2ea9fafcbacca5fc2bd6cfd1 (diff) | |
| download | vim-polyglot-cbde2571d4f79770ac552fe75440de72893bc73a.tar.gz vim-polyglot-cbde2571d4f79770ac552fe75440de72893bc73a.zip | |
Respect symlinks for resolving vim-polyglot as fallback, closes #605
Diffstat (limited to 'extras')
| -rw-r--r-- | extras/flow.vim | 9 | ||||
| -rw-r--r-- | extras/jsdoc.vim | 9 | ||||
| -rw-r--r-- | extras/ngdoc.vim | 9 |
3 files changed, 3 insertions, 24 deletions
diff --git a/extras/flow.vim b/extras/flow.vim index 458067d4..69823efe 100644 --- a/extras/flow.vim +++ b/extras/flow.vim @@ -1,11 +1,6 @@ -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, 'extras/flow.vim', 1, 1), Filter) -if len(files) > 0 - exec 'source ' . files[0] +if !polyglot#util#IsEnabled('javascript', expand('<sfile>:p')) finish endif -if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'javascript') == -1 syntax region jsFlowDefinition contained start=/:/ end=/\%(\s*[,=;)\n]\)\@=/ contains=@jsFlowCluster containedin=jsParen syntax region jsFlowArgumentDef contained start=/:/ end=/\%(\s*[,)]\|=>\@!\)\@=/ contains=@jsFlowCluster @@ -116,5 +111,3 @@ if version >= 508 || !exists("did_javascript_syn_inits") HiLink jsFlowObjectFuncName jsObjectFuncName delcommand HiLink endif - -endif diff --git a/extras/jsdoc.vim b/extras/jsdoc.vim index 63b816aa..4a71cc66 100644 --- a/extras/jsdoc.vim +++ b/extras/jsdoc.vim @@ -1,11 +1,6 @@ -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, 'extras/jsdoc.vim', 1, 1), Filter) -if len(files) > 0 - exec 'source ' . files[0] +if !polyglot#util#IsEnabled('javascript', expand('<sfile>:p')) finish endif -if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'javascript') == -1 "" syntax coloring for javadoc comments (HTML) syntax region jsComment matchgroup=jsComment start="/\*\s*" end="\*/" contains=jsDocTags,jsCommentTodo,jsCvsTag,@jsHtml,@Spell fold @@ -46,5 +41,3 @@ if version >= 508 || !exists("did_javascript_syn_inits") HiLink jsDocParam Label delcommand HiLink endif - -endif diff --git a/extras/ngdoc.vim b/extras/ngdoc.vim index 22a1a590..9936387b 100644 --- a/extras/ngdoc.vim +++ b/extras/ngdoc.vim @@ -1,14 +1,7 @@ -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, 'extras/ngdoc.vim', 1, 1), Filter) -if len(files) > 0 - exec 'source ' . files[0] +if !polyglot#util#IsEnabled('javascript', expand('<sfile>:p')) finish endif -if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'javascript') == -1 syntax match jsDocTags contained /@\(link\|method[oO]f\|ngdoc\|ng[iI]nject\|restrict\)/ nextgroup=jsDocParam skipwhite syntax match jsDocType contained "\%(#\|\$\|\w\|\"\|-\|\.\|:\|\/\)\+" nextgroup=jsDocParam skipwhite syntax match jsDocParam contained "\%(#\|\$\|\w\|\"\|-\|\.\|:\|{\|}\|\/\|\[\|]\|=\)\+" - -endif |