wip

Author: matklad

crates/ra_ide/src/syntax_highlighting.rs

@@ -1,6 +1,6 @@
 //! FIXME: write short doc here
 
-use hir::{InFile, Name, Semantics};
+use hir::{Name, Semantics};
 use ra_db::SourceDatabase;
 use ra_ide_db::{
     defs::{classify_name2, NameDefinition},
@@ -81,17 +81,15 @@ pub(crate) fn highlight(db: &RootDatabase, file_id: FileId) -> Vec<HighlightedRa
             WalkEvent::Enter(node) => match node.kind() {
                 MACRO_CALL => {
                     in_macro_call = Some(node.clone());
-                    if let Some(range) = highlight_macro(InFile::new(file_id.into(), node)) {
+                    if let Some(range) = highlight_macro(node) {
                         res.push(HighlightedRange { range, tag: tags::MACRO, binding_hash: None });
                     }
                 }
                 _ if in_macro_call.is_some() => {
                     if let Some(token) = node.as_token() {
-                        if let Some((tag, binding_hash)) = highlight_token_tree(
-                            &sema,
-                            &mut bindings_shadow_count,
-                            InFile::new(file_id.into(), token.clone()),
-                        ) {
+                        if let Some((tag, binding_hash)) =
+                            highlight_token_tree(&sema, &mut bindings_shadow_count, token.clone())
+                        {
                             res.push(HighlightedRange {
                                 range: node.text_range(),
                                 tag,
@@ -121,8 +119,8 @@ pub(crate) fn highlight(db: &RootDatabase, file_id: FileId) -> Vec<HighlightedRa
     res
 }
 
-fn highlight_macro(node: InFile<SyntaxElement>) -> Option<TextRange> {
-    let macro_call = ast::MacroCall::cast(node.value.as_node()?.clone())?;
+fn highlight_macro(node: SyntaxElement) -> Option<TextRange> {
+    let macro_call = ast::MacroCall::cast(node.as_node()?.clone())?;
     let path = macro_call.path()?;
     let name_ref = path.segment()?.name_ref()?;
 
@@ -141,12 +139,12 @@ fn highlight_macro(node: InFile<SyntaxElement>) -> Option<TextRange> {
 fn highlight_token_tree(
     sema: &Semantics<RootDatabase>,
     bindings_shadow_count: &mut FxHashMap<Name, u32>,
-    token: InFile<SyntaxToken>,
+    token: SyntaxToken,
 ) -> Option<(&'static str, Option<u64>)> {
-    if token.value.parent().kind() != TOKEN_TREE {
+    if token.parent().kind() != TOKEN_TREE {
         return None;
     }
-    let token = sema.descend_into_macros(token.clone().value);
+    let token = sema.descend_into_macros(token.clone());
     let expanded = {
         let parent = token.parent();
         // We only care Name and Name_ref