Opening symbol of #(), #?() and #?@() is marked as parens

Author: tonsky

Clojure (Sublimed).sublime-syntax

@@ -36,7 +36,6 @@ contexts:
     - include: comma
     - include: line_comment
     - include: reader_comment
-    - include: form_comment
     - include: metadata
     - include: anonymous_fn
     - include: regexp
@@ -76,7 +75,7 @@ contexts:
 
   reader_conditional:
     - match: '#\?@?'
-      scope: punctuation.definition.reader_conditional.clojure
+      scope: punctuation.definition.reader_conditional.clojure meta.parens.clojure punctuation.section.parens.begin.clojure
       push: 
       - meta_scope: meta.reader_conditional.clojure
       - include: forms
@@ -113,25 +112,14 @@ contexts:
     - match: '(#)(\()'
       captures:
         1: punctuation.definition.anon_fn.clojure
-        2: punctuation.section.parens.begin.clojure
+      scope: punctuation.section.parens.begin.clojure
       push:
       - meta_scope: meta.parens.clojure meta.function.anon.clojure
       - match: \)
         scope: punctuation.section.parens.end.clojure
         pop:   2
       - include: main
 
-  form_comment:
-    - match: '(\()[\s,]*comment'
-      captures:
-        1: punctuation.section.parens.begin.clojure
-      push: 
-      - meta_scope: meta.parens.clojure comment.form.clojure
-      - match: \)
-        scope: punctuation.section.parens.end.clojure
-        pop:   2
-      - include: main
-
   constant:
     - match: '{{wsb}}(nil|true|false){{wse}}'
       scope: constant.language.clojure
@@ -293,25 +281,23 @@ contexts:
       scope: punctuation.section.parens.begin.clojure
       branch_point: open_parens
       branch:
-        - comment_first
+        - form_comment_first
         - list_first
 
-  comment_first:
+  form_comment_first:
     - meta_scope: comment.form.clojure
-    - match: \)
-      scope: punctuation.section.parens.end.clojure
-      pop:   2
     - include: comma
     - include: line_comment
     - include: reader_comment
     - include: metadata
     - match: 'comment'
-      pop: 1
-      push: comment_rest
+      set: form_comment_rest
+    - match: \)
+      fail: open_parens
     - match: '(?=\S)'
       fail: open_parens
 
-  comment_rest:
+  form_comment_rest:
     - meta_scope: comment.form.clojure
     - match: \)
       scope: punctuation.section.parens.end.clojure

test_scheme/color_scheme.clj

@@ -0,0 +1,39 @@
+
+; Constants
+nil true false \c \newline 123 1.23 10/20 :abc :abc.def/uvw.xyz #inst "1985-01-25"
+
+; Symbols
+abc ab/cd
+
+; Strings
+"" "abc" "\" \u221e"
+
+; Top-level parens
+() [] {} #() #{} #?() #?@() 
+
+; Nested parens
+(() [] {} #() #{} #?() #?@())
+[() [] {} #() #{} #?() #?@()]
+{() [] {} #() #{} #?() #?@()}
+#{() [] {} #() #{} #?() #?@()}
+#(() [] {} #() #{} #?() #?@())
+([{}])
+(((((((((()))))))))) [[[[[[[[[[]]]]]]]]]] {{{{{{{{{{}}}}}}}}}}
+
+; Definitions
+(def xyz)
+(def xyz xyz)
+(def xyz 123)
+(def 123 xyz)
+(def
+  xyz)
+(do (def xyz))
+
+; Punctuation
+,
+
+; Meta
+; Quotes
+; Syntax quotes
+; Reader comments
+; Form comments

test_syntax/syntax_test_clojure.cljc

@@ -392,6 +392,8 @@
 ;          ^ punctuation.section.parens.end
 
 ; COMMENT BLOCK
+  ()
+; ^^ - comment
   (comment 123)
 ; ^^^^^^^^^^^^^ comment.form.clojure
   (comment