diff options
Diffstat (limited to 'crates/ra_ide')
-rw-r--r-- | crates/ra_ide/src/references.rs | 1 | ||||
-rw-r--r-- | crates/ra_ide/src/syntax_highlighting.rs | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/crates/ra_ide/src/references.rs b/crates/ra_ide/src/references.rs index 2eb047c96..9b0785e1d 100644 --- a/crates/ra_ide/src/references.rs +++ b/crates/ra_ide/src/references.rs | |||
@@ -114,6 +114,7 @@ pub(crate) fn find_all_refs( | |||
114 | position: FilePosition, | 114 | position: FilePosition, |
115 | search_scope: Option<SearchScope>, | 115 | search_scope: Option<SearchScope>, |
116 | ) -> Option<RangeInfo<ReferenceSearchResult>> { | 116 | ) -> Option<RangeInfo<ReferenceSearchResult>> { |
117 | let _p = profile("find_all_refs"); | ||
117 | let sema = Semantics::new(db); | 118 | let sema = Semantics::new(db); |
118 | let syntax = sema.parse(position.file_id).syntax().clone(); | 119 | let syntax = sema.parse(position.file_id).syntax().clone(); |
119 | 120 | ||
diff --git a/crates/ra_ide/src/syntax_highlighting.rs b/crates/ra_ide/src/syntax_highlighting.rs index b89501aff..7e41db530 100644 --- a/crates/ra_ide/src/syntax_highlighting.rs +++ b/crates/ra_ide/src/syntax_highlighting.rs | |||
@@ -219,10 +219,10 @@ fn highlight_element( | |||
219 | CHAR => HighlightTag::CharLiteral.into(), | 219 | CHAR => HighlightTag::CharLiteral.into(), |
220 | LIFETIME => { | 220 | LIFETIME => { |
221 | let h = Highlight::new(HighlightTag::Lifetime); | 221 | let h = Highlight::new(HighlightTag::Lifetime); |
222 | dbg!(match element.parent().map(|it| it.kind()) { | 222 | match element.parent().map(|it| it.kind()) { |
223 | Some(LIFETIME_PARAM) | Some(LABEL) => h | HighlightModifier::Definition, | 223 | Some(LIFETIME_PARAM) | Some(LABEL) => h | HighlightModifier::Definition, |
224 | _ => h, | 224 | _ => h, |
225 | }) | 225 | } |
226 | } | 226 | } |
227 | 227 | ||
228 | k if k.is_keyword() => { | 228 | k if k.is_keyword() => { |
@@ -320,7 +320,7 @@ fn highlight_injection( | |||
320 | let call_info = call_info_for_token(&sema, expanded)?; | 320 | let call_info = call_info_for_token(&sema, expanded)?; |
321 | let idx = call_info.active_parameter?; | 321 | let idx = call_info.active_parameter?; |
322 | let name = call_info.signature.parameter_names.get(idx)?; | 322 | let name = call_info.signature.parameter_names.get(idx)?; |
323 | if name != "ra_fixture" { | 323 | if !name.starts_with("ra_fixture") { |
324 | return None; | 324 | return None; |
325 | } | 325 | } |
326 | let value = literal.value()?; | 326 | let value = literal.value()?; |