clojureNumber takes precedence over clojureSymbol

guns · guns · commit 3a15cd018970 · 2013-03-09T17:39:30.000-06:00
Also match `/` in symbols Patch by Joel Holdbrooks guns/vim-clojure-static#18 (comment)
diff --git a/syntax/clojure.vim b/syntax/clojure.vim
@@ -55,10 +55,12 @@ for s:radix in range(2, 36)
 endfor
 unlet! s:radix_chars s:radix
 
-syntax match clojureNumber "\<-\=\d\+\(\.\d*\)\=\(M\|\([eE][-+]\?\d\+\)\)\?\>"
-syntax match clojureNumber "\<-\=\d\+N\?\>"
-syntax match clojureNumber "\<-\=0x\x\+\>"
-syntax match clojureNumber "\<-\=\d\+/\d\+\>"
+syntax match clojureSymbol "\v([a-zA-Z!$&*_+=|<.>?-]|[^\x00-\x7F])+(:?([a-zA-Z0-9!#$%&*_+=|'<.>/?-]|[^\x00-\x7F]))*[#:]@<!"
+
+syntax match clojureNumber "\<[-+]\=\d\+\(\.\d*\)\=\(M\|\([eE][-+]\?\d\+\)\)\?\>"
+syntax match clojureNumber "\<[-+]\=\d\+N\?\>"
+syntax match clojureNumber "\<[-+]\=0x\x\+\>"
+syntax match clojureNumber "\<[-+]\=\d\+/\d\+\>"
 
 syntax match clojureVarArg "&"
 
@@ -73,8 +75,6 @@ syntax match clojureDispatch "\v#[\^'=<_]?"
 " Clojure permits no more than 20 params.
 syntax match clojureAnonArg "%\(20\|1\d\|[1-9]\|&\)\?"
 
-syntax match clojureSymbol "\v([a-zA-Z!$&*_+=|<.>?-]|[^\x00-\x7F])+(:?([a-zA-Z0-9!#$%&*_+=|'<.>?-]|[^\x00-\x7F]))*[#:]@<!"
-
 syntax match clojureComment ";.*$" contains=clojureTodo,@Spell
 syntax match clojureComment "#!.*$"
 
