KT-11750 Do not report REDECLARATION on descriptors which are not available in sources.

2016-04-08 14:18:19 +03:00
parent 905ca21799
commit 1f3323ed32
4 changed files with 33 additions and 2 deletions
@@ -78,9 +78,13 @@ class DeclarationResolver(
                            continue
                        }

-                        redeclarations.add(Pair(DescriptorToSourceUtils.getSourceFromDescriptor(descriptor)!!, descriptor.getName()))
+                        DescriptorToSourceUtils.getSourceFromDescriptor(descriptor)?.let {
+                            redeclarations.add(Pair(it, descriptor.getName()))
+                        }
                        if (descriptor2 is PropertyDescriptor) {
-                            redeclarations.add(Pair(DescriptorToSourceUtils.descriptorToDeclaration(descriptor2)!!, descriptor2.getName()))
+                            DescriptorToSourceUtils.descriptorToDeclaration(descriptor2)?.let {
+                                redeclarations.add(Pair(it, descriptor2.getName()))
+                            }
                        }
                    }
                }