Merge nine clojureCharacter patterns into one

guns · guns · commit 262a75ce6a33 · 2017-02-08T19:04:29.000-06:00
diff --git a/clj/test/vim_clojure_static/syntax_test.clj b/clj/test/vim_clojure_static/syntax_test.clj
@@ -6,6 +6,7 @@
 
 (defpredicates number :clojureNumber)
 (defpredicates kw :clojureKeyword)
+(defpredicates character :clojureCharacter)
 (defpredicates regexp :clojureRegexp)
 (defpredicates regexp-escape :clojureRegexpEscape)
 (defpredicates regexp-char-class :clojureRegexpCharClass)
@@ -81,6 +82,27 @@
 
 (comment (test #'test-number-literals))
 
+(defsyntaxtest test-character-literals
+  ["%s"
+   ["\\0"  character  "\\a"    character  "\\Z"     character
+    "\\."  character  "\\\\"   character  "\\❤"     character
+    "\\o7" character  "\\o07"  character  "\\o307"  character
+    "\\o8" !character "\\o477" !character "\\o0007" !character
+
+    "\\u09af" character
+
+    "\\u0"     !character "\\u01"    !character "\\u012" !character
+    "\\u01234" !character "\\u0123g" !character
+
+    "\\newline"   character "\\new" !character
+    "\\tab"       character "\\ta"  !character
+    "\\space"     character "\\sp"  !character
+    "\\return"    character "\\ret" !character
+    "\\backspace" character "\\bs"  !character
+    "\\formfeed"  character "\\ff"  !character]])
+
+(comment (test #'test-character-literals))
+
 ;; TODO: Finish me! (this was in an old git stash)
 ;; (defsyntaxtest keywords-test
 ;;   (with-format "%s"
diff --git a/syntax/clojure.vim b/syntax/clojure.vim
@@ -76,15 +76,7 @@ syntax match clojureStringEscape "\v\\%([\\btnfr"]|u\x{4}|[0-3]\o{2}|\o{1,2})" c
 
 syntax region clojureString matchgroup=clojureStringDelimiter start=/"/ skip=/\\\\\|\\"/ end=/"/ contains=clojureStringEscape,@Spell
 
-syntax match clojureCharacter "\\."
-syntax match clojureCharacter "\\o\%([0-3]\o\{2\}\|\o\{1,2\}\)"
-syntax match clojureCharacter "\\u\x\{4\}"
-syntax match clojureCharacter "\\space"
-syntax match clojureCharacter "\\tab"
-syntax match clojureCharacter "\\newline"
-syntax match clojureCharacter "\\return"
-syntax match clojureCharacter "\\backspace"
-syntax match clojureCharacter "\\formfeed"
+syntax match clojureCharacter "\v\\%(.$|o%([0-3]\o{2}|\o{1,2})|u\x{4}|newline|tab|space|return|backspace|formfeed)"
 
 syntax match clojureSymbol "\v%([a-zA-Z!$&*_+=|<.>?-]|[^\x00-\x7F])+%(:?%([a-zA-Z0-9!#$%&*_+=|'<.>/?-]|[^\x00-\x7F]))*[#:]@<!"
 
