1 files changed, 4 insertions, 62 deletions

diff --git a/crates/ra_editor/src/lib.rs b/crates/ra_editor/src/lib.rs
index a65637d52..b03f9ea54 100644
--- a/crates/ra_editor/src/lib.rs
+++ b/crates/ra_editor/src/lib.rs
@@ -22,7 +22,7 @@ pub use self::{
 use ra_text_edit::{TextEdit, TextEditBuilder};
 use ra_syntax::{
     algo::find_leaf_at_offset,
-    ast::{self, AstNode, NameOwner},
+    ast::{self, AstNode},
     SourceFileNode,
     SyntaxKind::{self, *},
     SyntaxNodeRef, TextRange, TextUnit, Direction,
@@ -49,18 +49,6 @@ pub struct Diagnostic {
     pub fix: Option<LocalEdit>,
 }
 
-#[derive(Debug)]
-pub struct Runnable {
-    pub range: TextRange,
-    pub kind: RunnableKind,
-}
-
-#[derive(Debug)]
-pub enum RunnableKind {
-    Test { name: String },
-    Bin,
-}
-
 pub fn matching_brace(file: &SourceFileNode, offset: TextUnit) -> Option<TextUnit> {
     const BRACES: &[SyntaxKind] = &[
         L_CURLY, R_CURLY, L_BRACK, R_BRACK, L_PAREN, R_PAREN, L_ANGLE, R_ANGLE,
@@ -79,11 +67,11 @@ pub fn matching_brace(file: &SourceFileNode, offset: TextUnit) -> Option<TextUni
     Some(matching_node.range().start())
 }
 
-pub fn highlight(file: &SourceFileNode) -> Vec<HighlightedRange> {
+pub fn highlight(root: SyntaxNodeRef) -> Vec<HighlightedRange> {
     // Visited nodes to handle highlighting priorities
     let mut highlighted = FxHashSet::default();
     let mut res = Vec::new();
-    for node in file.syntax().descendants() {
+    for node in root.descendants() {
         if highlighted.contains(&node) {
             continue;
         }
@@ -133,29 +121,6 @@ pub fn syntax_tree(file: &SourceFileNode) -> String {
     ::ra_syntax::utils::dump_tree(file.syntax())
 }
 
-pub fn runnables(file: &SourceFileNode) -> Vec<Runnable> {
-    file.syntax()
-        .descendants()
-        .filter_map(ast::FnDef::cast)
-        .filter_map(|f| {
-            let name = f.name()?.text();
-            let kind = if name == "main" {
-                RunnableKind::Bin
-            } else if f.has_atom_attr("test") {
-                RunnableKind::Test {
-                    name: name.to_string(),
-                }
-            } else {
-                return None;
-            };
-            Some(Runnable {
-                range: f.syntax().range(),
-                kind,
-            })
-        })
-        .collect()
-}
-
 pub fn find_node_at_offset<'a, N: AstNode<'a>>(
     syntax: SyntaxNodeRef<'a>,
     offset: TextUnit,
@@ -178,7 +143,7 @@ fn main() {}
     println!("Hello, {}!", 92);
 "#,
         );
-        let hls = highlight(&file);
+        let hls = highlight(file.syntax());
         assert_eq_dbg(
             r#"[HighlightedRange { range: [1; 11), tag: "comment" },
                 HighlightedRange { range: [12; 14), tag: "keyword" },
@@ -191,29 +156,6 @@ fn main() {}
     }
 
     #[test]
-    fn test_runnables() {
-        let file = SourceFileNode::parse(
-            r#"
-fn main() {}
-
-#[test]
-fn test_foo() {}
-
-#[test]
-#[ignore]
-fn test_foo() {}
-"#,
-        );
-        let runnables = runnables(&file);
-        assert_eq_dbg(
-            r#"[Runnable { range: [1; 13), kind: Bin },
-                Runnable { range: [15; 39), kind: Test { name: "test_foo" } },
-                Runnable { range: [41; 75), kind: Test { name: "test_foo" } }]"#,
-            &runnables,
-        )
-    }
-
-    #[test]
     fn test_matching_brace() {
         fn do_check(before: &str, after: &str) {
             let (pos, before) = extract_offset(before);