Fix remapping of qualified inner class reference in Kotlin code

When we used to remap `a.pkg.A.Inner` we would apply both mappings (the one for
the inner class and the one for the outer class) at the same time, resulting in
`b.pkg.B.Inner.Inner`.
The direct cause being that we only checked conflicts for the range of the
respective expression (which is just `A` and `Inner` for Kotlin, and therefore
not conflicting) instead of the parent as we should have.

With that fixed, it now also becomes apparent that we need to apply mappings for
dot qualified expressions back to front (otherwise the outer class takes
priority), so that is the second thing this commit change.

2 files changed, 10 insertions, 0 deletions

diff --git a/src/test/java/a/pkg/A.java b/src/test/java/a/pkg/A.java
index ff779b2..94e8a77 100644
--- a/src/test/java/a/pkg/A.java
+++ b/src/test/java/a/pkg/A.java
@@ -42,4 +42,9 @@ public class A extends AParent implements AInterface {
     public class Inner {
         private int aField;
     }
+
+    public class InnerA {
+    }
+
+    public class GenericA<T> {}
 }
diff --git a/src/test/java/b/pkg/B.java b/src/test/java/b/pkg/B.java
index 6ed26c1..9524513 100644
--- a/src/test/java/b/pkg/B.java
+++ b/src/test/java/b/pkg/B.java
@@ -42,4 +42,9 @@ public class B extends BParent implements BInterface {
     public class Inner {
         private int bField;
     }
+
+    public class InnerB {
+    }
+
+    public class GenericB<T> {}
 }