Fix for bug 392581 - [content assist] after "super.", enclosing method

should be first proposal

1 files changed, 8 insertions, 11 deletions

diff --git a/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/CompletionEngine.java b/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/CompletionEngine.java
index 0409ada870..08fcd086f5 100644
--- a/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/CompletionEngine.java
+++ b/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/CompletionEngine.java
@@ -4259,17 +4259,14 @@ public final class CompletionEngine
 		if (site instanceof CompletionOnMemberAccess) {
 			CompletionOnMemberAccess access = (CompletionOnMemberAccess) site;
 			if (access.isSuperAccess() && this.parser.assistNodeParent == null) {
-				ReferenceContext referenceContext = scope.referenceContext();
-				if (referenceContext instanceof AbstractMethodDeclaration) {
-					MethodBinding binding = ((AbstractMethodDeclaration) referenceContext).binding;
-					if (binding != null) {
-						if (CharOperation.equals(binding.selector, method.selector)) {
-							if (binding.areParameterErasuresEqual(method)) {
-								return R_EXACT_NAME + R_METHOD_OVERIDE;
-							}
-							return R_EXACT_NAME;
-						}
+				MethodBinding binding = ((MethodDeclaration) scope.referenceContext()).binding;
+				String methodName = String.valueOf(binding.selector);
+				String currentMethodName = String.valueOf(method.selector);
+				if (currentMethodName != null && currentMethodName.equals(methodName)) {
+					if (binding.areParametersEqual(method)) {
+						return R_EXACT_NAME + R_METHOD_OVERIDE;
 					}
+					return R_EXACT_NAME;
 				}
 			}
 		}
@@ -12878,4 +12875,4 @@ public final class CompletionEngine
 		if(foundConflicts) return substituedParameterNames;
 		return null;
 	}
-}
\ No newline at end of file
+}