From 1fb4620a90501a8ee0e61fd75da1d5ffb0125ad2 Mon Sep 17 00:00:00 2001
From: everdrone <giorgiotropiano@gmail.com>
Date: Fri, 21 Feb 2025 16:26:52 +0100
Subject: [PATCH] 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 <git@maxdeviant.com>
---
 crates/languages/src/c/highlights.scm      | 5 +++--
 crates/languages/src/cpp/highlights.scm    | 3 +++
 crates/languages/src/go/highlights.scm     | 3 +++
 crates/languages/src/json/highlights.scm   | 3 +++
 crates/languages/src/jsonc/highlights.scm  | 3 +++
 crates/languages/src/python/highlights.scm | 5 ++++-
 crates/languages/src/rust/highlights.scm   | 2 +-
 7 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/crates/languages/src/c/highlights.scm b/crates/languages/src/c/highlights.scm
index 634f8d81c4..ef15a4b345 100644
--- 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
index 2df9ec2923..2a8235de1f 100644
--- 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
index 609c49c13f..7e594a5c12 100644
--- 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
index 8cf7a6d20d..c3186af264 100644
--- 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
index 8cf7a6d20d..c3186af264 100644
--- 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
index 0495f87716..e3e38aafed 100644
--- 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
index d25b8a7347..bd5221f1e6 100644
--- 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)