Skip to content
Open
Changes from all commits
Commits
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
12 changes: 7 additions & 5 deletions src/main/java/io/github/getify/minify/Minify.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
public abstract class Minify {

private static final String TOKENIZER = "\"|(/\\*)|(\\*/)|(//)|\\n|\\r";
private static final String MAGIC = "(\\\\)*$";
private static final String LOOKBEHIND = "(\\\\)+$";
private static final Pattern PATTERN = Pattern.compile(TOKENIZER);
private static final Pattern MAGIC_PATTERN = Pattern.compile(MAGIC);
private static final Pattern LOOKBEHIND_PATTERN = Pattern.compile(LOOKBEHIND);

/**
*
Expand All @@ -38,6 +38,7 @@ public static String minify(CharSequence json) {
String tmp2;
StringBuilder new_str = new StringBuilder();
Integer from = 0;
Integer prevFrom;
String lc;
String rc = "";

Expand All @@ -52,21 +53,22 @@ public static String minify(CharSequence json) {
matcher.reset();

while (matcher.find()) {
lc = jsonString.substring(0, matcher.start());
prevFrom = from;
lc = jsonString.substring(prevFrom, matcher.start());
rc = jsonString.substring(matcher.end(), jsonString.length());
tmp = jsonString.substring(matcher.start(), matcher.end());

if (!in_multiline_comment && !in_singleline_comment) {
tmp2 = lc.substring(from);
if (!in_string)
tmp2 = tmp2.replaceAll("(\\n|\\r|\\s)*", "");
tmp2 = tmp2.replaceAll("(\\n|\\r|\\s)+", "");

new_str.append(tmp2);
}
from = matcher.end();

if (tmp.charAt(0) == '\"' && !in_multiline_comment && !in_singleline_comment) {
magicMatcher = MAGIC_PATTERN.matcher(lc);
magicMatcher = LOOKBEHIND_PATTERN.matcher(lc);
foundMagic = magicMatcher.find();
if (!in_string || !foundMagic || (magicMatcher.end() - magicMatcher.start()) % 2 == 0) {
in_string = !in_string;
Expand Down