Skip to content

fix: join lines doesn't add space before closing quote #8779

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 9, 2021
Merged

fix: join lines doesn't add space before closing quote #8779

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 32 additions & 9 deletions crates/ide/src/join_lines.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,15 @@ fn remove_newlines(edit: &mut TextEditBuilder, token: &SyntaxToken, range: TextR

fn remove_newline(edit: &mut TextEditBuilder, token: &SyntaxToken, offset: TextSize) {
if token.kind() != WHITESPACE || token.text().bytes().filter(|&b| b == b'\n').count() != 1 {
let mut string_open_quote = false;
let mut no_space = false;
if let Some(string) = ast::String::cast(token.clone()) {
if let Some(range) = string.open_quote_text_range() {
cov_mark::hit!(join_string_literal);
string_open_quote = range.end() == offset;
cov_mark::hit!(join_string_literal_open_quote);
no_space |= range.end() == offset;
}
if let Some(range) = string.close_quote_text_range() {
cov_mark::hit!(join_string_literal_close_quote);
no_space |= range.start() == offset + TextSize::of('\n');
}
}

Expand All @@ -82,7 +86,7 @@ fn remove_newline(edit: &mut TextEditBuilder, token: &SyntaxToken, offset: TextS
};

let range = TextRange::at(offset, ((n_spaces_after_line_break + 1) as u32).into());
let replace_with = if string_open_quote { "" } else { " " };
let replace_with = if no_space { "" } else { " " };
edit.replace(range, replace_with.to_string());
return;
}
Expand Down Expand Up @@ -797,22 +801,41 @@ fn foo() {

#[test]
fn join_string_literal() {
cov_mark::check!(join_string_literal);
check_join_lines(
r#"
{
cov_mark::check!(join_string_literal_open_quote);
check_join_lines(
r#"
fn main() {
$0"
hello
";
}
"#,
r#"
r#"
fn main() {
$0"hello
";
}
"#,
);
);
}

{
cov_mark::check!(join_string_literal_close_quote);
check_join_lines(
r#"
fn main() {
$0"hello
";
}
"#,
r#"
fn main() {
$0"hello";
}
"#,
);
}

check_join_lines(
r#"
Expand Down