summaryrefslogtreecommitdiffstats
path: root/ftplugin
diff options
context:
space:
mode:
authorAdam Stankiewicz <sheerun@sher.pl>2020-05-20 16:59:09 +0200
committerAdam Stankiewicz <sheerun@sher.pl>2020-05-20 16:59:09 +0200
commita688c66a049b12e7b19f6ab4cb27c5a24dc3d52c (patch)
tree4f21330aa69ea67c4b32ad89918034e375bd1e1c /ftplugin
parent0a7c62b3b22a75f91245a718c1409e4216ae61c8 (diff)
downloadvim-polyglot-a688c66a049b12e7b19f6ab4cb27c5a24dc3d52c.tar.gz
vim-polyglot-a688c66a049b12e7b19f6ab4cb27c5a24dc3d52c.zip
Update
Diffstat (limited to 'ftplugin')
-rw-r--r--ftplugin/julia.vim8
-rw-r--r--ftplugin/rst.vim2
2 files changed, 5 insertions, 5 deletions
diff --git a/ftplugin/julia.vim b/ftplugin/julia.vim
index 9b787512..3b81019d 100644
--- a/ftplugin/julia.vim
+++ b/ftplugin/julia.vim
@@ -39,7 +39,7 @@ if exists("loaded_matchit")
" note: the following regex not only recognizes macros, but also local/global keywords.
" the purpose is recognizing things like `@inline myfunction()`
" or `global myfunction(...)` etc, for matchit and block movement functionality
- let s:macro_regex = '\%(@\%(#\@!\S\)\+\|\<\%(local\|global\)\)\s\+'
+ let s:macro_regex = '\%(@\%([#(]\@!\S\)\+\|\<\%(local\|global\)\)\s\+'
let s:nomacro = '\%(' . s:macro_regex . '\)\@<!'
let s:yesmacro = s:nomacro . '\%('. s:macro_regex . '\)\+'
let b:julia_begin_keywordsm = '\%(' . s:yesmacro . b:julia_begin_keywords . '\)\|'
@@ -76,10 +76,10 @@ if exists("loaded_matchit")
let b:match_words = 'JuliaGetMatchWords()'
" we need to skip everything within comments, strings and
- " the 'end' keyword when it is used as a range rather than as
- " the end of a block
+ " the 'begin' and 'end' keywords when they are used as a range rather than as
+ " the delimiter of a block
let b:match_skip = 'synIDattr(synID(line("."),col("."),1),"name") =~ '
- \ . '"\\<julia\\%(Comprehension\\%(For\\|If\\)\\|RangeKeyword\\|SymbolS\\?\\|Comment[LM]\\|\\%([bv]\\|ip\\|MIME\\|Shell\\|Doc\\)\\?String\\|RegEx\\)\\>"'
+ \ . '"\\<julia\\%(Comprehension\\%(For\\|If\\)\\|RangeKeyword\\|SymbolS\\?\\|Comment[LM]\\|\\%([bsvr]\\|ip\\|MIME\\|big\\|raw\\|test\\|html\\|int128\\|Printf\\|Shell\\|Doc\\)\\?String\\|StringPrefixed\\|RegEx\\)\\>"'
let b:undo_ftplugin = b:undo_ftplugin
\ . " | unlet! b:match_words b:match_skip b:match_ignorecase"
diff --git a/ftplugin/rst.vim b/ftplugin/rst.vim
index 14983362..5265edcf 100644
--- a/ftplugin/rst.vim
+++ b/ftplugin/rst.vim
@@ -5,7 +5,7 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rst') == -1
" Maintainer: Marshall Ward <marshall.ward@gmail.com>
" Original Maintainer: Nikolai Weibull <now@bitwi.se>
" Website: https://github.com/marshallward/vim-restructuredtext
-" Latest Revision: 2018-12-29
+" Latest Revision: 2020-03-31
if exists("b:did_ftplugin")
finish