aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_ide/src
diff options
context:
space:
mode:
Diffstat (limited to 'crates/ra_ide/src')
-rw-r--r--crates/ra_ide/src/syntax_highlighting.rs2
-rw-r--r--crates/ra_ide/src/syntax_highlighting/tags.rs6
2 files changed, 4 insertions, 4 deletions
diff --git a/crates/ra_ide/src/syntax_highlighting.rs b/crates/ra_ide/src/syntax_highlighting.rs
index 7fc94d3cd..d833a816b 100644
--- a/crates/ra_ide/src/syntax_highlighting.rs
+++ b/crates/ra_ide/src/syntax_highlighting.rs
@@ -232,7 +232,7 @@ fn highlight_element(
232 | T![loop] 232 | T![loop]
233 | T![match] 233 | T![match]
234 | T![return] 234 | T![return]
235 | T![while] => h | HighlightModifier::Control, 235 | T![while] => h | HighlightModifier::ControlFlow,
236 T![unsafe] => h | HighlightModifier::Unsafe, 236 T![unsafe] => h | HighlightModifier::Unsafe,
237 _ => h, 237 _ => h,
238 } 238 }
diff --git a/crates/ra_ide/src/syntax_highlighting/tags.rs b/crates/ra_ide/src/syntax_highlighting/tags.rs
index 8835a5de2..e8b138e1a 100644
--- a/crates/ra_ide/src/syntax_highlighting/tags.rs
+++ b/crates/ra_ide/src/syntax_highlighting/tags.rs
@@ -44,7 +44,7 @@ pub enum HighlightTag {
44#[repr(u8)] 44#[repr(u8)]
45pub enum HighlightModifier { 45pub enum HighlightModifier {
46 /// Used with keywords like `if` and `break`. 46 /// Used with keywords like `if` and `break`.
47 Control = 0, 47 ControlFlow = 0,
48 /// `foo` in `fn foo(x: i32)` is a definition, `foo` in `foo(90 + 2)` is 48 /// `foo` in `fn foo(x: i32)` is a definition, `foo` in `foo(90 + 2)` is
49 /// not. 49 /// not.
50 Definition, 50 Definition,
@@ -91,7 +91,7 @@ impl fmt::Display for HighlightTag {
91 91
92impl HighlightModifier { 92impl HighlightModifier {
93 const ALL: &'static [HighlightModifier] = &[ 93 const ALL: &'static [HighlightModifier] = &[
94 HighlightModifier::Control, 94 HighlightModifier::ControlFlow,
95 HighlightModifier::Definition, 95 HighlightModifier::Definition,
96 HighlightModifier::Mutable, 96 HighlightModifier::Mutable,
97 HighlightModifier::Unsafe, 97 HighlightModifier::Unsafe,
@@ -99,7 +99,7 @@ impl HighlightModifier {
99 99
100 fn as_str(self) -> &'static str { 100 fn as_str(self) -> &'static str {
101 match self { 101 match self {
102 HighlightModifier::Control => "control", 102 HighlightModifier::ControlFlow => "control",
103 HighlightModifier::Definition => "declaration", 103 HighlightModifier::Definition => "declaration",
104 HighlightModifier::Mutable => "mutable", 104 HighlightModifier::Mutable => "mutable",
105 HighlightModifier::Unsafe => "unsafe", 105 HighlightModifier::Unsafe => "unsafe",