Fixes #887 - edge case in serializing comments.

Why: * When `removeEmpty: false` is used then comments are not properly removed from a list of tokens.
clean-css · Jul 8, 2017 · 98254d1 · 98254d1
1 parent b532b4e
commit 98254d1
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/History.md b/History.md
@@ -1,3 +1,8 @@
+[4.1.6 / 2017-xx-xx](https://github.com/jakubpawlowicz/clean-css/compare/v4.1.5...4.1)
+==================
+
+* Fixed issue [#887](https://github.com/jakubpawlowicz/clean-css/issues/887) - edge case in serializing comments.
+
 [4.1.5 / 2017-06-29](https://github.com/jakubpawlowicz/clean-css/compare/v4.1.4...v4.1.5)
 ==================
 

diff --git a/lib/optimizer/level-1/optimize.js b/lib/optimizer/level-1/optimize.js
@@ -491,10 +491,7 @@ function optimizeBody(properties, context) {
 
   restoreFromOptimizing(_properties);
   removeUnused(_properties);
-
-  if (_properties.length != properties.length) {
-    removeComments(properties, options);
-  }
+  removeComments(properties, options);
 }
 
 function removeComments(tokens, options) {
@@ -654,7 +651,7 @@ function level1Optimize(tokens, context) {
         break;
     }
 
-    if (levelOptions.removeEmpty && (token[1].length === 0 || (token[2] && token[2].length === 0))) {
+    if (token[0] == Token.COMMENT && token[1].length === 0 || levelOptions.removeEmpty && (token[1].length === 0 || (token[2] && token[2].length === 0))) {
       tokens.splice(i, 1);
       i--;
       l--;

diff --git a/test/optimizer/level-1/optimize-test.js b/test/optimizer/level-1/optimize-test.js
@@ -261,6 +261,14 @@ vows.describe('level 1 optimizations')
         'a{/* a comment */}',
         'a{}'
       ],
+      'body with comment and ignored value': [
+        '.block{/* a comment */_color: red}',
+        '.block{}'
+      ],
+      'top level comment': [
+        '/* comment */.block{}',
+        '.block{}'
+      ],
       '@media query': [
         '@media screen{}',
         '@media screen{}'