From ed4c9612a64755520e69f5d401fcb7868ed08d7c Mon Sep 17 00:00:00 2001 From: everdrone Date: Fri, 21 Feb 2025 15:51:05 +0100 Subject: [PATCH 1/2] Use @boolean for true|false in highlights --- 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 | 3 ++- 7 files changed, 21 insertions(+), 4 deletions(-) diff --git a/crates/languages/src/c/highlights.scm b/crates/languages/src/c/highlights.scm index 634f8d81c4ad93..ef15a4b3453630 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 2df9ec2923be3d..2a8235de1fa33e 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 609c49c13f53cf..7e594a5c1262c3 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 8cf7a6d20dc6c7..c3186af264e4b6 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 8cf7a6d20dc6c7..c3186af264e4b6 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 0495f87716bd21..e3e38aafedf52a 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 d25b8a734719ba..5244cd630dc0e9 100644 --- a/crates/languages/src/rust/highlights.scm +++ b/crates/languages/src/rust/highlights.scm @@ -99,6 +99,7 @@ "mod" "move" "pub" + "raw" "ref" "return" "static" @@ -129,7 +130,7 @@ (float_literal) ] @number -(boolean_literal) @constant +(boolean_literal) @boolean [ (line_comment) From 934f86273c2e811b2762a0792faf57c876246350 Mon Sep 17 00:00:00 2001 From: Marshall Bowers Date: Fri, 21 Feb 2025 10:08:42 -0500 Subject: [PATCH 2/2] Remove `raw` keyword addition to keep this PR scoped --- crates/languages/src/rust/highlights.scm | 1 - 1 file changed, 1 deletion(-) diff --git a/crates/languages/src/rust/highlights.scm b/crates/languages/src/rust/highlights.scm index 5244cd630dc0e9..bd5221f1e609ee 100644 --- a/crates/languages/src/rust/highlights.scm +++ b/crates/languages/src/rust/highlights.scm @@ -99,7 +99,6 @@ "mod" "move" "pub" - "raw" "ref" "return" "static"