Skip to content

Handle escaped backslashes correctly when wrapping long strings. #1314

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

Open
jkrinke wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Handle escaped backslashes correctly when wrapping long strings. #1314

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
9 changes: 8 additions & 1 deletion core/src/main/java/com/google/googlejavaformat/java/StringWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ private static ImmutableList<String> stringComponents(
// continue below
} else if (hasEscapedWhitespaceAt(text, idx) != -1) {
// continue below
} else if (hasEscapedNewlineAt(text, idx) != -1) {
} else if (hasEscapedNewlineAt(text, idx) != -1 || hasEscapedBackslashAt(text, idx) != -1) {
int length;
while ((length = hasEscapedNewlineAt(text, idx)) != -1) {
idx += length;
Expand All @@ -302,6 +302,13 @@ private static ImmutableList<String> stringComponents(
return result.build();
}

static int hasEscapedBackslashAt(String input, int idx) {
if (input.startsWith("\\\\", idx)) {
return 2;
}
return -1;
}

static int hasEscapedWhitespaceAt(String input, int idx) {
if (input.startsWith("\\t", idx)) {
return 2;
Expand Down