First clean up of #151 - only one match withing target selector supported.

Author: meri

src/main/java/com/github/sommeri/less4j/core/compiler/selectors/SelectorsComparatorForExtend.java

@@ -6,13 +6,13 @@
 import com.github.sommeri.less4j.core.ast.ASTCssNode;
 import com.github.sommeri.less4j.core.ast.Selector;
 import com.github.sommeri.less4j.core.ast.SelectorPart;
+import com.github.sommeri.less4j.core.problems.BugHappened;
 import com.github.sommeri.less4j.utils.ArraysUtils;
 import com.github.sommeri.less4j.utils.ListsComparator;
 import com.github.sommeri.less4j.utils.ListsComparator.MatchMarker;
 
 public class SelectorsComparatorForExtend {
 
-  private SelectorsManipulator manipulator = new SelectorsManipulator();
   private SelectorsComparatorUtils utils = new SelectorsComparatorUtils();
   private ListsComparator listsComparator = new ListsComparator();
 
@@ -58,107 +58,63 @@ private boolean containsInList(List<SelectorPart> lookForParts, List<SelectorPar
   //FIXME (!!!) document less.js ignores leading and final combinators
   private Selector replaceInList(List<SelectorPart> lookForParts, Selector inSelector, List<SelectorPart> replaceBy) {
     List<SelectorPart> inSelectorParts = inSelector.getParts();
-    List<SelectorPart> newInSelectorParts = new ArrayList<SelectorPart>();
+    SelectorPartsListBuilder builder = new SelectorPartsListBuilder();
 
     List<MatchMarker<SelectorPart>> matches = listsComparator.findMatches(lookForParts, inSelectorParts, selectorPartsComparator);
     if (matches.isEmpty() || replaceBy == null || replaceBy.isEmpty())
       return null;
 
-    //underlying
-    lookForParts = ArraysUtils.deeplyClonedList(lookForParts);
     replaceBy = ArraysUtils.deeplyClonedList(replaceBy);
 
     SelectorPart firstMatch = matches.get(0).getFirst();
     SelectorPart lastMatch = matches.get(0).getLast();
 
     if (firstMatch == lastMatch) {
       if (lookForParts.size() != 1)
-        throw new IllegalStateException("WTF");
-
-      List<SelectorPart> replaceInside = replaceInside(lookForParts.get(0), lastMatch, replaceBy);
-      int indexOfLastMatch = inSelectorParts.indexOf(lastMatch);
-      inSelectorParts.remove(lastMatch);
-      replaceInside.remove(null); //FIXME (!!!) hack there may be more than that
-      inSelectorParts.addAll(indexOfLastMatch, replaceInside);
+        throw new BugHappened("Impossible state happened.", lookForParts.isEmpty() ? null : lookForParts.get(0));
 
+      List<SelectorPart> replaceInside = replaceInsidePart(lookForParts.get(0), lastMatch, replaceBy);
+      ArraysUtils.replace(lastMatch, inSelectorParts, replaceInside);
       inSelector.configureParentToAllChilds();
+
       return inSelector;
     }
 
-    newInSelectorParts.addAll(chopUpTo(inSelectorParts, firstMatch));
-    chopPrefix(inSelectorParts, 1);
+    builder.moveUpTo(inSelectorParts, firstMatch);
+    ArraysUtils.chopFirst(inSelectorParts);
+
     SelectorPart firstRemainder = selectorPartsComparator.cutSuffix(lookForParts.get(0), firstMatch);
     if (firstRemainder != null) {
-      SelectorPart firstReplaceBy = replaceBy.remove(0);
-      manipulator.directlyJoinParts(firstRemainder, firstReplaceBy);
-      newInSelectorParts.add(firstRemainder);
+      builder.add(firstRemainder);
+      builder.directlyAttach(replaceBy);
+    } else {
+      builder.addAll(replaceBy);
     }
 
-    newInSelectorParts.addAll(replaceBy);
-
-    //FIXME (!!!) extract to some ast manipulator - it is also in simple selector comparator
-    removeFromParent(chopUpTo(inSelectorParts, lastMatch));
+    removeFromParent(ArraysUtils.chopUpTo(inSelectorParts, lastMatch));
 
-    SelectorPart lastRemainder = lastMatch == firstMatch ? null : selectorPartsComparator.cutPrefix(ArraysUtils.last(lookForParts), lastMatch);
-    //SelectorPart lastRemainder = selectorPartsComparator.cutPrefix(ArraysUtils.last(lookForParts), lastMatch);
-    chopPrefix(inSelectorParts, 1);
-    if (lastRemainder != null) {
-      SelectorPart attachToPart = ArraysUtils.last(newInSelectorParts);
-      manipulator.directlyJoinParts(attachToPart, lastRemainder);
-    }
-    newInSelectorParts.addAll(inSelectorParts);
+    SelectorPart lastRemainder = selectorPartsComparator.cutPrefix(ArraysUtils.last(lookForParts), lastMatch);
+    ArraysUtils.chopFirst(inSelectorParts);
+    builder.directlyAttachNonNull(lastRemainder);
+    builder.addAll(inSelectorParts);
 
-    inSelector.setParts(newInSelectorParts);
+    inSelector.setParts(builder.getParts());
     inSelector.configureParentToAllChilds();
 
     return inSelector;
   }
 
-//FIXME (!!!!) test and refactor
-  private List<SelectorPart> replaceInside(SelectorPart lookFor, SelectorPart inside, List<SelectorPart> replaceBy) {
+  private List<SelectorPart> replaceInsidePart(SelectorPart lookFor, SelectorPart inside, List<SelectorPart> replaceBy) {
     SelectorPart[] split = selectorPartsComparator.splitOn(lookFor, inside);
-    List<SelectorPart> result = new ArrayList<SelectorPart>();
-    SelectorPart previous = null;
-    for (int i = 0; i < split.length; i++) {
-      List<SelectorPart> replaceByClone = ArraysUtils.deeplyClonedList(replaceBy); 
-      if (split[i] != null) {
-        if (previous == null)
-          result.add(split[i]);
-        else
-          manipulator.directlyJoinParts(previous, split[i]);
-        
-        if (i != split.length - 1) {
-          manipulator.directlyJoinParts(split[i], replaceByClone.remove(0));
-        }
-      } 
-      
-      if (i != split.length - 1) {
-        result.addAll(replaceByClone); 
+    SelectorPartsListBuilder builder = new SelectorPartsListBuilder();
+    if (split.length > 0) {
+      builder.directlyAttachNonNull(split[0]);
+      for (int i = 1; i < split.length; i++) {
+        builder.directlyAttach(ArraysUtils.deeplyClonedList(replaceBy));
+        builder.directlyAttachNonNull(split[i]);
       }
-      previous = ArraysUtils.chopLast(replaceByClone);
     }
-    return result;
-  }
-
-  private List<SelectorPart> chopUpTo(List<SelectorPart> list, SelectorPart exclusiveTo) {
-    int indx = list.indexOf(exclusiveTo);
-    if (indx == -1)
-      return new ArrayList<SelectorPart>();
-
-    List<SelectorPart> subList = list.subList(0, indx);
-    List<SelectorPart> result = new ArrayList<SelectorPart>(subList);
-    subList.clear();
-    return result;
-  }
-
-  private List<SelectorPart> chopPrefix(List<SelectorPart> list, int exclusiveTo) {
-    if (exclusiveTo > list.size())
-      exclusiveTo = list.size();
-
-    List<SelectorPart> subList = list.subList(0, exclusiveTo);
-    List<SelectorPart> result = new ArrayList<SelectorPart>(subList);
-    subList.clear();
-    return result;
+    return builder.getParts();
   }
 
   private void removeFromParent(List<SelectorPart> removeThese) {
@@ -168,10 +124,6 @@ private void removeFromParent(List<SelectorPart> removeThese) {
     removeThese.clear();
   }
 
-  private List<SelectorPart> sublistCopy(List<SelectorPart> list, int first, int last) {
-    return (first > last) ? new ArrayList<SelectorPart>() : new ArrayList<SelectorPart>(list.subList(first, last));
-  }
-
   private boolean containsEmbedded(List<SelectorPart> lookFor, List<SelectorPart> inSelectors) {
     for (SelectorPart inside : inSelectors) {
       if (containsEmbedded(lookFor, inside))
@@ -197,3 +149,62 @@ private boolean containsEmbedded(List<SelectorPart> lookFor, ASTCssNode inside)
   }
 
 }
+
+class SelectorPartsListBuilder {
+
+  private SelectorsManipulator manipulator = new SelectorsManipulator();
+  private List<SelectorPart> newInSelectorParts = new ArrayList<SelectorPart>();
+
+  public SelectorPartsListBuilder() {
+  }
+
+  public List<SelectorPart> getParts() {
+    return newInSelectorParts;
+  }
+
+  public void directlyAttachNonNull(SelectorPart part) {
+    if (part != null)
+      directlyAttach(part);
+  }
+
+  public void directlyAttach(SelectorPart part) {
+    if (newInSelectorParts.isEmpty()) {
+      add(part);
+    } else {
+      SelectorPart tail = ArraysUtils.last(newInSelectorParts);
+      manipulator.directlyJoinParts(tail, part);
+    }
+  }
+
+  public void directlyAttach(List<SelectorPart> list) {
+    if (!newInSelectorParts.isEmpty()) {
+      SelectorPart tail = ArraysUtils.last(newInSelectorParts);
+      SelectorPart firstReplaceBy = list.remove(0);
+      manipulator.directlyJoinParts(tail, firstReplaceBy);
+    }
+    addAll(list);
+  }
+
+  public void addAll(List<SelectorPart> list) {
+    newInSelectorParts.addAll(list);
+  }
+
+  public void addNonNull(SelectorPart part) {
+    if (part != null)
+      add(part);
+  }
+
+  public void add(SelectorPart part) {
+    newInSelectorParts.add(part);
+  }
+
+  public void moveUpTo(List<SelectorPart> inSelectorParts, SelectorPart firstMatch) {
+    newInSelectorParts.addAll(ArraysUtils.chopUpTo(inSelectorParts, firstMatch));
+  }
+
+  @Override
+  public String toString() {
+    return newInSelectorParts.toString();
+  }
+
+}

src/main/java/com/github/sommeri/less4j/core/compiler/selectors/SelectorsManipulator.java

@@ -107,7 +107,7 @@ public Selector directJoin(Selector firstI, Selector secondI) {
     return first;
   }
 
-  public SelectorPart directlyJoinParts(SelectorPart first, SelectorPart second) {
+  public void directlyJoinParts(SelectorPart first, SelectorPart second) {
     if (second.hasElement()) {
       String secondName = second.hasElement() ? second.getElementName().getName() : "";
       if (first.hasSubsequent()) {
@@ -120,7 +120,6 @@ public SelectorPart directlyJoinParts(SelectorPart first, SelectorPart second) {
 
     first.addSubsequent(second.getSubsequent());
     first.configureParentToAllChilds();
-    return first;
   }
 
   private Collection<Selector> replaceFirstAppender(Selector selector, List<Selector> previousSelectors) {

src/main/java/com/github/sommeri/less4j/core/compiler/selectors/SimpleSelectorComparator.java

@@ -4,7 +4,6 @@
 import java.util.List;
 
 import com.github.sommeri.less4j.core.ast.ElementSubsequent;
-import com.github.sommeri.less4j.core.ast.Selector;
 import com.github.sommeri.less4j.core.ast.SelectorCombinator;
 import com.github.sommeri.less4j.core.ast.SimpleSelector;
 import com.github.sommeri.less4j.utils.ArraysUtils;
@@ -66,6 +65,7 @@ public SimpleSelector cutSuffix(SimpleSelector lookFor, SimpleSelector inside) {
       MatchMarker<ElementSubsequent> match = listsComparator.suffixMatches(lfSubsequent, insideSubsequent, elementSubsequentComparator);
       return removeMatch(inside, insideSubsequent, match);
     } else {
+      //suffix consumed whole selector
       return null;
     }
   }

src/main/java/com/github/sommeri/less4j/utils/ArraysUtils.java

@@ -5,6 +5,7 @@
 import java.util.List;
 
 import com.github.sommeri.less4j.core.ast.ASTCssNode;
+import com.github.sommeri.less4j.core.ast.SelectorPart;
 
 public class ArraysUtils {
 
@@ -79,6 +80,34 @@ public static <T> T first(List<T> values) {
     return values.get(0);
   }
 
+  public static <T> T chopFirst(List<T> values) {
+    if (values.isEmpty())
+      return null;
+    
+    return values.remove(0);
+  }
+
+  public static <T> List<T> chopUpTo(List<T> list, T exclusiveTo) {
+    int indx = list.indexOf(exclusiveTo);
+    if (indx == -1)
+      return new ArrayList<T>();
+
+    List<T> subList = list.subList(0, indx);
+    List<T> result = new ArrayList<T>(subList);
+    subList.clear();
+    return result;
+  }
+
+  public static <T> List<T> chopPrefix(List<T> list, int exclusiveTo) {
+    if (exclusiveTo > list.size())
+      exclusiveTo = list.size();
+
+    List<T> subList = list.subList(0, exclusiveTo);
+    List<T> result = new ArrayList<T>(subList);
+    subList.clear();
+    return result;
+  }
+
   public static <T> List<T> asNonNullList(T... a) {
     List<T> result = new ArrayList<T>();
     for (T t : a) {
@@ -129,4 +158,10 @@ public static <T> List<T> joinAll(List<T>... lists) {
     return result;
   }
 
+  public static <T> void replace(SelectorPart lookFor, List<T> inside, List<T> replaceBy) {
+    int indx = inside.indexOf(lookFor);
+    inside.remove(lookFor);
+    inside.addAll(indx, replaceBy);
+  }
+
 }

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

@@ -19,8 +19,8 @@ public ExtendsTest(File inputFile, File outputFile, File errorList, File mapdata
 
   @Parameters(name="Less: {4}")
   public static Collection<Object[]> allTestsParameters() {
-    return createTestFileUtils().loadTestFiles(standardCases);
-    //return createTestFileUtils().loadTestFiles(extendAllMatch);
+    //return createTestFileUtils().loadTestFiles(standardCases);
+    return createTestFileUtils().loadTestFiles(extendAllMatch);
   }
 
   protected void assertSourceMapValid(CompilationResult actual) {