Use @boolean for true and false in highlights (#25338)

Release Notes: - Fixed issue where `true` and `false` were highlighted as constants, ignoring the `boolean` highlight defined in themes. - This fix applies to: C, C++, Go, JSON, JSONC, Python, and Rust. --------- Co-authored-by: Marshall Bowers <[email protected]>
zed-industries · Feb 21, 2025 · 1fb4620 · 1fb4620
1 parent 3c4903c
commit 1fb4620
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 4 deletions.
diff --git a/crates/languages/src/c/highlights.scm b/crates/languages/src/c/highlights.scm
@@ -102,8 +102,9 @@
 [
   (true)
   (false)
-  (null)
-] @constant
+] @boolean
+
+(null) @constant
 
 (identifier) @variable
 

diff --git a/crates/languages/src/cpp/highlights.scm b/crates/languages/src/cpp/highlights.scm
@@ -153,6 +153,9 @@ type :(primitive_type) @type.primitive
 [
   (true)
   (false)
+] @boolean
+
+[
   (null)
   ("nullptr")
 ] @constant

diff --git a/crates/languages/src/go/highlights.scm b/crates/languages/src/go/highlights.scm
@@ -118,6 +118,9 @@
 [
   (true)
   (false)
+] @boolean
+
+[
   (nil)
   (iota)
 ] @constant.builtin

diff --git a/crates/languages/src/json/highlights.scm b/crates/languages/src/json/highlights.scm
@@ -11,6 +11,9 @@
 [
   (true)
   (false)
+] @boolean
+
+[
   (null)
 ] @constant
 

diff --git a/crates/languages/src/jsonc/highlights.scm b/crates/languages/src/jsonc/highlights.scm
@@ -11,6 +11,9 @@
 [
   (true)
   (false)
+] @boolean
+
+[
   (null)
 ] @constant
 

diff --git a/crates/languages/src/python/highlights.scm b/crates/languages/src/python/highlights.scm
@@ -95,9 +95,12 @@
 ; Literals
 
 [
-  (none)
   (true)
   (false)
+] @boolean
+
+[
+  (none)
   (ellipsis)
 ] @constant.builtin
 

diff --git a/crates/languages/src/rust/highlights.scm b/crates/languages/src/rust/highlights.scm
@@ -129,7 +129,7 @@
   (float_literal)
 ] @number
 
-(boolean_literal) @constant
+(boolean_literal) @boolean
 
 [
   (line_comment)
-Original file line number
+Diff line change
@@ Expand Up / @@ -153,6 +153,9 @@ type :(primitive_type) @type.primitive @@
     [
       (true)
       (false)
+    ] @boolean
+    [
       (null)
       ("nullptr")
     ] @constant
@@ Expand Down @@