diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-01-20 11:08:00 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-01-20 11:08:00 +0000 |
| commit | b28c903b18d8bd9b2010d6e3466d4f903fa0ba67 (patch) | |
| tree | c73e213a5a1a2b7a344d7f5860edfd9531dfb65d /crates/ide/src/join_lines.rs | |
| parent | 63f509f4924e7448b9131514bbdd7a4da5292cd1 (diff) | |
| parent | 3429b32ad119756985e1a7bfa5e9e53042671f8b (diff) | |
Merge #7355
7355: :arrow_up: rowan r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ide/src/join_lines.rs')
| -rw-r--r-- | crates/ide/src/join_lines.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/ide/src/join_lines.rs b/crates/ide/src/join_lines.rs index 981467c8d..631bde0f1 100644 --- a/crates/ide/src/join_lines.rs +++ b/crates/ide/src/join_lines.rs | |||
| @@ -59,7 +59,7 @@ fn remove_newline(edit: &mut TextEditBuilder, token: &SyntaxToken, offset: TextS | |||
| 59 | // The node is either the first or the last in the file | 59 | // The node is either the first or the last in the file |
| 60 | let suff = &token.text()[TextRange::new( | 60 | let suff = &token.text()[TextRange::new( |
| 61 | offset - token.text_range().start() + TextSize::of('\n'), | 61 | offset - token.text_range().start() + TextSize::of('\n'), |
| 62 | TextSize::of(token.text().as_str()), | 62 | TextSize::of(token.text()), |
| 63 | )]; | 63 | )]; |
| 64 | let spaces = suff.bytes().take_while(|&b| b == b' ').count(); | 64 | let spaces = suff.bytes().take_while(|&b| b == b' ').count(); |
| 65 | 65 | ||