Clarified some symbol/keyword edge cases in syntax

Author: tonsky

CHANGELOG.md

@@ -1,3 +1,7 @@
+### WIP
+
+- Clarified some symbol/keyword edge cases in syntax
+
 ### 4.3.1 - Nov 4, 2024
 
 - Fixed evaluation of `()` #131

Clojure (Sublimed).sublime-syntax

@@ -8,11 +8,13 @@ variables:
   wsb:          '(?<=^|[\s,()\[\]{}~''`"^@]|#_)'
   wse:           '(?=$|[\s,()\[\]{}";])'
   nwse:              '[^\s,()\[\]{}";]'
-  sym_head:     '[\p{Alpha}*!_?$%&=<>]'
-  sym_head_lax: '[\p{Alpha}*!_?$%&=<>''\-+.#:]'
-  sym_body:     '[\p{Alpha}*!_?$%&=<>''\-+.#:0-9]'
+  
+  sym_head:     '[\p{Alpha}*!_?$%&=<>.]'
+  sym_head_lax: '[\p{Alpha}*!_?$%&=<>.''\-+#:]'
+  sym_body:     '[\p{Alpha}*!_?$%&=<>.''\-+#:0-9]'
   ns_symbol:    '(?:[\-+.]|[\-+.]{{sym_head_lax}}{{sym_body}}*|{{sym_head}}{{sym_body}}*)'
   symbol:       '(?:/|{{ns_symbol}})'
+  
   kw:           '\p{Alpha}*!_?$%&=<>''\-+.#0-9' 
   regexp_name:  '[a-zA-Z][a-zA-Z0-9]*'
 contexts:
@@ -223,7 +225,7 @@ contexts:
       pop: 1
 
   keyword:
-    - match: '{{wsb}}(::?)([{{kw}}][{{kw}}:]*[{{kw}}]|[{{kw}}])(/)([{{kw}}:/]*[{{kw}}]|[{{kw}}]){{wse}}'
+    - match: '{{wsb}}(::?)([{{kw}}][{{kw}}:]*[{{kw}}]|[{{kw}}])(/)([{{kw}}:/]*[{{kw}}]|[{{kw}}]|/+){{wse}}'
       scope: constant.other.keyword.clojure
       captures:
         1: punctuation.definition.keyword.begin.clojure
@@ -235,6 +237,17 @@ contexts:
       captures:
         1: punctuation.definition.keyword.begin.clojure
       pop: 1
+    - match: '{{wsb}}(:)/{{wse}}'
+      scope: constant.other.keyword.clojure
+      captures:
+        1: punctuation.definition.keyword.begin.clojure
+      pop: 1
+    - match: '{{wsb}}(:)/(//+){{wse}}'
+      scope: constant.other.keyword.clojure
+      captures:
+        1: punctuation.definition.keyword.begin.clojure
+        2: punctuation.definition.namespace.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}}'
@@ -271,7 +284,7 @@ contexts:
       push: list_second
 
   symbol_name:
-    - match: '{{wsb}}(?:{{symbol}}|({{ns_symbol}})(/)(?:/|{{sym_body}}+)){{wse}}'
+    - match: '{{wsb}}(?:{{symbol}}|({{ns_symbol}})(/)(?:/|{{sym_body}})+){{wse}}'
       scope: source.symbol.clojure entity.name.clojure
       captures:
         1: meta.namespace.symbol.clojure
@@ -280,15 +293,15 @@ contexts:
       push: list_rest
 
   symbol_unused:
-    - match: '{{wsb}}(?:(?=_){{symbol}}|({{ns_symbol}})(/)(?=_){{symbol}}){{wse}}'
+    - match: '{{wsb}}(?:(?=_){{symbol}}|({{ns_symbol}})(/)(?=_)(?:/|{{sym_body}})*){{wse}}'
       scope: source.symbol.unused.clojure
       captures:
         1: meta.namespace.symbol.clojure
         2: punctuation.definition.namespace.clojure
       pop:   1
 
   symbol:
-    - match: '{{wsb}}(?:{{symbol}}|({{ns_symbol}})(/)(?:/|{{sym_body}}+)){{wse}}'
+    - match: '{{wsb}}(?:{{symbol}}|({{ns_symbol}})(/)(?:/|{{sym_body}})+){{wse}}'
       scope: source.symbol.clojure
       captures:
         1: meta.namespace.symbol.clojure
@@ -543,7 +556,7 @@ contexts:
       pop: 2
 
   deep_keyword:
-    - match: '{{wsb}}(::?)([{{kw}}][{{kw}}:]*[{{kw}}]|[{{kw}}])(/)([{{kw}}:/]*[{{kw}}]|[{{kw}}]){{wse}}'
+    - match: '{{wsb}}(::?)([{{kw}}][{{kw}}:]*[{{kw}}]|[{{kw}}])(/)([{{kw}}:/]*[{{kw}}]|[{{kw}}]|/+){{wse}}'
       scope: constant.other.keyword.clojure
       captures:
         1: punctuation.definition.keyword.begin.clojure
@@ -555,6 +568,17 @@ contexts:
       captures:
         1: punctuation.definition.keyword.begin.clojure
       pop: 2
+    - match: '{{wsb}}(:)/{{wse}}'
+      scope: constant.other.keyword.clojure
+      captures:
+        1: punctuation.definition.keyword.begin.clojure
+      pop: 2
+    - match: '{{wsb}}(:)/(//+){{wse}}'
+      scope: constant.other.keyword.clojure
+      captures:
+        1: punctuation.definition.keyword.begin.clojure
+        2: punctuation.definition.namespace.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}}'
@@ -582,7 +606,7 @@ contexts:
       pop: 2
 
   deep_symbol_def:
-    - match: '{{wsb}}(?:(?=def){{symbol}}|({{ns_symbol}})(/)(?=def){{symbol}}){{wse}}'
+    - match: '{{wsb}}(?:ns|(?=def){{symbol}}|({{ns_symbol}})(/)(?=def){{symbol}}){{wse}}'
       scope: source.symbol.def.clojure
       captures:
         1: meta.namespace.symbol.clojure
@@ -591,7 +615,7 @@ contexts:
       push: deep_list_second
 
   deep_symbol_name:
-    - match: '{{wsb}}(?:{{symbol}}|({{ns_symbol}})(/){{symbol}}){{wse}}'
+    - match: '{{wsb}}(?:{{symbol}}|({{ns_symbol}})(/)(?:/|{{sym_body}})+){{wse}}'
       scope: source.symbol.clojure entity.name.clojure
       captures:
         1: meta.namespace.symbol.clojure
@@ -600,15 +624,15 @@ contexts:
       push: deep_list_rest
 
   deep_symbol_unused:
-    - match: '{{wsb}}(?:(?=_){{symbol}}|({{ns_symbol}})(/)(?=_){{symbol}}){{wse}}'
+    - match: '{{wsb}}(?:(?=_){{symbol}}|({{ns_symbol}})(/)(?=_)(?:/|{{sym_body}})*){{wse}}'
       scope: source.symbol.unused.clojure
       captures:
         1: meta.namespace.symbol.clojure
         2: punctuation.definition.namespace.clojure
       pop: 2
 
   deep_symbol:
-    - match: '{{wsb}}(?:{{symbol}}|({{ns_symbol}})(/){{symbol}}){{wse}}'
+    - match: '{{wsb}}(?:{{symbol}}|({{ns_symbol}})(/)(?:/|{{sym_body}})+){{wse}}'
       scope: source.symbol.clojure
       captures:
         1: meta.namespace.symbol.clojure

test_syntax/syntax_test_clojure.cljc

@@ -343,9 +343,37 @@ string"
 ;      ^^^^ source.symbol.unused
 ;           ^^^^ source.symbol.unused
 
+  ns// ns//sym ns/sym/sym ns/.1a ns/+1a ns/-1a .1a 
+; ^^^^ source.symbol
+; ^^ meta.namespace.symbol
+;   ^ punctuation.definition.namespace
+;     ^ -source.symbol
+;      ^^^^^^^ source.symbol
+;      ^^ meta.namespace.symbol
+;        ^ punctuation.definition.namespace
+;             ^ -source.symbol
+;              ^^^^^^^^^^ source.symbol
+;              ^^ meta.namespace.symbol
+;                ^ punctuation.definition.namespace
+;                        ^ -source.symbol
+;                         ^^^^^^ source.symbol
+;                         ^^ meta.namespace.symbol
+;                           ^ punctuation.definition.namespace
+;                               ^ -source.symbol
+;                                ^^^^^^ source.symbol
+;                                ^^ meta.namespace.symbol
+;                                  ^ punctuation.definition.namespace
+;                                      ^ -source.symbol
+;                                       ^^^^^^ source.symbol
+;                                       ^^ meta.namespace.symbol
+;                                         ^ punctuation.definition.namespace
+;                                             ^ -source.symbol
+;                                              ^^^ source.symbol
+;                                                 ^ -source.symbol
+
 ; NOT SYMBOLS
-  a/ /b 1a -1a +1a .1a
-; ^^^^^^^^^^^^^^^^^^^^ -source.symbol
+  a/ /b 1a -1a +1a 
+; ^^^^^^^^^^^^^^^^^ -source.symbol
 
 
 ;;;;;;;;;; KEYWORDS ;;;;;;;;;;
@@ -403,10 +431,18 @@ string"
 ;            ^^^^^^^^ constant.other.keyword
 ;                     ^^^^^ constant.other.keyword
 ;                           ^^^^^^ constant.other.keyword
+  :/ :/// :ns// :ns///
+; ^^ constant.other.keyword
+;   ^ -constant.other.keyword
+;    ^^^^ constant.other.keyword
+;        ^ -constant.other.keyword
+;         ^^^^^ constant.other.keyword
+;              ^ -constant.other.keyword
+;               ^^^^^^ constant.other.keyword
 
 ;;;;; NOT KEYWORDS
-  :kv: :kv/ :/kv :/ :kv/ab: :kv/ab/ :::kv 
-; ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -constant.other.keyword
+  :kv: :kv/ :/kv :kv/ab: :kv/ab/ :::kv :// ::/ :://
+; ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -constant.other.keyword
 
 
 ;;;;;;;;;; INTEGERS ;;;;;;;;;;