diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2017-04-16 17:42:41 +0200 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2017-04-19 21:26:17 +0200 |
| commit | d194380de93023c8901eb77b2820b0f74e8a5283 (patch) | |
| tree | 278ad4bef23e59965236c673ab6e53fdee443a13 /runtime/plugin | |
| parent | c1edb4c39a7267226d48ef034c0fea62f11ea5b3 (diff) | |
| download | rneovim-d194380de93023c8901eb77b2820b0f74e8a5283.tar.gz rneovim-d194380de93023c8901eb77b2820b0f74e8a5283.tar.bz2 rneovim-d194380de93023c8901eb77b2820b0f74e8a5283.zip | |
vim-patch:e4a3bcf28d92
Updated runtime files. Add Scala files.
https://github.com/vim/vim/commit/e4a3bcf28d92d0bde9ca227ccb40d401038185e5
Diffstat (limited to 'runtime/plugin')
| -rw-r--r-- | runtime/plugin/matchit.vim | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/runtime/plugin/matchit.vim b/runtime/plugin/matchit.vim index c0f1f08027..f275f7b36d 100644 --- a/runtime/plugin/matchit.vim +++ b/runtime/plugin/matchit.vim @@ -1,8 +1,10 @@ " matchit.vim: (global plugin) Extended "%" matching -" Last Change: Fri Jul 29 01:20 AM 2016 EST +" Last Change: 2016 Aug 21 " Maintainer: Benji Fisher PhD <benji@member.AMS.org> " Version: 1.13.2, for Vim 6.3+ " Fix from Tommy Allen included. +" Fix from Fernando Torres included. +" Improvement from Ken Takata included. " URL: http://www.vim.org/script.php?script_id=39 " Documentation: @@ -44,6 +46,7 @@ endif let loaded_matchit = 1 let s:last_mps = "" let s:last_words = ":" +let s:patBR = "" let s:save_cpo = &cpo set cpo&vim @@ -121,8 +124,8 @@ function! s:Match_wrapper(word, forward, mode) range execute "let match_words =" b:match_words endif " Thanks to Preben "Peppe" Guldberg and Bram Moolenaar for this suggestion! - if (match_words != s:last_words) || (&mps != s:last_mps) || - \ exists("b:match_debug") + if (match_words != s:last_words) || (&mps != s:last_mps) + \ || exists("b:match_debug") let s:last_mps = &mps " The next several lines were here before " BF started messing with this script. @@ -148,6 +151,10 @@ function! s:Match_wrapper(word, forward, mode) range if exists("b:match_debug") let b:match_pat = s:pat endif + " Reconstruct the version with unresolved backrefs. + let s:patBR = substitute(match_words.',', + \ s:notslash.'\zs[,:]*,[,:]*', ',', 'g') + let s:patBR = substitute(s:patBR, s:notslash.'\zs:\{2,}', ':', 'g') endif " Second step: set the following local variables: @@ -192,14 +199,10 @@ function! s:Match_wrapper(word, forward, mode) range " group = colon-separated list of patterns, one of which matches " = ini:mid:fin or ini:fin " - " Reconstruct the version with unresolved backrefs. - let patBR = substitute(match_words.',', - \ s:notslash.'\zs[,:]*,[,:]*', ',', 'g') - let patBR = substitute(patBR, s:notslash.'\zs:\{2,}', ':', 'g') " Now, set group and groupBR to the matching group: 'if:endif' or " 'while:endwhile' or whatever. A bit of a kluge: s:Choose() returns " group . "," . groupBR, and we pick it apart. - let group = s:Choose(s:pat, matchline, ",", ":", prefix, suffix, patBR) + let group = s:Choose(s:pat, matchline, ",", ":", prefix, suffix, s:patBR) let i = matchend(group, s:notslash . ",") let groupBR = strpart(group, i) let group = strpart(group, 0, i-1) @@ -656,6 +659,7 @@ fun! s:MultiMatch(spflag, mode) \ exists("b:match_debug") let s:last_words = match_words let s:last_mps = &mps + let match_words = match_words . (strlen(match_words) ? "," : "") . default if match_words !~ s:notslash . '\\\d' let s:do_BR = 0 let s:pat = match_words @@ -663,8 +667,8 @@ fun! s:MultiMatch(spflag, mode) let s:do_BR = 1 let s:pat = s:ParseWords(match_words) endif - let s:all = '\%(' . substitute(s:pat . (strlen(s:pat)?",":"") . default, - \ '[,:]\+','\\|','g') . '\)' + let s:all = '\%(' . substitute(s:pat . (strlen(s:pat) ? "," : "") . default, + \ '[,:]\+', '\\|', 'g') . '\)' if exists("b:match_debug") let b:match_pat = s:pat endif |