+38 -9

language-server/src/code_action.rs

View file Reviewed

··· 7833 7833 ) { 7834 7834 let pipeline_range = self.edits.src_span_to_lsp_range(*location); 7835 7835 if within(self.params.range, pipeline_range) { 7836 7836 - // We will always desugar the pipeline's first step. If there's no 7837 7837 - // intermediate assignment it means we're dealing with a single step 7838 7838 - // pipeline and the call is `finally`. 7839 7839 - let (call, call_kind) = assignments 7840 7840 - .first() 7836 7836 + // Add final assignment to the list 7837 7837 + let all_assignments = assignments 7838 7838 + .iter() 7841 7839 .map(|(call, kind)| (call.location, *kind)) 7842 7842 - .unwrap_or_else(|| (finally.location(), *finally_kind)); 7840 7840 + .chain(iter::once((finally.location(), *finally_kind))); 7841 7841 + let mut call_information = None; 7842 7842 + // Span, containing content that will be extracted as call argument 7843 7843 + let mut accumulated_span = first_value.location; 7844 7844 + 7845 7845 + for (current_location, current_kind) in all_assignments { 7846 7846 + if within( 7847 7847 + self.params.range, 7848 7848 + self.edits.src_span_to_lsp_range(current_location), 7849 7849 + ) { 7850 7850 + call_information = Some((accumulated_span, current_location, current_kind)); 7851 7851 + break; 7852 7852 + } 7853 7853 + accumulated_span = accumulated_span.merge(&current_location); 7854 7854 + } 7855 7855 + 7856 7856 + let (final_prev, final_call, final_kind) = match call_information { 7857 7857 + Some(triple) => triple, 7858 7858 + 7859 7859 + // Here two situations are possible: 7860 7860 + // - If the cursor is not on any of the assignments (for example, it is on first value), then we need 7861 7861 + // to use that first value as accumulated location, and the first call location and kind 7862 7862 + // - If there are no assignments, then we are dealing with a single 7863 7863 + // step pipeline and the call is `finally` 7864 7864 + None => { 7865 7865 + let (call, call_kind) = &assignments 7866 7866 + .first() 7867 7867 + .map(|(call, call_kind)| (call.location, *call_kind)) 7868 7868 + .unwrap_or_else(|| (finally.location(), *finally_kind)); 7869 7869 + (first_value.location, *call, *call_kind) 7870 7870 + } 7871 7871 + }; 7843 7872 7844 7873 self.locations = Some(ConvertToFunctionCallLocations { 7845 7845 - first_value: first_value.location, 7846 7846 - call, 7847 7847 - call_kind, 7874 7874 + first_value: final_prev, 7875 7875 + call: final_call, 7876 7876 + call_kind: final_kind, 7848 7877 }); 7849 7878 7850 7879 ast::visit::visit_typed_expr_pipeline(

+3 -3

language-server/src/tests/snapshots/gleam_language_server__tests__action__convert_to_function_call_on_last_step.snap

View file Reviewed

··· 14 14 15 15 ----- AFTER ACTION 16 16 fn go() { 17 17 - echo [1, 2, 3] 18 18 - |> wibble 19 19 - |> wobble 17 17 + wobble([1, 2, 3] 18 18 + |> echo 19 19 + |> wibble) 20 20 }

+1 -1

language-server/src/tests/snapshots/gleam_language_server__tests__action__convert_to_function_call_on_last_step_single_line.snap

View file Reviewed

··· 11 11 12 12 ----- AFTER ACTION 13 13 fn go() { 14 14 - echo [1, 2, 3] |> wibble |> wobble 14 14 + wobble([1, 2, 3] |> echo |> wibble) 15 15 }

+2 -2

language-server/src/tests/snapshots/gleam_language_server__tests__action__convert_to_function_call_on_second_step.snap

View file Reviewed

··· 14 14 15 15 ----- AFTER ACTION 16 16 fn go() { 17 17 - echo [1, 2, 3] 18 18 - |> wibble 17 17 + wibble([1, 2, 3] 18 18 + |> echo) 19 19 |> wobble 20 20 }

+1 -1

language-server/src/tests/snapshots/gleam_language_server__tests__action__convert_to_function_call_on_second_step_single_line.snap

View file Reviewed

··· 11 11 12 12 ----- AFTER ACTION 13 13 fn go() { 14 14 - echo [1, 2, 3] |> wibble |> wobble 14 14 + wibble([1, 2, 3] |> echo) |> wobble 15 15 }