Fix element to selector list conversion, passing all tests!

Author: matthew-dean

lib/less/tree/ruleset.js

@@ -54,6 +54,7 @@ Ruleset.prototype.eval = function (context) {
             var removeSelector = false;
             for (var j = 0; j < selector.elements.length; j++) {
                 var el = selector.elements[j];
+                // If selector elements were variables, re-parse to see if they are actually selectors
                 if (el.isVariable && typeof el.value.value === 'string') {
                     this.parse.parseNode(
                         el.value.value, 
@@ -64,25 +65,28 @@ Ruleset.prototype.eval = function (context) {
                             el.isVariable = false;
                             if (result) {
                                 result = utils.flattenArray(result);
-                                that.selectors = that.selectors.slice(0, i + 1)
-                                    .concat(result, that.selectors.slice(i + 1));
-                                selCnt += result.length;
-                                removeSelector = true;
+                                // If the parsed element matches itself, it's still an element
+                                if (result.length !== 1 || el.value.value !== result[0].elements[0].value) {
+                                    that.selectors = that.selectors.slice(0, i + 1)
+                                        .concat(result, that.selectors.slice(i + 1));
+                                    selCnt += result.length;
+                                    removeSelector = true;
+                                }
                             }
                         });
                 }
-                // if (el.isVariable && selector._fileInfo.filename.indexOf('parse-') > -1) {
-                //     console.log(el);
-                // }
             }
             if (removeSelector) {
                 selCnt -= 1;
                 this.selectors.splice(i, 1);
+                i -= 1;
                 continue;
             }
-            selectors[i] = selector;
-            if (selector.evaldCondition) {
-                hasOnePassingSelector = true;
+            else {
+                selectors[i] = selector;
+                if (selector.evaldCondition) {
+                    hasOnePassingSelector = true;
+                }
             }
         }
         defaultFunc.reset();

test/css/parse-interpolation.css

@@ -1,6 +1,6 @@
-input[type=text]:focus, 
-input[type=email]:focus, 
-input[type=password]:focus, 
+input[type=text]:focus,
+input[type=email]:focus,
+input[type=password]:focus,
 textarea:focus {
   foo: bar;
-} 
+}