Kapt: Parse generic signatures with inner class types correctly

plugins/kapt3/testData/converter/innerClassesWithTypeParameters.kt

@@ -0,0 +1,16 @@
+class Test {
+    private var a = FilterValueDelegate<Float>()
+    private inner class FilterValueDelegate<T>
+}
+
+class Test2 {
+    inner class FilterValueDelegate<T> {
+        private var a = Filter2<String>()
+        inner class Filter2<X>
+    }
+}
+
+class Test3 {
+    private var a = FilterValueDelegate<Float>()
+    private class FilterValueDelegate<T>
+}

plugins/kapt3/testData/converter/innerClassesWithTypeParameters.txt

@@ -0,0 +1,57 @@
+public final class Test {
+    private Test.FilterValueDelegate<java.lang.Float> a;
+
+    public Test() {
+        super();
+    }
+
+    private final class FilterValueDelegate<T extends java.lang.Object> {
+
+        public FilterValueDelegate() {
+            super();
+        }
+    }
+}
+
+////////////////////
+
+
+public final class Test2 {
+
+    public Test2() {
+        super();
+    }
+
+    public final class FilterValueDelegate<T extends java.lang.Object> {
+        private Test2.FilterValueDelegate<T>.Filter2<java.lang.String> a;
+
+        public FilterValueDelegate() {
+            super();
+        }
+
+        public final class Filter2<X extends java.lang.Object> {
+
+            public Filter2() {
+                super();
+            }
+        }
+    }
+}
+
+////////////////////
+
+
+public final class Test3 {
+    private Test3.FilterValueDelegate<java.lang.Float> a;
+
+    public Test3() {
+        super();
+    }
+
+    private static final class FilterValueDelegate<T extends java.lang.Object> {
+
+        public FilterValueDelegate() {
+            super();
+        }
+    }
+}