fix another bug

Author: giacomocavalieri

compiler-core/src/language_server/code_action.rs

@@ -8623,10 +8623,16 @@ impl<'a> ExtractFunction<'a> {
                 statements,
                 location: full_location,
             }) => {
-                let location = SrcSpan::new(
-                    statements.first().location().start,
-                    statements.last().location().end,
-                );
+                let location = statements
+                    .first()
+                    .location()
+                    .merge(&match &statements.last() {
+                        ast::Statement::Expression(expression) => expression.location(),
+                        ast::Statement::Assignment(assignment) => assignment.location,
+                        ast::Statement::Assert(assert) => assert.location,
+                        ast::Statement::Use(use_) => use_.call.location(),
+                    });
+
                 self.extract_code_in_tail_position(
                     *full_location,
                     location,
@@ -8966,7 +8972,12 @@ impl<'ast> ast::visit::Visit<'ast> for ExtractFunction<'ast> {
         statements: &'ast [TypedStatement],
     ) {
         let last_statement_location = self.last_statement_location;
-        self.last_statement_location = statements.last().map(|last| last.location());
+        self.last_statement_location = statements.last().map(|last| match last {
+            ast::Statement::Expression(_)
+            | ast::Statement::Assignment(_)
+            | ast::Statement::Assert(_) => last.location(),
+            ast::Statement::Use(use_) => last.location().merge(&use_.call.location()),
+        });
 
         ast::visit::visit_typed_expr_block(self, location, statements);
 

compiler-core/src/language_server/tests/action.rs

@@ -10590,3 +10590,50 @@ fn wobble(f: fn() -> Int) -> Float { 1.1 }
             .select_until(find_position_of("wobble"))
     );
 }
+
+#[test]
+fn extract_block_tail_position_3() {
+    assert_code_action!(
+        EXTRACT_FUNCTION,
+        r#"
+pub fn main() {
+  case 1 {
+    _ -> {
+      use <- wibble
+      123
+    }
+    _ -> todo
+  }
+}
+
+fn wibble(f: fn() -> Float) -> Float { f() }
+"#,
+        find_position_of("{")
+            .nth_occurrence(3)
+            .select_until(find_position_of("}"))
+    );
+}
+
+#[test]
+fn extract_block_tail_position_4() {
+    assert_code_action!(
+        EXTRACT_FUNCTION,
+        r#"
+pub fn main() {
+  case 1 {
+    _ -> {
+      use <- wibble
+      use <- wibble
+      123
+    }
+    _ -> todo
+  }
+}
+
+fn wibble(f: fn() -> Float) -> Float { f() }
+"#,
+        find_position_of("{")
+            .nth_occurrence(3)
+            .select_until(find_position_of("}"))
+    );
+}

compiler-core/src/language_server/tests/snapshots/gleam_core__language_server__tests__action__extract_block_tail_position_3.snap.new

@@ -0,0 +1,40 @@
+---
+source: compiler-core/src/language_server/tests/action.rs
+assertion_line: 10596
+expression: "\npub fn main() {\n  case 1 {\n    _ -> {\n      use <- wibble\n      123\n    }\n    _ -> todo\n  }\n}\n\nfn wibble(f: fn() -> Float) -> Float { f() }\n"
+snapshot_kind: text
+---
+----- BEFORE ACTION
+
+pub fn main() {
+  case 1 {
+    _ -> {
+         ▔
+      use <- wibble
+▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔
+      123
+▔▔▔▔▔▔▔▔▔
+    }
+▔▔▔▔↑
+    _ -> todo
+  }
+}
+
+fn wibble(f: fn() -> Float) -> Float { f() }
+
+
+----- AFTER ACTION
+
+pub fn main() {
+  case 1 {
+    _ -> function()
+    _ -> todo
+  }
+}
+
+fn function() -> Float {
+  use <- wibble
+      123
+}
+
+fn wibble(f: fn() -> Float) -> Float { f() }

compiler-core/src/language_server/tests/snapshots/gleam_core__language_server__tests__action__extract_block_tail_position_4.snap.new

@@ -0,0 +1,43 @@
+---
+source: compiler-core/src/language_server/tests/action.rs
+assertion_line: 10619
+expression: "\npub fn main() {\n  case 1 {\n    _ -> {\n      use <- wibble\n      use <- wibble\n      123\n    }\n    _ -> todo\n  }\n}\n\nfn wibble(f: fn() -> Float) -> Float { f() }\n"
+snapshot_kind: text
+---
+----- BEFORE ACTION
+
+pub fn main() {
+  case 1 {
+    _ -> {
+         ▔
+      use <- wibble
+▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔
+      use <- wibble
+▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔
+      123
+▔▔▔▔▔▔▔▔▔
+    }
+▔▔▔▔↑
+    _ -> todo
+  }
+}
+
+fn wibble(f: fn() -> Float) -> Float { f() }
+
+
+----- AFTER ACTION
+
+pub fn main() {
+  case 1 {
+    _ -> function()
+    _ -> todo
+  }
+}
+
+fn function() -> Float {
+  use <- wibble
+      use <- wibble
+      123
+}
+
+fn wibble(f: fn() -> Float) -> Float { f() }

compiler-core/src/language_server/tests/snapshots/gleam_core__language_server__tests__action__extract_use_in_tail_position_3.snap.new

@@ -0,0 +1,39 @@
+---
+source: compiler-core/src/language_server/tests/action.rs
+assertion_line: 10596
+expression: "\npub fn main() {\n  case 1 {\n    _ -> {\n      use <- wibble\n      123\n    }\n    _ -> todo\n  }\n}\n\nfn wibble(f: fn() -> Float) -> Float { f() }\n"
+snapshot_kind: text
+---
+----- BEFORE ACTION
+
+pub fn main() {
+  case 1 {
+    _ -> {
+         ▔
+      use <- wibble
+▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔
+      123
+▔▔▔▔▔▔▔▔▔
+    }
+▔▔▔▔↑
+    _ -> todo
+  }
+}
+
+fn wibble(f: fn() -> Float) -> Float { f() }
+
+
+----- AFTER ACTION
+
+pub fn main() {
+  case 1 {
+    _ -> function()
+    _ -> todo
+  }
+}
+
+fn function() -> Float {
+  use <- wibble
+}
+
+fn wibble(f: fn() -> Float) -> Float { f() }