From 6bca91af532d79abbced5b151cb4188ff8625c04 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Tue, 8 Jan 2019 22:30:56 +0300
Subject: rename ra_analysis -> ra_ide_api

---
 crates/ra_analysis/src/syntax_highlighting.rs | 92 ---------------------------
 1 file changed, 92 deletions(-)
 delete mode 100644 crates/ra_analysis/src/syntax_highlighting.rs

(limited to 'crates/ra_analysis/src/syntax_highlighting.rs')

diff --git a/crates/ra_analysis/src/syntax_highlighting.rs b/crates/ra_analysis/src/syntax_highlighting.rs
deleted file mode 100644
index cb19e9515..000000000
--- a/crates/ra_analysis/src/syntax_highlighting.rs
+++ /dev/null
@@ -1,92 +0,0 @@
-use ra_syntax::{ast, AstNode,};
-use ra_db::SyntaxDatabase;
-
-use crate::{
-    FileId, Cancelable, HighlightedRange,
-    db::RootDatabase,
-};
-
-pub(crate) fn highlight(db: &RootDatabase, file_id: FileId) -> Cancelable<Vec<HighlightedRange>> {
-    let source_file = db.source_file(file_id);
-    let mut res = ra_ide_api_light::highlight(source_file.syntax());
-    for macro_call in source_file
-        .syntax()
-        .descendants()
-        .filter_map(ast::MacroCall::cast)
-    {
-        if let Some((off, exp)) = hir::MacroDef::ast_expand(macro_call) {
-            let mapped_ranges = ra_ide_api_light::highlight(&exp.syntax())
-                .into_iter()
-                .filter_map(|r| {
-                    let mapped_range = exp.map_range_back(r.range)?;
-                    let res = HighlightedRange {
-                        range: mapped_range + off,
-                        tag: r.tag,
-                    };
-                    Some(res)
-                });
-            res.extend(mapped_ranges);
-        }
-    }
-    Ok(res)
-}
-
-#[cfg(test)]
-mod tests {
-    use crate::mock_analysis::single_file;
-    use test_utils::assert_eq_dbg;
-
-    #[test]
-    fn highlights_code_inside_macros() {
-        let (analysis, file_id) = single_file(
-            "
-            fn main() {
-                ctry!({ let x = 92; x});
-                vec![{ let x = 92; x}];
-            }
-            ",
-        );
-        let highlights = analysis.highlight(file_id).unwrap();
-        assert_eq_dbg(
-            r#"[HighlightedRange { range: [13; 15), tag: "keyword" },
-                HighlightedRange { range: [16; 20), tag: "function" },
-                HighlightedRange { range: [41; 46), tag: "macro" },
-                HighlightedRange { range: [49; 52), tag: "keyword" },
-                HighlightedRange { range: [57; 59), tag: "literal" },
-                HighlightedRange { range: [82; 86), tag: "macro" },
-                HighlightedRange { range: [89; 92), tag: "keyword" },
-                HighlightedRange { range: [97; 99), tag: "literal" },
-                HighlightedRange { range: [49; 52), tag: "keyword" },
-                HighlightedRange { range: [53; 54), tag: "function" },
-                HighlightedRange { range: [57; 59), tag: "literal" },
-                HighlightedRange { range: [61; 62), tag: "text" },
-                HighlightedRange { range: [89; 92), tag: "keyword" },
-                HighlightedRange { range: [93; 94), tag: "function" },
-                HighlightedRange { range: [97; 99), tag: "literal" },
-                HighlightedRange { range: [101; 102), tag: "text" }]"#,
-            &highlights,
-        )
-    }
-
-    // FIXME: this test is not really necessary: artifact of the inital hacky
-    // macros implementation.
-    #[test]
-    fn highlight_query_group_macro() {
-        let (analysis, file_id) = single_file(
-            "
-            salsa::query_group! {
-                pub trait HirDatabase: SyntaxDatabase {}
-            }
-            ",
-        );
-        let highlights = analysis.highlight(file_id).unwrap();
-        assert_eq_dbg(
-            r#"[HighlightedRange { range: [20; 32), tag: "macro" },
-                HighlightedRange { range: [13; 18), tag: "text" },
-                HighlightedRange { range: [51; 54), tag: "keyword" },
-                HighlightedRange { range: [55; 60), tag: "keyword" },
-                HighlightedRange { range: [61; 72), tag: "function" }]"#,
-            &highlights,
-        )
-    }
-}
-- 
cgit v1.2.3