Extract into function assist sometimes strips comments

[jplatte]

I tried:

pub fn hello() {
    for _ in 0..1 {
        // Extract the following condition with this comment
        if true {
            continue;
        }

        if false {
            break;
        }
    }
}

and got

use std::ops::ControlFlow;

pub fn hello() {
    for _ in 0..1 {
        if let ControlFlow::Break(_) = fun_name() {
            continue;
        }

        if false {
            break;
        }
    }
}

fn fun_name() -> ControlFlow<()> {
    if true {
        return ControlFlow::Break(());
    }
    ControlFlow::Continue(())
}

when it should have been

use std::ops::ControlFlow;

pub fn hello() {
    for _ in 0..1 {
        if let ControlFlow::Break(_) = fun_name() {
            continue;
        }

        if false {
            break;
        }
    }
}

fn fun_name() -> ControlFlow<()> {
    // Extract the following condition with this comment
    if true {
        return ControlFlow::Break(());
    }
    ControlFlow::Continue(())
}

See also #13620 which is potentially related.

rust-analyzer version: rust-analyzer version: 0.4.1286-standalone

rustc version: rustc 1.65.0 (897e37553 2022-11-02)

relevant settings: -

[feniljain]

Hey @jplatte 👋

I was exploring this issue and trying to replicate it, but when I tried:

pub fn hello() {
    for _ in 0..1 {
        $0// Extract the following condition with this comment
        if true {
            continue;
        }$0

        if false {
            break;
        }
    }
}

with this selection I couldn't find any code actions available, same when I added this as a test case, code action of extract_function was not applicable, am I missing something here? Would appreciate some help in repoducing the bug

[jplatte]

Here's a failing test case: #13692

[feniljain]

Heyo 👋,

Thanks for the failing test case, I see the difference between mine and yours was I had for loop while you directly used loop( mine too started working after this change, also interesting to see why ).

I see you created a draft PR, so I would guess you are already working it? Lemme know if that's not the case, I will pick it up then only :)

[jplatte]

I just made it a PR so it's archived in a nice way (PRs survive deletion of the branch or even the whole repo). I'm not working on it.

[feniljain]

Makes sense, thanks for the clarification! 🙇

[jplatte]

The previously failing test was included on #13746 and passes now, so I'll close this.