Merge remote-tracking branch 'noprompt/noprompt-regexp' into noprompt-regexp

guns · guns · commit 4ce003664ac4 · 2013-03-14T22:38:47.000-05:00
* noprompt/noprompt-regexp:
  Add some more Unicode character classes
  Swap the order of set and sort
  Add all valid java* character classes
  Allow "#\Q…\E" regions without matching \E

Conflicts:
	clj/test/syntax_test.clj
	syntax/clojure.vim
diff --git a/clj/src/vim_clojure_static/generate.clj b/clj/src/vim_clojure_static/generate.clj
@@ -4,7 +4,8 @@
 
 (ns vim-clojure-static.generate
   (:require [clojure.string :as string]
-            [clojure.set :as set]))
+            [clojure.set :as set]
+            [clojure.reflect :as r]))
 
 (def generation-message
   (str "\" Generated from https://github.com/guns/vim-clojure-static/blob/vim-release-004/clj/src/vim_clojure_static/generate.clj"
@@ -68,5 +69,26 @@
                     sort
                     (string/join \,)))))
 
+(def java-char-class-names
+  "Returns a list of valid java character class names (excluding the \"java\"
+   prefix) for use in a regular expression literal."
+  ;; java.lang.Character/is* methods.
+  (let [is-ms (->> java.lang.Character
+                   r/reflect
+                   :members
+                   (map (comp name :name))
+                   (filter #(.startsWith % "is"))
+                   set
+                   sort)]
+    (reduce
+      (fn [pats is-m]
+        (let [c-name (second (s/split is-m #"is" 2))]
+          (try
+            (re-pattern (format "\\p{java%s}" c-name))
+            (conj pats c-name)
+            (catch java.util.regex.PatternSyntaxException e pats))))
+      []
+      is-ms)))
+
 (comment
   (spit "/tmp/clojure-defs.vim" (str syntax-keywords "\n\n" completion-words)))
diff --git a/syntax/clojure.vim b/syntax/clojure.vim
@@ -75,17 +75,15 @@ syntax match clojureDispatch "\v#[\^'=<_]?"
 " Clojure permits no more than 20 params.
 syntax match clojureAnonArg "%\(20\|1\d\|[1-9]\|&\)\?"
 
-" Note: Although not mentioned in the official documentation prefixing the
-" characters ".", "+", "*", "?", "{", "}", "[", "]", "(", and ")" with a "\"
-" forms a legal escape sequence.
-syntax match clojureRegexpEscape "\v\\%(\\|[tnrfae]|c[A-Z]|0[0-3]?[0-7]{1,2}|x\x{2}|u\x{4}|[.+*?{}[\]()])" contained
+syntax match clojureRegexpEscape "\v\\%(\\|[tnrfae]|c[A-Z]|0[0-3]?[0-7]{1,2}|x\x{2}|u\x{4}|.)" contained
 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
 " Character classes
 syntax match clojureRegexpPredefinedCharClass "\v%(\\[dDsSwW]|\.)" contained
-" XXX: Should we distinguish between posix, java, and unicode character
-" classes as in the documentation?
-syntax match clojureRegexpPosixCharClass "\v\\[pP]\{%(Lower|Upper|ASCII|Alpha|Digit|Alnum|Punct|Graph|Print|Blank|Cntrl|XDigit|Space|IsLatin|InGreek|Lu|IsAlphabetic|Sc|java%(LowerCase|UpperCase|Whitespace|Mirrored))\}" contained
+syntax match clojureRegexpPosixCharClass "\v\\[pP]\{%(Lower|Upper|ASCII|Alpha|Digit|Alnum|Punct|Graph|Print|Blank|Cntrl|XDigit|Space|IsLatin|InGreek|Lu|IsAlphabetic|Sc)\}" contained
+syntax match clojureRegexpPosixCharClass "\v\\[pP]\{%(Is)?%(Cn|Cc|Cf|Co|Cs|Lu|Ll|Lt|Lm|Lo|Mn|Me|Mc|Nd|Nl|No|Pd|Ps|Pe|Pc|Pi|Pf|Po|Sm|Sc|Sk|So|Zs|Zl|Zp)\}"
+syntax match clojureRegexpPosixCharClass "\v\\[pP]\{java%(Defined|Digit|ISOControl|IdentifierIgnorable|JavaIdentifierPart|JavaIdentifierStart|Letter|LetterOrDigit|LowerCase|Mirrored|SpaceChar|TitleCase|UnicodeIdentifierPart|UnicodeIdentifierStart|UpperCase|Whitespace)\}" contained
 syntax region clojureRegexpCharClass start="\\\@<!\[" end="\\\@<!\]" contained contains=clojureRegexpSpecialChar,clojureRegexpPredefinedCharClass,clojureRegexpPosixCharClass
 syntax cluster clojureRegexpCharClasses contains=clojureRegexpPredefinedCharClass,clojureRegexpPosixCharClass,clojureRegexpCharClass
 " Boundary
