Move FunctionSignature creation to display

1 files changed, 49 insertions, 0 deletions

diff --git a/crates/ra_ide_api/src/display.rs b/crates/ra_ide_api/src/display.rs
index 9d9d2097f..e01635460 100644
--- a/crates/ra_ide_api/src/display.rs
+++ b/crates/ra_ide_api/src/display.rs
@@ -3,6 +3,8 @@
 use super::*;

 use std::fmt::{self, Display};

 use join_to_string::join;

+use ra_syntax::ast::{self, AstNode, NameOwner, VisibilityOwner, TypeParamsOwner};

+use std::convert::From;

 

 /// Contains information about a function signature

 #[derive(Debug)]

@@ -30,6 +32,36 @@ impl FunctionSignature {
     }

 }

 

+impl From<&'_ ast::FnDef> for FunctionSignature {

+    fn from(node: &ast::FnDef) -> FunctionSignature {

+        fn param_list(node: &ast::FnDef) -> Vec<String> {

+            let mut res = vec![];

+            if let Some(param_list) = node.param_list() {

+                if let Some(self_param) = param_list.self_param() {

+                    res.push(self_param.syntax().text().to_string())

+                }

+

+                res.extend(param_list.params().map(|param| param.syntax().text().to_string()));

+            }

+            res

+        }

+

+        FunctionSignature {

+            visibility: node.visibility().map(|n| n.syntax().text().to_string()),

+            name: node.name().map(|n| n.text().to_string()),

+            ret_type: node

+                .ret_type()

+                .and_then(|r| r.type_ref())

+                .map(|n| n.syntax().text().to_string()),

+            parameters: param_list(node),

+            generic_parameters: generic_parameters(node),

+            where_predicates: where_predicates(node),

+            // docs are processed separately

+            doc: None,

+        }

+    }

+}

+

 impl Display for FunctionSignature {

     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {

         if let Some(t) = &self.visibility {

@@ -61,3 +93,20 @@ impl Display for FunctionSignature {
         Ok(())

     }

 }

+

+pub(crate) fn generic_parameters<N: TypeParamsOwner>(node: &N) -> Vec<String> {

+    let mut res = vec![];

+    if let Some(type_params) = node.type_param_list() {

+        res.extend(type_params.lifetime_params().map(|p| p.syntax().text().to_string()));

+        res.extend(type_params.type_params().map(|p| p.syntax().text().to_string()));

+    }

+    res

+}

+

+pub(crate) fn where_predicates<N: TypeParamsOwner>(node: &N) -> Vec<String> {

+    let mut res = vec![];

+    if let Some(clause) = node.where_clause() {

+        res.extend(clause.predicates().map(|p| p.syntax().text().to_string()));

+    }

+    res

+}