Fixes import by reference inlines source's inline imports - 2620

lib/less/tree/anonymous.js

@@ -1,16 +1,17 @@
 var Node = require("./node");
 
-var Anonymous = function (value, index, currentFileInfo, mapLines, rulesetLike) {
+var Anonymous = function (value, index, currentFileInfo, mapLines, rulesetLike, referenced) {
     this.value = value;
     this.index = index;
     this.mapLines = mapLines;
     this.currentFileInfo = currentFileInfo;
     this.rulesetLike = (typeof rulesetLike === 'undefined') ? false : rulesetLike;
+    this.isReferenced = referenced || false;
 };
 Anonymous.prototype = new Node();
 Anonymous.prototype.type = "Anonymous";
 Anonymous.prototype.eval = function () {
-    return new Anonymous(this.value, this.index, this.currentFileInfo, this.mapLines, this.rulesetLike);
+    return new Anonymous(this.value, this.index, this.currentFileInfo, this.mapLines, this.rulesetLike, this.isReferenced);
 };
 Anonymous.prototype.compare = function (other) {
     return other.toCSS && this.toCSS() === other.toCSS() ? 0 : undefined;
@@ -21,4 +22,11 @@ Anonymous.prototype.isRulesetLike = function() {
 Anonymous.prototype.genCSS = function (context, output) {
     output.add(this.value, this.currentFileInfo, this.index, this.mapLines);
 };
+Anonymous.prototype.markReferenced = function () {
+    this.isReferenced = true;
+};
+Anonymous.prototype.getIsReferenced = function () {
+    return !this.currentFileInfo || !this.currentFileInfo.reference || this.isReferenced;
+};
+
 module.exports = Anonymous;

lib/less/tree/import.js

@@ -128,7 +128,7 @@ Import.prototype.eval = function (context) {
     }
 
     if (this.options.inline) {
-        var contents = new Anonymous(this.root, 0, {filename: this.importedFilename}, true, true);
+        var contents = new Anonymous(this.root, 0, {filename: this.importedFilename, reference: this.path.currentFileInfo.reference}, true, true, false);
         return this.features ? new Media([contents], this.features.value) : [contents];
     } else if (this.css) {
         var newImport = new Import(this.evalPath(context), features, this.options, this.index);

lib/less/visitors/to-css-visitor.js

@@ -294,6 +294,15 @@ ToCSSVisitor.prototype = {
                 rule.value = toValue(spacedGroups);
             }
         });
+    },
+
+    visitAnonymous: function(anonymousNode, visitArgs) {
+        if (!anonymousNode.getIsReferenced()) {
+            return ;
+        }
+
+        anonymousNode.accept(this._visitor);
+        return anonymousNode;
     }
 };
 

test/css/import-reference.css

@@ -91,3 +91,7 @@ div#id.class[a=1][b=2].class:not(1) {
     color: red;
   }
 }
+div {
+  this isn't very valid CSS.
+}
+this isn't very valid CSS.

test/less/import-reference.less

@@ -22,3 +22,5 @@
 }
 .mixin-with-nested-selectors();
 .mixin-with-directives(some-name);
+
+.print-referenced-import-inline();

test/less/import/import-inline-invalid-css.less

@@ -0,0 +1 @@
+@import (inline) "invalid-css.less";

test/less/import/import-reference.less

@@ -86,4 +86,13 @@
   }
   @rules1: {property: value;};
   @rules2: {property: value;};
+}
+
+@import (inline, multiple) "invalid-css.less";
+@import "import-inline-invalid-css.less";
+.print-referenced-import-inline() {
+  div {
+    @import (inline, multiple) "invalid-css.less";
+  }
+  @import (inline, multiple) "invalid-css.less";
 }