2 files changed, 21 insertions, 1 deletions

diff --git a/crates/libeditor/src/scope.rs b/crates/libeditor/src/scope.rs
index 76104b2cf..3d398a74c 100644
--- a/crates/libeditor/src/scope.rs
+++ b/crates/libeditor/src/scope.rs
@@ -61,7 +61,19 @@ fn compute_expr_scopes(expr: ast::Expr, scopes: &mut FnScopes, scope: ScopeId) {
                 compute_block_scopes(block, scopes, scope);
             }
         }
-        // ForExpr(e) => TODO,
+        ast::Expr::ForExpr(e) => {
+            if let Some(expr) = e.iterable() {
+                compute_expr_scopes(expr, scopes, scope);
+            }
+            let mut scope = scope;
+            if let Some(pat) = e.pat() {
+                scope = scopes.new_scope(scope);
+                scopes.add_bindings(scope, pat);
+            }
+            if let Some(block) = e.body() {
+                compute_block_scopes(block, scopes, scope);
+            }
+        },
         _ => {
             expr.syntax().children()
                 .filter_map(ast::Expr::cast)
diff --git a/crates/libeditor/tests/test.rs b/crates/libeditor/tests/test.rs
index d051980b0..d8c24610d 100644
--- a/crates/libeditor/tests/test.rs
+++ b/crates/libeditor/tests/test.rs
@@ -286,6 +286,14 @@ fn quux() {
 }
 ", r#"[CompletionItem { name: "b" },
        CompletionItem { name: "a" }]"#);
+
+    do_check(r"
+fn quux() {
+    for x in &[1, 2, 3] {
+        <|>
+    }
+}
+", r#"[CompletionItem { name: "x" }]"#);
 }
 
 fn file(text: &str) -> File {