Escape more special characters in regexps

guns · guns · commit c331446f2e6c · 2013-08-11T11:20:31.000-05:00
In particular, start="\\\@<!\[" is the wrong way to define the start of a region: it will work for \[, but also for \\[, which is erroneous. if \\ and \[ are matched first, then you don't need to guard against a preceding backslash. Addresses guns/vim-clojure-static#30
diff --git a/clj/test/vim_clojure_static/syntax_test.clj b/clj/test/vim_clojure_static/syntax_test.clj
@@ -361,6 +361,11 @@
     "(?>X)" regexp-mod
 
     "(?X)" !regexp-mod
-    ]])
+    ]]
+  ["#%s"
+   [;; Backslashes with character classes
+    "\"[\\\\]\"" (partial = [:clojureRegexp :clojureRegexpCharClass :clojureRegexpCharClass :clojureRegexpCharClass :clojureRegexpCharClass :clojureRegexp])
+    "\"\\[]\"" (partial = [:clojureRegexp :clojureRegexpEscape :clojureRegexpEscape :clojureRegexp :clojureRegexp])
+    "\"\\\\[]\"" (partial = [:clojureRegexp :clojureRegexpEscape :clojureRegexpEscape :clojureRegexpCharClass :clojureRegexpCharClass :clojureRegexp])]])
 
 (comment (test #'java-regexp-literals-test))
diff --git a/syntax/clojure.vim b/syntax/clojure.vim
@@ -75,7 +75,7 @@ syntax match clojureDispatch "\v#[\^'=<_]?"
 " Clojure permits no more than 20 params.
 syntax match clojureAnonArg "%\(20\|1\d\|[1-9]\|&\)\?"
 
-syntax match   clojureRegexpEscape  "\v\\%(\\|[tnrfae]|c\u|0[0-3]?\o{1,2}|x%(\x{2}|\{\x{1,6}\})|u\x{4})" contained display
+syntax match   clojureRegexpEscape  "\v\\%([\\tnrfae()\[\]{}^$*?+]|c\u|0[0-3]?\o{1,2}|x%(\x{2}|\{\x{1,6}\})|u\x{4})" contained display
 syntax region  clojureRegexpQuoted  start=/\v\<@!\\Q/ms=e+1 skip=/\v\\\\|\\"/ end=/\\E/me=s-1 end=/"/me=s-1 contained
 syntax region  clojureRegexpQuote   start=/\v\<@!\\Q/       skip=/\v\\\\|\\"/ end=/\\E/       end=/"/me=s-1 contains=clojureRegexpQuoted keepend contained
 syntax cluster clojureRegexpEscapes contains=clojureRegexpEscape,clojureRegexpQuote
@@ -94,7 +94,7 @@ syntax match clojureRegexpUnicodeCharClass "\v\\[pP]\{\c%(In|blk\=|block\=)%(aeg
 syntax match   clojureRegexpPredefinedCharClass "\v%(\\[dDsSwW]|\.)" contained display
 syntax cluster clojureRegexpCharPropertyClasses contains=clojureRegexpPosixCharClass,clojureRegexpJavaCharClass,clojureRegexpUnicodeCharClass
 syntax cluster clojureRegexpCharClasses         contains=clojureRegexpPredefinedCharClass,clojureRegexpCharClass,@clojureRegexpCharPropertyClasses
-syntax region  clojureRegexpCharClass           start="\\\@<!\[" end="\\\@<!\]" contained contains=clojureRegexpPredefinedCharClass,@clojureRegexpCharPropertyClasses
+syntax region  clojureRegexpCharClass           start="\[" skip=/\\\\\|\\]/ end="]" contained contains=clojureRegexpPredefinedCharClass,@clojureRegexpCharPropertyClasses
 syntax match   clojureRegexpBoundary            "\\[bBAGZz]"   contained display
 syntax match   clojureRegexpBoundary            "[$^]"         contained display
 syntax match   clojureRegexpQuantifier          "[?*+][?+]\="  contained display
@@ -109,7 +109,7 @@ syntax match clojureRegexpMod "\v\(@<=\?[xdsmiuU]*-?[xdsmiuU]+:?" contained disp
 syntax match clojureRegexpMod "\v\(@<=\?%(\<?[=!]|\>)"            contained display
 syntax match clojureRegexpMod "\v\(@<=\?\<[a-zA-Z]+\>"            contained display
 
-syntax region clojureRegexpGroup start="\\\@<!(" matchgroup=clojureRegexpGroup end="\\\@<!)" contained contains=clojureRegexpMod,clojureRegexpQuantifier,clojureRegexpBoundary,clojureRegexpEscape,@clojureRegexpCharClasses
+syntax region clojureRegexpGroup start="(" skip=/\\\\\|\\)/ end=")" matchgroup=clojureRegexpGroup contained contains=clojureRegexpMod,clojureRegexpQuantifier,clojureRegexpBoundary,clojureRegexpEscape,@clojureRegexpCharClasses
 syntax region clojureRegexp start=/\#"/ skip=/\\\\\|\\"/ end=/"/ contains=@clojureRegexpCharClasses,clojureRegexpEscape,clojureRegexpQuote,clojureRegexpBoundary,clojureRegexpQuantifier,clojureRegexpOr,clojureRegexpBackRef,clojureRegexpGroup keepend
 
 syntax keyword clojureCommentTodo contained FIXME XXX TODO FIXME: XXX: TODO:
