From 240fcf8599d52d576a3b49fb3e66afa88636a679 Mon Sep 17 00:00:00 2001 From: Svetlana Isakova Date: Tue, 14 Aug 2012 19:06:50 +0400 Subject: [PATCH] fix 'Generate imports' action (substitute type arguments) overridden shouldn't be original --- .../src/org/jetbrains/jet/lang/resolve/OverrideResolver.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverrideResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverrideResolver.java index 3a443f3754b..ffa17f104f9 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverrideResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverrideResolver.java @@ -514,7 +514,7 @@ public class OverrideResolver { Set filteredOverrides = OverridingUtil.filterOverrides(Sets.newHashSet(overriddenDeclarations)); Set overridden = Sets.newHashSet(); for (CallableMemberDescriptor memberDescriptor : filteredOverrides) { - overridden.add(memberDescriptor.getOriginal()); + overridden.add(memberDescriptor); } overriddenDeclarationsByDirectParent.put(descriptor, overridden); }