From 15f15d92eb4d6ab791047eefbd6dd9b2baba1140 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Tue, 28 Aug 2018 23:59:57 +0300
Subject: add impl works with lifetimes

---
 crates/libeditor/src/code_actions.rs   |  9 +++-
 crates/libeditor/src/scope/fn_scope.rs | 83 ++++++++++++++++++++++++++++++----
 2 files changed, 83 insertions(+), 9 deletions(-)

(limited to 'crates/libeditor/src')

diff --git a/crates/libeditor/src/code_actions.rs b/crates/libeditor/src/code_actions.rs
index 684b8243a..08a85f6e2 100644
--- a/crates/libeditor/src/code_actions.rs
+++ b/crates/libeditor/src/code_actions.rs
@@ -80,7 +80,9 @@ pub fn add_impl<'a>(file: &'a File, offset: TextUnit) -> Option<impl FnOnce() ->
         buf.push_str(" ");
         buf.push_str(name.text().as_str());
         if let Some(type_params) = type_params {
-            join(type_params.type_params().filter_map(|it| it.name()).map(|it| it.text()))
+            let lifetime_params = type_params.lifetime_params().filter_map(|it| it.lifetime()).map(|it| it.text());
+            let type_params = type_params.type_params().filter_map(|it| it.name()).map(|it| it.text());
+            join(lifetime_params.chain(type_params))
                 .surround_with("<", ">")
                 .to_buf(&mut buf);
         }
@@ -146,6 +148,11 @@ mod tests {
             "struct Foo<T: Clone> {}\n\nimpl<T: Clone> Foo<T> {\n<|>\n}",
             |file, off| add_impl(file, off).map(|f| f()),
         );
+        check_action(
+            "struct Foo<'a, T: Foo<'a>> {<|>}",
+            "struct Foo<'a, T: Foo<'a>> {}\n\nimpl<'a, T: Foo<'a>> Foo<'a, T> {\n<|>\n}",
+            |file, off| add_impl(file, off).map(|f| f()),
+        );
     }
 
 }
diff --git a/crates/libeditor/src/scope/fn_scope.rs b/crates/libeditor/src/scope/fn_scope.rs
index e807c6c71..a38647c43 100644
--- a/crates/libeditor/src/scope/fn_scope.rs
+++ b/crates/libeditor/src/scope/fn_scope.rs
@@ -24,11 +24,7 @@ impl FnScopes {
             scope_for: HashMap::new()
         };
         let root = scopes.root_scope();
-        fn_def.param_list().into_iter()
-            .flat_map(|it| it.params())
-            .filter_map(|it| it.pat())
-            .for_each(|it| scopes.add_bindings(root, it));
-
+        scopes.add_params_bindings(root, fn_def.param_list());
         if let Some(body) = fn_def.body() {
             compute_block_scopes(body, &mut scopes, root)
         }
@@ -56,6 +52,12 @@ impl FnScopes {
             .filter_map(ScopeEntry::new);
         self.scopes[scope].entries.extend(entries);
     }
+    fn add_params_bindings(&mut self, scope: ScopeId, params: Option<ast::ParamList>) {
+        params.into_iter()
+            .flat_map(|it| it.params())
+            .filter_map(|it| it.pat())
+            .for_each(|it| self.add_bindings(scope, it));
+    }
     fn set_scope(&mut self, node: SyntaxNodeRef, scope: ScopeId) {
         self.scope_for.insert(node.owned(), scope);
     }
@@ -102,13 +104,14 @@ fn compute_block_scopes(block: ast::Block, scopes: &mut FnScopes, mut scope: Sco
     for stmt in block.statements() {
         match stmt {
             ast::Stmt::LetStmt(stmt) => {
+                if let Some(expr) = stmt.initializer() {
+                    scopes.set_scope(expr.syntax(), scope);
+                    compute_expr_scopes(expr, scopes, scope);
+                }
                 scope = scopes.new_scope(scope);
                 if let Some(pat) = stmt.pat() {
                     scopes.add_bindings(scope, pat);
                 }
-                if let Some(expr) = stmt.initializer() {
-                    scopes.set_scope(expr.syntax(), scope)
-                }
             }
             ast::Stmt::ExprStmt(expr_stmt) => {
                 if let Some(expr) = expr_stmt.expr() {
@@ -163,6 +166,20 @@ fn compute_expr_scopes(expr: ast::Expr, scopes: &mut FnScopes, scope: ScopeId) {
                 compute_block_scopes(block, scopes, scope);
             }
         },
+        ast::Expr::LambdaExpr(e) => {
+            let mut scope = scopes.new_scope(scope);
+            scopes.add_params_bindings(scope, e.param_list());
+            if let Some(body) = e.body() {
+                scopes.set_scope(body.syntax(), scope);
+                compute_expr_scopes(body, scopes, scope);
+            }
+        }
+        ast::Expr::CallExpr(e) => {
+            e.arg_list().into_iter()
+                .flat_map(|it| it.args())
+                .chain(e.expr())
+                .for_each(|expr| compute_expr_scopes(expr, scopes, scope));
+        }
         _ => {
             expr.syntax().children()
                 .filter_map(ast::Expr::cast)
@@ -189,3 +206,53 @@ struct ScopeData {
     parent: Option<ScopeId>,
     entries: Vec<ScopeEntry>
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use libsyntax2::File;
+    use {find_node_at_offset, test_utils::extract_offset};
+
+    fn do_check(code: &str, expected: &[&str]) {
+        let (off, code) = extract_offset(code);
+        let code = {
+            let mut buf = String::new();
+            let off = u32::from(off) as usize;
+            buf.push_str(&code[..off]);
+            buf.push_str("marker");
+            buf.push_str(&code[off..]);
+            buf
+        };
+        let file = File::parse(&code);
+        let marker: ast::PathExpr = find_node_at_offset(file.syntax(), off).unwrap();
+        let fn_def: ast::FnDef = find_node_at_offset(file.syntax(), off).unwrap();
+        let scopes = FnScopes::new(fn_def);
+        let actual = scopes.scope_chain(marker.syntax())
+            .flat_map(|scope| scopes.entries(scope))
+            .map(|it| it.name())
+            .collect::<Vec<_>>();
+        assert_eq!(expected, actual.as_slice());
+    }
+
+    #[test]
+    fn test_lambda_scope() {
+        do_check(r"
+            fn quux(foo: i32) {
+                let f = |bar| {
+                    <|>
+                };
+            }",
+            &["bar", "foo"],
+        );
+    }
+
+    #[test]
+    fn test_call_scope() {
+        do_check(r"
+            fn quux() {
+                f(|x| <|> );
+            }",
+            &["x"],
+        );
+    }
+}
-- 
cgit v1.2.3