summaryrefslogtreecommitdiff
path: root/runtime/syntax/groovy.vim
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-05-24 20:02:38 +0200
committerBram Moolenaar <Bram@vim.org>2016-05-24 20:02:38 +0200
commit26852128a2b713ef49341a0c18daba928444e7eb (patch)
tree2bf91f7e6ffd93f3bc70646a733c96570d856327 /runtime/syntax/groovy.vim
parent2b2b8ae5ab37b04584633c469265d85825166905 (diff)
downloadvim-git-26852128a2b713ef49341a0c18daba928444e7eb.tar.gz
Update runtime files.
Diffstat (limited to 'runtime/syntax/groovy.vim')
-rw-r--r--runtime/syntax/groovy.vim11
1 files changed, 7 insertions, 4 deletions
diff --git a/runtime/syntax/groovy.vim b/runtime/syntax/groovy.vim
index 42fcf4aba..dc3967772 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