Space -> WhiteSpace

css · Feb 8, 2017 · 58986b7 · 58986b7
1 parent f217458
commit 58986b7
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 17 deletions.
diff --git a/lib/compressor/clean/Space.js → lib/compressor/clean/WhiteSpace.js b/lib/compressor/clean/Space.js → lib/compressor/clean/WhiteSpace.js
@@ -3,11 +3,11 @@ module.exports = function cleanWhitespace(node, item, list) {
         return;
     }
 
-    if (item.prev !== null && item.prev.data.type === 'Space') {
+    if (item.prev !== null && item.prev.data.type === 'WhiteSpace') {
         list.remove(item.prev);
     }
 
-    if (item.next !== null && item.next.data.type === 'Space') {
+    if (item.next !== null && item.next.data.type === 'WhiteSpace') {
         list.remove(item.next);
     }
 };
diff --git a/lib/compressor/clean/index.js b/lib/compressor/clean/index.js
@@ -5,7 +5,7 @@ var handlers = {
     Declaration: require('./Declaration'),
     TypeSelector: require('./TypeSelector'),
     Comment: require('./Comment'),
-    Operator: require('./Space')
+    Operator: require('./WhiteSpace')
 };
 
 module.exports = function(ast, usageData) {

diff --git a/lib/compressor/compress/color.js b/lib/compressor/compress/color.js
@@ -414,9 +414,9 @@ function compressFunction(node, item, list) {
 
         // check if color is not at the end and not followed by space
         var next = item.next;
-        if (next && next.data.type !== 'Space') {
+        if (next && next.data.type !== 'WhiteSpace') {
             list.insert(list.createItem({
-                type: 'Space',
+                type: 'WhiteSpace',
                 value: ' '
             }), next);
         }

diff --git a/lib/compressor/compress/property/background.js b/lib/compressor/compress/property/background.js
@@ -8,7 +8,7 @@ module.exports = function compressBackground(node) {
     }
 
     function flush() {
-        if (lastType() === 'Space') {
+        if (lastType() === 'WhiteSpace') {
             buffer.pop();
         }
 
@@ -20,7 +20,7 @@ module.exports = function compressBackground(node) {
                     value: '0'
                 },
                 {
-                    type: 'Space',
+                    type: 'WhiteSpace',
                     value: ' '
                 },
                 {
@@ -57,7 +57,7 @@ module.exports = function compressBackground(node) {
         }
 
         // don't add redundant spaces
-        if (node.type === 'Space' && (!buffer.length || lastType() === 'Space')) {
+        if (node.type === 'WhiteSpace' && (!buffer.length || lastType() === 'WhiteSpace')) {
             return;
         }
 

diff --git a/lib/compressor/compress/property/font.js b/lib/compressor/compress/property/font.js
@@ -29,8 +29,8 @@ module.exports = function compressFont(node) {
 
     // remove redundant spaces
     list.each(function(node, item) {
-        if (node.type === 'Space') {
-            if (!item.prev || !item.next || item.next.data.type === 'Space') {
+        if (node.type === 'WhiteSpace') {
+            if (!item.prev || !item.next || item.next.data.type === 'WhiteSpace') {
                 this.remove(item);
             }
         }

diff --git a/lib/compressor/index.js b/lib/compressor/index.js
@@ -27,7 +27,7 @@ function readChunk(children, specialComments) {
             return;
         }
 
-        if (node.type !== 'Space') {
+        if (node.type !== 'WhiteSpace') {
             nonSpaceTokenInBuffer = true;
         }
 

diff --git a/lib/compressor/restructure/4-restructShorthand.js b/lib/compressor/restructure/4-restructShorthand.js
@@ -124,7 +124,7 @@ TRBL.prototype.getValueSequence = function(declaration, count) {
                 special = child.name;
                 break;
 
-            case 'Space':
+            case 'WhiteSpace':
                 return false; // ignore space
 
             default:
@@ -296,14 +296,14 @@ TRBL.prototype.getValue = function() {
 
     for (var i = 0; i < values.length; i++) {
         if (i) {
-            result.appendData({ type: 'Space', value: ' ' });
+            result.appendData({ type: 'WhiteSpace', value: ' ' });
         }
 
         result.appendData(values[i].node);
     }
 
     if (this.iehack) {
-        result.appendData({ type: 'Space', value: ' ' });
+        result.appendData({ type: 'WhiteSpace', value: ' ' });
         result.appendData({
             type: 'Identifier',
             loc: null,

diff --git a/lib/compressor/restructure/6-restructBlock.js b/lib/compressor/restructure/6-restructBlock.js
@@ -63,8 +63,7 @@ var NEEDLESS_TABLE = {
 function getPropertyFingerprint(propertyName, declaration, fingerprints) {
     var realName = resolveProperty(propertyName).name;
 
-    if (realName === 'background' ||
-       (realName === 'filter' && declaration.value.children.first().type === 'Progid')) {
+    if (realName === 'background') {
         return propertyName + ':' + translate(declaration.value);
     }
 

diff --git a/lib/compressor/restructure/prepare/processSelector.js b/lib/compressor/restructure/prepare/processSelector.js
@@ -69,7 +69,7 @@ module.exports = function freeze(node, usageData) {
                     }
                     break;
 
-                case 'Space':
+                case 'WhiteSpace':
                 case 'Combinator':
                     tagName = '*';
                     break;