Merge pull request #3853 from matklad/cf

Make control token modifier less ambiguous
rust-lang · Apr 6, 2020 · ec3fb1c · ec3fb1c
2 parents 972816b + 48bc0ca
commit ec3fb1c
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 12 deletions.
diff --git a/crates/ra_ide/src/syntax_highlighting.rs b/crates/ra_ide/src/syntax_highlighting.rs
@@ -232,7 +232,7 @@ fn highlight_element(
                 | T![loop]
                 | T![match]
                 | T![return]
-                | T![while] => h | HighlightModifier::Control,
+                | T![while] => h | HighlightModifier::ControlFlow,
                 T![unsafe] => h | HighlightModifier::Unsafe,
                 _ => h,
             }

diff --git 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 {
 #[repr(u8)]
 pub enum HighlightModifier {
     /// Used with keywords like `if` and `break`.
-    Control = 0,
+    ControlFlow = 0,
     /// `foo` in `fn foo(x: i32)` is a definition, `foo` in `foo(90 + 2)` is
     /// not.
     Definition,
@@ -91,15 +91,15 @@ impl fmt::Display for HighlightTag {
 
 impl HighlightModifier {
     const ALL: &'static [HighlightModifier] = &[
-        HighlightModifier::Control,
+        HighlightModifier::ControlFlow,
         HighlightModifier::Definition,
         HighlightModifier::Mutable,
         HighlightModifier::Unsafe,
     ];
 
     fn as_str(self) -> &'static str {
         match self {
-            HighlightModifier::Control => "control",
+            HighlightModifier::ControlFlow => "control",
             HighlightModifier::Definition => "declaration",
             HighlightModifier::Mutable => "mutable",
             HighlightModifier::Unsafe => "unsafe",

diff --git a/crates/rust-analyzer/src/conv.rs b/crates/rust-analyzer/src/conv.rs
@@ -20,7 +20,7 @@ use ra_vfs::LineEndings;
 
 use crate::{
     req,
-    semantic_tokens::{self, ModifierSet, CONSTANT, CONTROL, MUTABLE, UNSAFE},
+    semantic_tokens::{self, ModifierSet, CONSTANT, CONTROL_FLOW, MUTABLE, UNSAFE},
     world::WorldSnapshot,
     Result,
 };
@@ -378,7 +378,7 @@ impl Conv for Highlight {
         for modifier in self.modifiers.iter() {
             let modifier = match modifier {
                 HighlightModifier::Definition => SemanticTokenModifier::DECLARATION,
-                HighlightModifier::Control => CONTROL,
+                HighlightModifier::ControlFlow => CONTROL_FLOW,
                 HighlightModifier::Mutable => MUTABLE,
                 HighlightModifier::Unsafe => UNSAFE,
             };

diff --git a/crates/rust-analyzer/src/semantic_tokens.rs b/crates/rust-analyzer/src/semantic_tokens.rs
@@ -12,7 +12,7 @@ pub(crate) const TYPE_ALIAS: SemanticTokenType = SemanticTokenType::new("typeAli
 pub(crate) const UNION: SemanticTokenType = SemanticTokenType::new("union");
 
 pub(crate) const CONSTANT: SemanticTokenModifier = SemanticTokenModifier::new("constant");
-pub(crate) const CONTROL: SemanticTokenModifier = SemanticTokenModifier::new("control");
+pub(crate) const CONTROL_FLOW: SemanticTokenModifier = SemanticTokenModifier::new("controlFlow");
 pub(crate) const MUTABLE: SemanticTokenModifier = SemanticTokenModifier::new("mutable");
 pub(crate) const UNSAFE: SemanticTokenModifier = SemanticTokenModifier::new("unsafe");
 
@@ -56,7 +56,7 @@ pub(crate) const SUPPORTED_MODIFIERS: &[SemanticTokenModifier] = &[
     CONSTANT,
     MUTABLE,
     UNSAFE,
-    CONTROL,
+    CONTROL_FLOW,
 ];
 
 #[derive(Default)]

diff --git a/editors/code/package.json b/editors/code/package.json
@@ -517,7 +517,7 @@
                 "description": "Style for compile-time constants"
             },
             {
-                "id": "control",
+                "id": "controlFlow",
                 "description": "Style for control flow keywords"
             },
             {
@@ -551,9 +551,6 @@
                     "keyword.unsafe": [
                         "keyword.other.unsafe"
                     ],
-                    "keyword.control": [
-                        "keyword.control"
-                    ],
                     "variable.constant": [
                         "entity.name.constant"
                     ]