Keyword and Symbol prefix matching

Author: Invertisment

Diff for: syntax/clojure.vim

@@ -62,21 +62,26 @@ endif
 unlet! s:key
 delfunction s:syntax_keyword
 
+syntax match clojureKeywordNs contained "\v[^/ :']+\ze/"
+syntax match clojureKeywordNsSeparator contained "/"
+syntax match clojureKeywordNsColon contained "\v<:{1,2}"
 " Keywords are symbols:
 "   static Pattern symbolPat = Pattern.compile("[:]?([\\D&&[^/]].*/)?([\\D&&[^/]][^/]*)");
 " But they:
 "   * Must not end in a : or /
 "   * Must not have two adjacent colons except at the beginning
 "   * Must not contain any reader metacharacters except for ' and #
-syntax match clojureKeyword "\v<:{1,2}([^ \n\r\t()\[\]{}";@^`~\\/]+/)*[^ \n\r\t()\[\]{}";@^`~\\/]+:@1<!>"
+syntax match clojureKeyword "\v<:{1,2}([^ \n\r\t()\[\]{}";@^`~\\/]+/)*[^ \n\r\t()\[\]{}";@^`~\\/]+:@1<!>" contains=clojureKeywordNs,clojureKeywordNsSeparator,clojureKeywordNsColon
 
 syntax match clojureStringEscape "\v\\%([\\btnfr"]|u\x{4}|[0-3]\o{2}|\o{1,2})" contained
 
 syntax region clojureString matchgroup=clojureStringDelimiter start=/"/ skip=/\\\\\|\\"/ end=/"/ contains=clojureStringEscape,@Spell
 
 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]))*[#:]@1<!"
+syntax match clojureSymbolNs contained "\v[^/ :']+\ze/"
+syntax match clojureSymbolNsSeparator contained "/"
+syntax match clojureSymbol "\v%([a-zA-Z!$&*_+=|<.>?-]|[^\x00-\x7F])+%(:?%([a-zA-Z0-9!#$%&*_+=|'<.>/?-]|[^\x00-\x7F]))*[#:]@1<!" contains=clojureSymbolNs,clojureSymbolNsSeparator
 
 " NB. Correct matching of radix literals was removed for better performance.
 syntax match clojureNumber "\v<[-+]?%(%([2-9]|[12]\d|3[0-6])[rR][[:alnum:]]+|%(0\o*|0x\x+|[1-9]\d*)N?|%(0|[1-9]\d*|%(0|[1-9]\d*)\.\d*)%(M|[eE][-+]?\d+)?|%(0|[1-9]\d*)/%(0|[1-9]\d*))>"
@@ -162,12 +167,17 @@ syntax sync fromstart
 highlight default link clojureConstant                  Constant
 highlight default link clojureBoolean                   Boolean
 highlight default link clojureCharacter                 Character
-highlight default link clojureKeyword                   Keyword
 highlight default link clojureNumber                    Number
 highlight default link clojureString                    String
 highlight default link clojureStringDelimiter           String
 highlight default link clojureStringEscape              Character
 
+highlight default link clojureKeyword                   Keyword
+highlight default link clojureKeywordNsColon            clojureKeyword
+highlight default link clojureKeywordNs                 clojureKeyword
+
+highlight default link clojureSymbolNs                  clojureSymbol
+
 highlight default link clojureRegexp                    Constant
 highlight default link clojureRegexpDelimiter           Constant
 highlight default link clojureRegexpEscape              Character