diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2016-10-24 13:17:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-24 13:17:41 +0200 |
| commit | fb503d73da49e26a3e44a07cd7c857d9fda9d035 (patch) | |
| tree | d7f30d325c9649b4bfa9bf6d6823eddf882aeb25 /runtime/syntax/groovy.vim | |
| parent | 43309d1993a9affc8d6b73fbd4721e6256c28712 (diff) | |
| parent | c91a0dca02fda46c4b4edbbdfab1a191b2e4fcbd (diff) | |
| download | rneovim-fb503d73da49e26a3e44a07cd7c857d9fda9d035.tar.gz rneovim-fb503d73da49e26a3e44a07cd7c857d9fda9d035.tar.bz2 rneovim-fb503d73da49e26a3e44a07cd7c857d9fda9d035.zip | |
Merge #5483 from Shougo/vim-0648142
vim-patch 0648142, 91c4937, 06d2d38, 2685212, 269f595
Diffstat (limited to 'runtime/syntax/groovy.vim')
| -rw-r--r-- | runtime/syntax/groovy.vim | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/runtime/syntax/groovy.vim b/runtime/syntax/groovy.vim index 42fcf4abac..dc39677724 100644 --- a/runtime/syntax/groovy.vim +++ b/runtime/syntax/groovy.vim @@ -2,9 +2,9 @@ " Language: Groovy " Original Author: Alessio Pace <billy.corgan@tiscali.it> " Maintainer: Tobias Rapp <yahuxo@gmx.de> -" Version: 0.1.14 +" Version: 0.1.16 " URL: http://www.vim.org/scripts/script.php?script_id=945 -" Last Change: 2015 Apr 21 +" Last Change: 2016 May 23 " THE ORIGINAL AUTHOR'S NOTES: " @@ -255,8 +255,11 @@ syn region groovyString start=+"+ end=+"+ end=+$+ contains=groovySpeci syn region groovyString start=+'+ end=+'+ end=+$+ contains=groovySpecialChar,groovySpecialError,@Spell syn region groovyString start=+"""+ end=+"""+ contains=groovySpecialChar,groovySpecialError,@Spell,groovyELExpr syn region groovyString start=+'''+ end=+'''+ contains=groovySpecialChar,groovySpecialError,@Spell -" regex string -syn region groovyString start='/[^/]' end='/' contains=groovySpecialChar,groovyRegexChar,groovyELExpr +if exists("groovy_regex_strings") + " regex strings interfere with the division operator and thus are disabled + " by default + syn region groovyString start='/[^/*]' end='/' contains=groovySpecialChar,groovyRegexChar,groovyELExpr +endif " syn region groovyELExpr start=+${+ end=+}+ keepend contained syn match groovyELExpr /\${.\{-}}/ contained syn match groovyELExpr /\$[a-zA-Z_][a-zA-Z0-9_.]*/ contained |