From 8e61708b4527072aa9250deb2c4cf7a56e3f3b0a Mon Sep 17 00:00:00 2001 From: Adam Stankiewicz Date: Sat, 24 Oct 2020 18:52:18 +0200 Subject: Use vim-polyglot only as fallback to other plugins, fixes #580 --- extras/flow.vim | 5 +++++ extras/jsdoc.vim | 5 +++++ extras/ngdoc.vim | 5 +++++ 3 files changed, 15 insertions(+) (limited to 'extras') diff --git a/extras/flow.vim b/extras/flow.vim index 6bbd91f1..5b9db538 100644 --- a/extras/flow.vim +++ b/extras/flow.vim @@ -1,3 +1,8 @@ +let files = filter(globpath(&rtp, 'extras/flow.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, 'javascript') == -1 syntax region jsFlowDefinition contained start=/:/ end=/\%(\s*[,=;)\n]\)\@=/ contains=@jsFlowCluster containedin=jsParen diff --git a/extras/jsdoc.vim b/extras/jsdoc.vim index bbb0bb57..d65badb2 100644 --- a/extras/jsdoc.vim +++ b/extras/jsdoc.vim @@ -1,3 +1,8 @@ +let files = filter(globpath(&rtp, 'extras/jsdoc.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, 'javascript') == -1 "" syntax coloring for javadoc comments (HTML) diff --git a/extras/ngdoc.vim b/extras/ngdoc.vim index 6e38f905..9ef79925 100644 --- a/extras/ngdoc.vim +++ b/extras/ngdoc.vim @@ -1,3 +1,8 @@ +let files = filter(globpath(&rtp, 'extras/ngdoc.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, 'javascript') == -1 syntax match jsDocTags contained /@\(link\|method[oO]f\|ngdoc\|ng[iI]nject\|restrict\)/ nextgroup=jsDocParam skipwhite -- cgit v1.2.3