Fixed tags

pulsar-edit · Apr 30, 2024 · 9e70a72 · 9e70a72
1 parent 781060e
commit 9e70a72
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 4 deletions.
diff --git a/packages/language-clojure/grammars/ts/highlights.scm b/packages/language-clojure/grammars/ts/highlights.scm
@@ -95,7 +95,7 @@
 (list_lit
  "(" @punctuation.section.expression.begin (#is-not? test.descendantOfNodeWithData "clojure.dismissTag")
  .
- (sym_lit) @keyword.control (#match? @keyword.control "^def(on[^\s]*|test|macro|n|n-|)$")
+ (sym_lit) @keyword.control (#match? @keyword.control "^def(on[^\s]*|test|macro|n|n-|protocol|record|struct|)$")
  .
  (sym_lit) @meta.definition.global @entity.global
  ")" @punctuation.section.expression.end)

diff --git a/packages/language-clojure/grammars/ts/tags.scm b/packages/language-clojure/grammars/ts/tags.scm
@@ -1,7 +1,47 @@
 (list_lit
  "(" (#is-not? test.descendantOfNodeWithData "clojure.dismissTag")
  .
- (sym_lit) @keyword.control (#match? @keyword.control "^def(on[^\s]*|test|macro|n|n-|)$")
+ (sym_lit) @keyword.control (#match? @keyword.control "defmacro")
  .
- (sym_lit) @definition.function
- ")")
+ (sym_lit) @name
+ ")")  @definition.constructor
+
+(list_lit
+ "(" (#is-not? test.descendantOfNodeWithData "clojure.dismissTag")
+ .
+ (sym_lit) @keyword.control (#match? @keyword.control "def(protocol|struct|record)")
+ .
+ (sym_lit) @name
+ ")")  @definition.struct
+
+(list_lit
+ "(" (#is-not? test.descendantOfNodeWithData "clojure.dismissTag")
+ .
+ (sym_lit) @keyword.control (#match? @keyword.control "^def(on[^\s]*|test|macro|n|n-)$")
+ .
+ (sym_lit) @name
+ ")")  @definition.function
+
+(list_lit
+ "(" (#is-not? test.descendantOfNodeWithData "clojure.dismissTag")
+ .
+ (sym_lit) @keyword.control (#match? @keyword.control "^def(on[^\s]*|test|macro|n|n-)$")
+ .
+ (sym_lit) @name
+ ")")  @definition.variable
+
+(list_lit
+ "(" @punctuation.section.expression.begin (#is-not? test.descendantOfNodeWithData "clojure.dismissTag")
+ .
+ (sym_lit) @keyword.control (#match? @keyword.control "/def.")
+ .
+ (sym_lit) @name
+ ")") @definition.function
+
+(list_lit
+ "(" @punctuation.section.expression.begin (#is-not? test.descendantOfNodeWithData "clojure.dismissTag")
+ .
+ (sym_lit) @keyword.control (#match? @keyword.control "/def")
+ .
+ (sym_lit) @name
+ ")") @definition.variable
diff --git a/packages/language-clojure/spec/fixtures/tokens.clj b/packages/language-clojure/spec/fixtures/tokens.clj
@@ -38,6 +38,15 @@
 ;  ^ keyword.control
 ;       ^ entity.global
 
+(defprotocol FooBar
+  ;  ^ keyword.control
+  ;          ^ entity.global
+  (-eq [this other]))
+
+(defrecord Lol [a b])
+  ;  ^ keyword.control
+  ;        ^ entity.global
+
 (def a "A STRING")
   ; <- keyword.control
   ;  ^ entity.global