Problem with inner class and generics when using kapt

[janbina]

A while ago, I've got a problem with inner classes when using kapt (issue #42).
That problem was fixed, but now I run into similar problem. When the top level class has generic type, generated StateSaver class looks like this:
TestInnerClassGeneric$Inner$$StateSaver<T extends TestInnerClassGeneric<P>.Inner>
Notice that <P> which should not be here.

As well as #42, it's ok when using annotationProcessor.

I've created a test class reproducing that problem.

[vRallev]

I'm really sorry for the delay. I found the issue. The test class was very helpful!