New tests on extend all + one minor bug fixed. #151

Author: meri

src/main/java/com/github/sommeri/less4j/core/ast/SimpleSelector.java

@@ -132,7 +132,11 @@ public void extendName(String extension) {
     if (isStar) {
       isStar=false;
     }
-    getElementName().extendName(extension);
+    if (hasElement()) {
+      getElementName().extendName(extension);
+    } else {
+      setElementName(new InterpolableName(getUnderlyingStructure(), new FixedNamePart(getUnderlyingStructure(), extension)));
+    }
   }
 
 }

src/test/java/com/github/sommeri/less4j/compiler/ExtendsTest.java

@@ -8,9 +8,13 @@
 import com.github.sommeri.less4j.LessCompiler.CompilationResult;
 
 //FIXME (!!!) add tests for values lists for attributes - e.g. error handling
+//FIXME !!!! documentation: element will attach itself to previous
+//FIXME !!!! documentation: no partial class name match - not even for all
 public class ExtendsTest extends BasicFeaturesTest {
 
   private static final String standardCases = "src/test/resources/compile-basic-features/extends/extend-full/";
+  private static final String combinations = "src/test/resources/compile-basic-features/extends/combinations/";
+  private static final String misc = "src/test/resources/compile-basic-features/extends/";
   private static final String extendAllMatch1 = "src/test/resources/compile-basic-features/extends/extend-all/match-replacement-by-element/";
   private static final String extendAllMatch2 = "src/test/resources/compile-basic-features/extends/extend-all/match-replacement-by-x/";
   private static final String extendAllMultiple = "src/test/resources/compile-basic-features/extends/extend-all/multiple-matches/";
@@ -24,7 +28,7 @@ public static Collection<Object[]> allTestsParameters() {
     //FIXME  !!!! bwuhuhuuuuuu enable combied tests
     //return createTestFileUtils().loadTestFiles(standardCases);
     //return createTestFileUtils().loadTestFiles(standardCases, extendAllMatch);
-    return createTestFileUtils().loadTestFiles(extendAllMatch1, extendAllMatch2, extendAllMultiple);
+    return createTestFileUtils().loadTestFiles(misc, extendAllMatch1, extendAllMatch2, extendAllMultiple);
   }
 
   protected void assertSourceMapValid(CompilationResult actual) {

src/test/resources/compile-basic-features/extends/extend-all/combinations/extend-all-on-full.css src/test/resources/compile-basic-features/extends/combinations/extend-all-on-full.css

@@ -0,0 +1,80 @@
+:pseudo,
+new-element:new-pseudo1:new-pseudo2:new-pseudo3 {
+  property: value;
+}
+:pseudo other:first,
+new-element:new-pseudo1:new-pseudo2:new-pseudo3 other:first {
+  property: value;
+}
+:pseudo:last + other:first,
+new-element:new-pseudo1:new-pseudo2:new-pseudo3:last + other:first {
+  property: value;
+}
+:first:pseudo + other:first,
+:firstnew-element:new-pseudo1:new-pseudo2:new-pseudo3 + other:first {
+  property: value;
+}
+beginning:pseudo other:first,
+beginningnew-element:new-pseudo1:new-pseudo2:new-pseudo3 other:first {
+  property: value;
+}
+beginning:pseudo:last + other:first,
+beginningnew-element:new-pseudo1:new-pseudo2:new-pseudo3:last + other:first {
+  property: value;
+}
+first:first + :pseudo,
+first:first + new-element:new-pseudo1:new-pseudo2:new-pseudo3 {
+  property: value;
+}
+first:first + end:pseudo,
+first:first + endnew-element:new-pseudo1:new-pseudo2:new-pseudo3 {
+  property: value;
+}
+first:first + end:first:pseudo,
+first:first + end:firstnew-element:new-pseudo1:new-pseudo2:new-pseudo3 {
+  property: value;
+}
+first:first + :pseudo end:end,
+first:first + new-element:new-pseudo1:new-pseudo2:new-pseudo3 end:end {
+  property: value;
+}
+first:first + :pseudo:last end:end,
+first:first + new-element:new-pseudo1:new-pseudo2:new-pseudo3:last end:end {
+  property: value;
+}
+first:first + middle:pseudo end:end,
+first:first + middlenew-element:new-pseudo1:new-pseudo2:new-pseudo3 end:end {
+  property: value;
+}
+first:first + middle:pseudo:last end:end,
+first:first + middlenew-element:new-pseudo1:new-pseudo2:new-pseudo3:last end:end {
+  property: value;
+}
+first:first middle:first:pseudo + end:end,
+first:first middle:firstnew-element:new-pseudo1:new-pseudo2:new-pseudo3 + end:end {
+  property: value;
+}
+element:match > other:end,
+new-element:new-pseudo1:new-pseudo2:new-pseudo3 > other:end {
+  property: value;
+}
+element:match:last > other:end,
+new-element:new-pseudo1:new-pseudo2:new-pseudo3:last > other:end {
+  property: value;
+}
+beginning:end element:match,
+beginning:end new-element:new-pseudo1:new-pseudo2:new-pseudo3 {
+  property: value;
+}
+beginning:end element:match:last,
+beginning:end new-element:new-pseudo1:new-pseudo2:new-pseudo3:last {
+  property: value;
+}
+beginning:end element:match other:end,
+beginning:end new-element:new-pseudo1:new-pseudo2:new-pseudo3 other:end {
+  property: value;
+}
+beginning:end element:match:last other:end,
+beginning:end new-element:new-pseudo1:new-pseudo2:new-pseudo3:last other:end {
+  property: value;
+}

src/test/resources/compile-basic-features/extends/extend-all/combinations/extend-all-on-full.less src/test/resources/compile-basic-features/extends/combinations/extend-all-on-full.less

@@ -0,0 +1,76 @@
+:pseudo {
+	property: value;
+}
+//total beginning
+:pseudo other:first {
+	property: value;
+}
+:pseudo:last + other:first {
+	property: value;
+}
+:first:pseudo + other:first,
+:firstnew-element:new-pseudo1:new-pseudo2:new-pseudo3 + other:first {
+  property: value;
+}
+//partial beginning
+beginning:pseudo other:first {
+	property: value;
+}
+beginning:pseudo:last + other:first {
+	property: value;
+}
+//total end
+first:first + :pseudo {
+	property: value;
+} 
+first:first + end:pseudo {
+	property: value;
+} 
+first:first + end:first:pseudo {
+	property: value;
+} 
+//beginning in the middle
+first:first + :pseudo end:end {
+	property: value;
+} 
+first:first + :pseudo:last end:end {
+	property: value;
+} 
+first:first + middle:pseudo end:end {
+	property: value;
+} 
+first:first + middle:pseudo:last end:end {
+	property: value;
+} 
+//end in the middle
+first:first middle:first:pseudo + end:end {
+	property: value;
+} 
+
+new-element:new-pseudo1:new-pseudo2:new-pseudo3:extend(:pseudo all) {}
+
+element:match > other:end {
+	property: value;
+}
+
+element:match:last > other:end {
+	property: value;
+}
+
+beginning:end element:match {
+	property: value;
+}
+
+beginning:end element:match:last {
+	property: value;
+}
+
+beginning:end element:match other:end {
+	property: value;
+}
+
+beginning:end element:match:last other:end {
+	property: value;
+}
+
+new-element:new-pseudo1:new-pseudo2:new-pseudo3:extend(element:match all) {}