luckyimnotanigger/HeliBoard
1
0
Fork 0
mirror of https://github.com/Helium314/HeliBoard.git synced 2025-05-16 23:12:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix isInsideDoubleQuoteOrAfterDigit not determining inside quote status correctly

Browse source 
happened because only quotes followed or preceded by space can be identified correctly

previously unclear quotes, e.g. followed by comma, were ignored
now the number of ignored quotes is counted and taken into account

fixes ##230
This commit is contained in:
Helium314 2023-10-24 01:06:34 +02:00
parent f1de1a6410
commit c7a8548921
3 changed files with 22 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
app/src/main/java/org/dslul/openboard/inputmethod/latin/common/StringUtils.java
View file

@ -500,6 +500,9 @@ public final class StringUtils {
* double quote character, and looking at whether it's followed by whitespace. If so, that
* was a closing quotation mark, so we're not inside a double quote. If it's not followed
* by whitespace, then it was an opening quotation mark, and we're inside a quotation.
* However, on the way to the double quote we can determine, some double quotes might be
* ignored, e.g. because they are followed by punctuation. These double quotes are counted and
* taken into account.
*
* @param text the text to examine.
* @return whether we're inside a double quote.
@ -514,26 +517,33 @@ public final class StringUtils {
return true;
}
int prevCodePoint = 0;
int ignoredDoubleQuoteCount = 0;
while (i > 0) {
codePoint = Character.codePointBefore(text, i);
if (Constants.CODE_DOUBLE_QUOTE == codePoint) {
// If we see a double quote followed by whitespace, then that
// was a closing quote.
if (Character.isWhitespace(prevCodePoint)) {
return false;
return ignoredDoubleQuoteCount % 2 == 1;
}
}
if (Character.isWhitespace(codePoint) && Constants.CODE_DOUBLE_QUOTE == prevCodePoint) {
// If we see a double quote preceded by whitespace, then that
// was an opening quote. No need to continue seeking.
return true;
return ignoredDoubleQuoteCount % 2 == 0;
}
if (Constants.CODE_DOUBLE_QUOTE == prevCodePoint) {
ignoredDoubleQuoteCount++;
}
i -= Character.charCount(codePoint);
prevCodePoint = codePoint;
}
// We reached the start of text. If the first char is a double quote, then we're inside
// a double quote. Otherwise we're not.
return Constants.CODE_DOUBLE_QUOTE == codePoint;
if (ignoredDoubleQuoteCount % 2 == 0)
return Constants.CODE_DOUBLE_QUOTE == codePoint;
else
return Constants.CODE_DOUBLE_QUOTE != codePoint;
}
public static boolean isEmptyStringOrWhiteSpaces(@NonNull final String s) {