Skip to content

Ammend more consistent naming using CharSequence instead of String #1073

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Ammend more consistent naming using CharSequence instead of String #1073

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
13 changes: 9 additions & 4 deletions handlebars/src/main/java/com/github/jknack/handlebars/internal/Variable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,12 +225,17 @@ protected void collect(final Collection<String> result, final TagType tagType) {
*/
protected CharSequence formatAndEscape(final Object value, final Formatter.Chain formatter) {
Object formatted = formatter.format(value);
CharSequence formattedString = formatted.toString();
CharSequence formattedCharSequence;
if (value instanceof CharSequence) {
formattedCharSequence = (CharSequence) value;
} else {
formattedCharSequence = formatted.toString();
}
if (formatted instanceof Handlebars.SafeString) {
return formattedString;
return formattedCharSequence;
}
CharSequence escapedString = escapingStrategy.escape(formattedString);
return escapedString;
CharSequence escapedCharSequence = escapingStrategy.escape(formattedCharSequence);
return escapedCharSequence;
}

@Override
Expand Down