From c68d9c62f694bb20d58ac419bd8b9a942a0b5a83 Mon Sep 17 00:00:00 2001 From: Stepan Koltsov Date: Wed, 28 Mar 2012 18:28:16 +0400 Subject: [PATCH] Do not show fake overrides in decompiler #KT-1658 Fixed No test, sorry --- .../libraries/DecompiledDataFactory.java | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/idea/src/org/jetbrains/jet/plugin/libraries/DecompiledDataFactory.java b/idea/src/org/jetbrains/jet/plugin/libraries/DecompiledDataFactory.java index 58840c81b17..62f13699ce8 100644 --- a/idea/src/org/jetbrains/jet/plugin/libraries/DecompiledDataFactory.java +++ b/idea/src/org/jetbrains/jet/plugin/libraries/DecompiledDataFactory.java @@ -204,15 +204,20 @@ class DecompiledDataFactory { appendDescriptor(classDescriptor.getClassObjectDescriptor(), subindent); } for (DeclarationDescriptor member : sortDeclarations(classDescriptor.getDefaultType().getMemberScope().getAllDescriptors())) { - if (member.getContainingDeclaration() == descriptor) { - if (firstPassed) { - myBuilder.append("\n"); - } else { - firstPassed = true; - } - myBuilder.append(subindent); - appendDescriptor(member, subindent); + if (member.getContainingDeclaration() != descriptor) { + continue; } + if (member instanceof CallableMemberDescriptor && ((CallableMemberDescriptor) member).getKind() != CallableMemberDescriptor.Kind.DECLARATION) { + continue; + } + + if (firstPassed) { + myBuilder.append("\n"); + } else { + firstPassed = true; + } + myBuilder.append(subindent); + appendDescriptor(member, subindent); } myBuilder.append(indent).append("}"); endOffset = myBuilder.length();