From eae101f3c90e30bc831dc562563cf18f393dcdb9 Mon Sep 17 00:00:00 2001 From: Max Brunsfeld Date: Mon, 2 Feb 2026 13:20:14 -0700 Subject: [PATCH] Revert "rust: Highlight enum variants as variant" (#48211) Reverts zed-industries/zed#47918 Rationale: https://github.com/zed-industries/zed/pull/47918#issuecomment-3837291864 --- crates/languages/src/rust.rs | 4 +--- crates/languages/src/rust/highlights.scm | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/crates/languages/src/rust.rs b/crates/languages/src/rust.rs index 9117da8ad49831a4874069ee4bc3e1f3260e5955..0ac1b8af015c847b96319d6466696cfeacdc24a7 100644 --- a/crates/languages/src/rust.rs +++ b/crates/languages/src/rust.rs @@ -1807,7 +1807,6 @@ mod tests { ("keyword", Hsla::default()), ("function", Hsla::default()), ("property", Hsla::default()), - ("variant", Hsla::default()), ]); language.set_theme(&theme); @@ -1815,7 +1814,6 @@ mod tests { let highlight_function = grammar.highlight_id_for_name("function").unwrap(); let highlight_type = grammar.highlight_id_for_name("type").unwrap(); let highlight_keyword = grammar.highlight_id_for_name("keyword").unwrap(); - let highlight_variant = grammar.highlight_id_for_name("variant").unwrap(); assert_eq!( adapter @@ -1857,7 +1855,7 @@ mod tests { Some(CodeLabel::new( "Variant".to_string(), 0..7, - vec![(0..7, highlight_variant)], + vec![(0..7, highlight_type)], )) ); } diff --git a/crates/languages/src/rust/highlights.scm b/crates/languages/src/rust/highlights.scm index 99b9118ba51b4c587e3c4db9b33bbe964b2e2605..82008d701536177cbe7cab8d6fc6c82e0568e944 100644 --- a/crates/languages/src/rust/highlights.scm +++ b/crates/languages/src/rust/highlights.scm @@ -58,7 +58,7 @@ (#match? @constant "^_*[A-Z][A-Z\\d_]*$")) ; Ensure enum variants are highlighted correctly regardless of naming convention -(enum_variant name: (identifier) @variant) +(enum_variant name: (identifier) @type) [ "("