Fix being unable to find declaration for substituted callable from library

#KT-5900 Fixed
#KT-5901 Fixed

idea/idea-analysis/src/org/jetbrains/jet/plugin/libraries/JetClsFile.kt

@@ -33,7 +33,7 @@ public class JetClsFile(val provider: JetClassFileViewProvider) : ClsFileImpl(pr
     override fun getDecompiledPsiFile() = decompiledFile
 
     public fun getDeclarationForDescriptor(descriptor: DeclarationDescriptor): JetDeclaration? {
-        val key = descriptorToKey(descriptor)
+        val key = descriptorToKey(descriptor.getOriginal())
         val range = provider.decompiledText.renderedDescriptorsToRange[key]
         if (range == null) {
             return null

idea/testData/codeInsight/overrideImplement/withLib/genericSubstituted.kt

@@ -0,0 +1,7 @@
+package test
+
+import dependency.D
+
+class C: D<Int>() {
+    <caret>
+}

idea/testData/codeInsight/overrideImplement/withLib/genericSubstituted.kt.after

@@ -0,0 +1,10 @@
+package test
+
+import dependency.D
+
+class C: D<Int>() {
+
+    override fun id(t: Int): Int {
+        return super<D>.id(t)
+    }
+}

idea/testData/codeInsight/overrideImplement/withLib/genericSubstitutedSrc/dependency.kt

@@ -0,0 +1,7 @@
+package dependency
+
+public open class D<T> {
+    public open fun id(t: T): T {
+        return t
+    }
+}

idea/tests/org/jetbrains/jet/plugin/codeInsight/OverrideImplementWithLibTest.java

@@ -39,4 +39,8 @@ public final class OverrideImplementWithLibTest extends AbstractOverrideImplemen
     public void testFakeOverride() {
         doOverrideFileTest();
     }
+
+    public void testGenericSubstituted() {
+        doOverrideFileTest();
+    }
 }