Fix #75: CSS issue compressing complex calcs

src/main/java/org/primefaces/extensions/optimizerplugin/optimizer/CssCompressor.java

@@ -549,15 +549,15 @@ public void compress(Writer out, int linebreakpos) throws IOException {
 		// https://developer.mozilla.org/en-US/docs/Web/CSS/calc
 		// Added by Eric Arnol-Martin ([email protected])
 		sb = new StringBuilder();
-		p = Pattern.compile("calc\\([^\\)]*\\)");
+		p = Pattern.compile("calc\\([^;]*\\)");
 		m = p.matcher(css);
 		while (m.find()) {
 			String s = m.group();
 			s = s.replaceAll("\\s+", "");
-			s = s.replaceAll("(?<=[-|%|px|em|rem|vw|\\d])\\+", " + ");
-			s = s.replaceAll("(?<=[-|%|px|em|rem|vw|\\d])\\-", " - ");
-			s = s.replaceAll("(?<=[-|%|px|em|rem|vw|\\d])\\*", " * ");
-			s = s.replaceAll("(?<=[-|%|px|em|rem|vw|\\d])\\/", " / ");
+			s = s.replaceAll("(?<=[-|%|)|px|em|rem|vw|\\d])\\+", " + ");
+			s = s.replaceAll("(?<=[-|%|)|px|em|rem|vw|\\d])\\-", " - ");
+			s = s.replaceAll("(?<=[-|%|)|px|em|rem|vw|\\d])\\*", " * ");
+			s = s.replaceAll("(?<=[-|%|)|px|em|rem|vw|\\d])\\/", " / ");
 
 			m.appendReplacement(sb, s);
 		}

src/test/resources/calc.css

@@ -1,6 +1,6 @@
 .test-calc {
 	left:calc(50%-(100px * 2));
 	width: calc( 25% +10px);
-	/*right: calc(((100% - 1200px) /2) + 16px); https://github.com/primefaces-extensions/resources-optimizer-maven-plugin/issues/75 */
+	right: calc(((100% - 1200px) /2) + 16px);
 	height:calc(50% + 4px)
 }

src/test/resources/calc.css.min

@@ -1 +1 @@
-.test-calc{left:calc(50% - (100px * 2));width:calc(25% + 10px);height:calc(50% + 4px)}
+.test-calc{left:calc(50% - (100px * 2));width:calc(25% + 10px);right:calc(((100% - 1200px) / 2) + 16px);height:calc(50% + 4px)}