From 9f6d76da77ee1c77e79a7cf5128d69253c58c744 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Sat, 19 Dec 2020 18:46:42 +0300 Subject: Make sure that HighlightModifier::ALL is synchronized with enum --- crates/ide/src/syntax_highlighting/tags.rs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'crates/ide/src/syntax_highlighting/tags.rs') diff --git a/crates/ide/src/syntax_highlighting/tags.rs b/crates/ide/src/syntax_highlighting/tags.rs index e07cfb43f..974f54fa0 100644 --- a/crates/ide/src/syntax_highlighting/tags.rs +++ b/crates/ide/src/syntax_highlighting/tags.rs @@ -51,12 +51,14 @@ pub enum HighlightModifier { Injected, Mutable, Consuming, - Unsafe, Callable, /// Used for associated functions Static, /// Used for items in impls&traits. Associated, + + /// Keep this last! + Unsafe, } impl HighlightTag { @@ -108,7 +110,7 @@ impl fmt::Display for HighlightTag { } impl HighlightModifier { - const ALL: &'static [HighlightModifier] = &[ + const ALL: &'static [HighlightModifier; HighlightModifier::Unsafe as u8 as usize + 1] = &[ HighlightModifier::Attribute, HighlightModifier::ControlFlow, HighlightModifier::Definition, @@ -116,9 +118,10 @@ impl HighlightModifier { HighlightModifier::Injected, HighlightModifier::Mutable, HighlightModifier::Consuming, - HighlightModifier::Unsafe, HighlightModifier::Callable, HighlightModifier::Static, + HighlightModifier::Associated, + HighlightModifier::Unsafe, ]; fn as_str(self) -> &'static str { -- cgit v1.2.3