Better keyword detection

Author: tonsky

CHANGELOG.md

@@ -10,6 +10,7 @@ Syntax has been significantly reworked.
 - Quote & syntax quote highlight following form as `meta.quoted` and `meta.quoted.syntax`
 - Metadata highlights following form as `meta.metadata`
 - Octal & arbitrary radix integers
+- Better keyword detection
 
 Other changes:
 

Clojure (Sublimed).sublime-syntax

@@ -13,9 +13,7 @@ variables:
   sym_body:     '[\p{Alpha}*!_?$%&=<>''\-+.#:0-9]'
   ns_symbol:    '(?:[\-+.]|[\-+.]{{sym_head_lax}}{{sym_body}}*|{{sym_head}}{{sym_body}}*)'
   symbol:       '(?:/|{{ns_symbol}})'
-  kw_head:      '[\p{Alpha}*!_?$%&=<>''\-+.#0-9]'
-  kw_body:      '[\p{Alpha}*!_?$%&=<>''\-+.#0-9:]'
-  keyword:      '{{kw_head}}{{kw_body}}*'
+  kw:           '\p{Alpha}*!_?$%&=<>''\-+.#0-9' 
   regexp_name:  '[a-zA-Z][a-zA-Z0-9]*'
 contexts:
   main:
@@ -225,13 +223,18 @@ contexts:
       pop: 1
 
   keyword:
-    - match: '{{wsb}}(::?)(?:{{keyword}}|({{keyword}})(/){{keyword}}){{wse}}'
+    - match: '{{wsb}}(::?)([{{kw}}][{{kw}}:]*[{{kw}}]|[{{kw}}])(/)([{{kw}}:/]*[{{kw}}]|[{{kw}}]){{wse}}'
       scope: constant.other.keyword.clojure
       captures:
         1: punctuation.definition.keyword.begin.clojure
         2: meta.namespace.keyword.clojure
         3: punctuation.definition.namespace.clojure
-      pop:   1
+      pop: 1
+    - match: '{{wsb}}(::?)([{{kw}}][{{kw}}:]*[{{kw}}]|[{{kw}}]){{wse}}'
+      scope: constant.other.keyword.clojure
+      captures:
+        1: punctuation.definition.keyword.begin.clojure
+      pop: 1
 
   integer:
     - match: '{{wsb}}[+-]?(?:0[xX][0-9A-Fa-f]+|0[1-7]+|[1-9][0-9]*|[1-9][0-9]?[rR][0-9A-Za-z]+|0)(N)?{{wse}}'
@@ -540,13 +543,18 @@ contexts:
       pop: 2
 
   deep_keyword:
-    - match: '{{wsb}}(::?)(?:{{keyword}}|({{keyword}})(/){{keyword}}){{wse}}'
+    - match: '{{wsb}}(::?)([{{kw}}][{{kw}}:]*[{{kw}}]|[{{kw}}])(/)([{{kw}}:/]*[{{kw}}]|[{{kw}}]){{wse}}'
       scope: constant.other.keyword.clojure
       captures:
         1: punctuation.definition.keyword.begin.clojure
         2: meta.namespace.keyword.clojure
         3: punctuation.definition.namespace.clojure
       pop: 2
+    - match: '{{wsb}}(::?)([{{kw}}][{{kw}}:]*[{{kw}}]|[{{kw}}]){{wse}}'
+      scope: constant.other.keyword.clojure
+      captures:
+        1: punctuation.definition.keyword.begin.clojure
+      pop: 2
 
   deep_integer:
     - match: '{{wsb}}[+-]?(?:0[xX][0-9A-Fa-f]+|0[1-7]+|[1-9][0-9]*|[1-9][0-9]?[rR][0-9A-Za-z]+|0)(N)?{{wse}}'

test_syntax/syntax_test_clojure.cljc

@@ -324,7 +324,7 @@ string"
 ;   ^ -constant.other.keyword
 ;    ^^^^ constant.other.keyword
 ;         ^^^^ constant.other.keyword
-  :. :* :+ :! :- :_ :? :$ :% :& := :< :> :# :1 :' :a: :k::v
+  :. :* :+ :! :- :_ :? :$ :% :& := :< :> :# :1 :' :k::v
 ; ^^ constant.other.keyword
 ;    ^^ constant.other.keyword
 ;       ^^ constant.other.keyword
@@ -341,8 +341,7 @@ string"
 ;                                        ^^ constant.other.keyword
 ;                                           ^^ constant.other.keyword
 ;                                              ^^ constant.other.keyword
-;                                                 ^^^ constant.other.keyword
-;                                                     ^^^^^ constant.other.keyword
+;                                                 ^^^^^ constant.other.keyword
   :a/b :1/2 :абв/где :abc.def/uvw.xyz
 ; ^^^^ constant.other.keyword
 ; ^    punctuation.definition.keyword.begin
@@ -365,10 +364,16 @@ string"
 ;      ^^ punctuation.definition.keyword.begin
 ;        ^ meta.namespace.keyword
 ;         ^ punctuation.definition.namespace
+  :a:b :a/:b :a:b/c:d :a//b :k/v/v
+; ^^^^ constant.other.keyword
+;      ^^^^^ constant.other.keyword
+;            ^^^^^^^^ constant.other.keyword
+;                     ^^^^^ constant.other.keyword
+;                           ^^^^^^ constant.other.keyword
 
-;; NOT KEYWORDS
-  :kv/ :/kv :/ :k/:v :k/v/v :::kv 
-; ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -constant.other.keyword
+;;;;; NOT KEYWORDS
+  :kv: :kv/ :/kv :/ :kv/ab: :kv/ab/ :::kv 
+; ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -constant.other.keyword
 
 
 ;;;;;;;;;; INTEGERS ;;;;;;;;;;