diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-06-21 13:05:16 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2020-06-21 13:05:16 +0100 |
commit | 50dad50188f9eef5b10b2908351e668e8ba8a0c5 (patch) | |
tree | b64a253eb9c8ba1e45d46f9c3f34261d03ef1659 /crates/ra_ide/src/syntax_highlighting.rs | |
parent | fe254857e6ab9a9881e7351429fcd4e152aa9d0d (diff) | |
parent | df5b37cb612664985f1ba0a24280621809bd5533 (diff) |
Merge #4959
4959: Syntax highlighting for documentation comments on macro definitions r=matklad a=ltentrup
Two minor changes with regards to syntax highlighting of comments attached to macro definitions.
Before
<img width="290" alt="Bildschirmfoto 2020-06-20 um 00 05 19" src="https://user-images.githubusercontent.com/201808/85182705-c561b500-b289-11ea-944e-0bdf6508a44f.png">
After
<img width="288" alt="Bildschirmfoto 2020-06-20 um 00 03 36" src="https://user-images.githubusercontent.com/201808/85182727-d90d1b80-b289-11ea-9d2d-234731f19302.png">
Fixes #4949
Co-authored-by: Leander Tentrup <[email protected]>
Diffstat (limited to 'crates/ra_ide/src/syntax_highlighting.rs')
-rw-r--r-- | crates/ra_ide/src/syntax_highlighting.rs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/crates/ra_ide/src/syntax_highlighting.rs b/crates/ra_ide/src/syntax_highlighting.rs index f8f790e59..448645bdc 100644 --- a/crates/ra_ide/src/syntax_highlighting.rs +++ b/crates/ra_ide/src/syntax_highlighting.rs | |||
@@ -121,7 +121,6 @@ pub(crate) fn highlight( | |||
121 | assert!(current_macro_call == Some(mc)); | 121 | assert!(current_macro_call == Some(mc)); |
122 | current_macro_call = None; | 122 | current_macro_call = None; |
123 | format_string = None; | 123 | format_string = None; |
124 | continue; | ||
125 | } | 124 | } |
126 | _ => (), | 125 | _ => (), |
127 | } | 126 | } |
@@ -150,7 +149,7 @@ pub(crate) fn highlight( | |||
150 | 149 | ||
151 | let range = element.text_range(); | 150 | let range = element.text_range(); |
152 | 151 | ||
153 | let element_to_highlight = if current_macro_call.is_some() { | 152 | let element_to_highlight = if current_macro_call.is_some() && element.kind() != COMMENT { |
154 | // Inside a macro -- expand it first | 153 | // Inside a macro -- expand it first |
155 | let token = match element.clone().into_token() { | 154 | let token = match element.clone().into_token() { |
156 | Some(it) if it.parent().kind() == TOKEN_TREE => it, | 155 | Some(it) if it.parent().kind() == TOKEN_TREE => it, |