Fixes to super completion

Should fix 2

Signed-off-by: David Thompson <[email protected]>

Author: datho7561

org.eclipse.jdt.core.javac/src/org/eclipse/jdt/internal/codeassist/DOMCompletionEngine.java

@@ -3456,6 +3456,8 @@ private void statementLikeKeywords() {
 				(this.toComplete.getParent() instanceof Assignment)
 				||
 				(this.toComplete instanceof Assignment)
+				||
+				(this.toComplete.getParent() instanceof FieldDeclaration)
 				;
 		if (!isExpressionExpected) {
 			keywords.add(Keywords.ASSERT);
@@ -3471,7 +3473,12 @@ private void statementLikeKeywords() {
 			keywords.add(Keywords.FINAL);
 			keywords.add(Keywords.CLASS);
 		}
-		keywords.add(Keywords.SUPER);
+		if (DOMCompletionUtils.findParent(this.toComplete, new int[] { ASTNode.METHOD_DECLARATION }) instanceof MethodDeclaration md
+				&& (md.resolveBinding() == null || !Flags.isStatic(md.resolveBinding().getModifiers()))
+				||
+			DOMCompletionUtils.findParent(this.toComplete, new int[] { ASTNode.INITIALIZER }) != null){
+			keywords.add(Keywords.SUPER);
+		}
 		keywords.add(Keywords.NEW);
 
 		{
@@ -3488,8 +3495,7 @@ private void statementLikeKeywords() {
 				keywords.add(Keywords.INSTANCEOF);
 			}
 		}
-
-		if (!this.expectedTypes.getExpectedTypes().isEmpty()) {
+		if (isExpressionExpected) {
 			keywords.add(Keywords.NULL);
 		}
 		if (DOMCompletionUtils.findParent(this.toComplete,