Merge pull request #157 from L0stSoul/left-indent

Left indent

Author: mishanga

lib/options/vendor-prefix-align.js

@@ -12,30 +12,48 @@ module.exports = {
         'o'
     ],
 
+    /**
+     * Internal
+     *
+     * Make namespace from property name
+     * @param {String} propertyName
+     * @returns {String|undefined}
+     */
+    _makeNamespace: function(propertyName) {
+        var info = this._getPrefixInfo(propertyName);
+        return info && info.baseName;
+    },
+
     /**
      * Internal
      *
      * Create object which contains info about vendor prefix used in propertyName.
      * @param {String} propertyName property name
      * @returns {Object|undefined}
      */
-    _getPrefixInfo: function(propertyName) {
-        if (!propertyName) return;
+    _getPrefixInfo: function(propertyName, namespace) {
+        var baseName = propertyName;
+        var prefixLength = 0;
 
-        var result = { baseName: propertyName, prefixLength: 0 };
+        namespace = namespace || '';
+
+        if (!propertyName) return;
 
         this._prefixesList.some(function(prefix) {
-            // TODO: Why don't we store prefixes with `-`?
             prefix = '-' + prefix + '-';
             if (propertyName.indexOf(prefix) !== 0) return;
-            result = {
-                baseName: propertyName.substr(prefix.length),
-                prefixLength: prefix.length
-            };
+
+            baseName = baseName.substr(prefix.length);
+            prefixLength = prefix.length;
+
             return true;
         });
 
-        return result;
+        return {
+            id: namespace + baseName,
+            baseName: baseName,
+            prefixLength: prefixLength
+        };
     },
 
     /**
@@ -46,9 +64,12 @@ module.exports = {
      * @param {function} selector
      * @param {function} payload
      */
-    _walk: function(node, selector, payload) {
+    _walk: function(node, selector, payload, namespaceSelector) {
         node.forEach(function(item, i) {
-            var info = this._getPrefixInfo(selector(item));
+            var info = this._getPrefixInfo(
+                selector(item),
+                namespaceSelector && this._makeNamespace(namespaceSelector(item))
+            );
             if (!info) return;
             payload(info, i);
         }, this);
@@ -103,14 +124,14 @@ module.exports = {
     _updateDict: function(info, dict, whitespaceNode) {
         if (info.prefixLength === 0) return;
 
-        var indent = dict[info.baseName] || { prefixLength: 0, baseLength: 0 };
+        var indent = dict[info.id] || { prefixLength: 0, baseLength: 0 };
 
-        dict[info.baseName] = indent.prefixLength > info.prefixLength ?
-            indent :
-            {
-                prefixLength: info.prefixLength,
-                baseLength: whitespaceNode.substr(whitespaceNode.lastIndexOf('\n') + 1).length
-            };
+        dict[info.id] = indent.prefixLength > info.prefixLength ?
+        indent :
+        {
+            prefixLength: info.prefixLength,
+            baseLength: whitespaceNode.substr(whitespaceNode.lastIndexOf('\n') + 1).length
+        };
     },
 
     /**
@@ -121,14 +142,15 @@ module.exports = {
      * @returns {String}
      */
     _updateIndent: function(info, dict, whitespaceNode) {
-        if (!dict[info.baseName])
+        var item = dict[info.id];
+        if (!item)
             return whitespaceNode;
 
         var firstPart = whitespaceNode.substr(0, whitespaceNode.lastIndexOf('\n') + 1 );
         var extraIndent = new Array(
-            dict[info.baseName].prefixLength -
+            item.prefixLength -
             info.prefixLength +
-            dict[info.baseName].baseLength + 1).join(' ');
+        item.baseLength + 1).join(' ');
 
         return firstPart.concat(extraIndent);
     },
@@ -160,15 +182,16 @@ module.exports = {
         });
         this._walk(node, this._getValName, function(info, i) {
             _this._updateDict(info, dict, node[i][3][1][1]);
-        });
+        }, this._getDeclName);
 
         // Update nodes
         this._walk(node, this._getDeclName, function(info, i) {
             node[i - 1][1] = _this._updateIndent(info, dict, node[i - 1][1]);
         });
         this._walk(node, this._getValName, function(info, i) {
             node[i][3][1][1] = _this._updateIndent(info, dict, node[i][3][1][1]);
-        });
+        }, this._getDeclName );
+
     },
 
     /**

test/options/vendor-prefix-align.js

@@ -20,6 +20,10 @@ describe('options/vendor-prefix-align', function() {
         this.shouldBeEqual('both.css', 'both.expected.css');
     });
 
+    it('Should correctly work when value and property name are the same', function() {
+        this.shouldBeEqual('same-name.css', 'same-name.expected.css');
+    });
+
     it('Should always correctly align prefixes', function() {
         this.shouldBeEqual('complex.css', 'complex.expected.css');
     });

test/options/vendor-prefix-align/same-name.css

@@ -0,0 +1,7 @@
+.test
+{
+    -webkit-transition: -webkit-transform .6s;
+    transition: transform .6s;
+    -webkit-transform: scale(.6, .6);
+    transform: scale(.6, .6);
+}

test/options/vendor-prefix-align/same-name.expected.css

@@ -0,0 +1,7 @@
+.test
+{
+    -webkit-transition: -webkit-transform .6s;
+            transition:         transform .6s;
+    -webkit-transform: scale(.6, .6);
+            transform: scale(.6, .6);
+}