Attachment 170505 Details for Bug 195346 – proposed fix v1.0 + regression tests

[patch] proposed fix v1.0 + regression tests

patch195346.txt (text/plain), 13.05 KB, created by Ayushman Jain

on 2010-05-31 06:08:47 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Ayushman Jain

Created: 2010-05-31 06:08:47 EDT

Size: 13.05 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.core
>Index: codeassist/org/eclipse/jdt/internal/codeassist/CompletionEngine.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/CompletionEngine.java,v
>retrieving revision 1.411
>diff -u -r1.411 CompletionEngine.java
>--- codeassist/org/eclipse/jdt/internal/codeassist/CompletionEngine.java	22 Apr 2010 16:11:44 -0000	1.411
>+++ codeassist/org/eclipse/jdt/internal/codeassist/CompletionEngine.java	31 May 2010 10:02:50 -0000
>@@ -522,6 +522,8 @@
> 	boolean assistNodeIsExtendedType;
> 	int  assistNodeInJavadoc = 0;
> 	boolean assistNodeCanBeSingleMemberAnnotation = false;
>+	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=195346
>+	boolean assistNodeIsInsideCase = false;
> 	
> 	long targetedElement;
> 	
>@@ -1625,6 +1627,19 @@
> 		}
> 
> 		buildContext(astNode, astNodeParent, compilationUnitDeclaration, qualifiedBinding, scope);
>+		
>+		// To find whether we're completing inside the case expression in a 
>+		// switch case construct (https://bugs.eclipse.org/bugs/show_bug.cgi?id=195346)
>+		if (astNodeParent instanceof SwitchStatement) {
>+			CaseStatement[] cases = ((SwitchStatement) astNodeParent).cases;
>+			for (int i = 0; i < ((SwitchStatement) astNodeParent).caseCount; i++) {
>+				CompletionNodeDetector detector = new CompletionNodeDetector(astNode, cases[i]);
>+				if (detector.containsCompletionNode()) {
>+					this.assistNodeIsInsideCase = true;
>+					break;
>+				}
>+			}
>+		}
> 
> 		if (astNode instanceof CompletionOnFieldType) {
> 			completionOnFieldType(astNode, scope);
>@@ -4086,6 +4101,13 @@
> 		return 0;
> 	}
> 
>+	private int computeRelevanceForFinal(boolean onlyFinal, boolean isFinal) {
>+		if (onlyFinal && isFinal) {
>+			return R_FINAL;
>+		}
>+		return 0;
>+	}
>+	
> 	private long computeTargetedElement(CompletionOnAnnotationOfType fakeNode) {
> 		ASTNode annotatedElement = fakeNode.potentialAnnotatedNode;
> 
>@@ -5947,7 +5969,12 @@
> 
> 			if (this.options.checkVisibility
> 				&& !field.canBeSeenBy(receiverType, invocationSite, scope))	continue next;
>-
>+			
>+			// dont propose array types in case expression
>+			// https://bugs.eclipse.org/bugs/show_bug.cgi?id=195346
>+			if (this.assistNodeIsInsideCase && field.type instanceof ArrayBinding)
>+				continue next;
>+			
> 			boolean prefixRequired = false;
> 
> 			for (int i = fieldsFound.size; --i >= 0;) {
>@@ -6034,6 +6061,7 @@
> 			relevance += computeRelevanceForExpectingType(field.type);
> 			relevance += computeRelevanceForEnumConstant(field.type);
> 			relevance += computeRelevanceForStatic(onlyStaticFields, field.isStatic());
>+			relevance += computeRelevanceForFinal(this.assistNodeIsInsideCase, field.isFinal());
> 			relevance += computeRelevanceForQualification(prefixRequired);
> 			relevance += computeRelevanceForRestrictions(IAccessRule.K_ACCESSIBLE);
> 			if (onlyStaticFields && this.insideQualifiedReference) {
>@@ -11329,6 +11357,7 @@
> 							relevance += computeRelevanceForEnumConstant(local.type);
> 							relevance += computeRelevanceForQualification(false);
> 							relevance += computeRelevanceForRestrictions(IAccessRule.K_ACCESSIBLE); // no access restriction for local variable
>+							relevance += computeRelevanceForFinal(this.assistNodeIsInsideCase, local.isFinal());
> 							this.noProposal = false;
> 							if(!this.requestor.isIgnored(CompletionProposal.LOCAL_VARIABLE_REF)) {
> 								InternalCompletionProposal proposal =  createProposal(CompletionProposal.LOCAL_VARIABLE_REF, this.actualCompletionPosition);
>Index: codeassist/org/eclipse/jdt/internal/codeassist/RelevanceConstants.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/RelevanceConstants.java,v
>retrieving revision 1.37
>diff -u -r1.37 RelevanceConstants.java
>--- codeassist/org/eclipse/jdt/internal/codeassist/RelevanceConstants.java	9 Jul 2009 10:47:41 -0000	1.37
>+++ codeassist/org/eclipse/jdt/internal/codeassist/RelevanceConstants.java	31 May 2010 10:02:50 -0000
>@@ -53,4 +53,6 @@
> 	int R_NO_PROBLEMS = 1;
> 	int R_RESOLVED = 1;
> 	int R_TARGET = 5;
>+	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=195346
>+	int R_FINAL = 1;
> }
>#P org.eclipse.jdt.core.tests.model
>Index: src/org/eclipse/jdt/core/tests/model/CompletionTests.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/CompletionTests.java,v
>retrieving revision 1.219
>diff -u -r1.219 CompletionTests.java
>--- src/org/eclipse/jdt/core/tests/model/CompletionTests.java	22 Apr 2010 16:12:50 -0000	1.219
>+++ src/org/eclipse/jdt/core/tests/model/CompletionTests.java	31 May 2010 10:03:36 -0000
>@@ -1897,7 +1897,7 @@
> 	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
> 
> 	assertResults(
>-			"zzz[FIELD_REF]{zzz, LCompletionAfterCase1;, I, zzz, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_EXACT_EXPECTED_TYPE + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED) + "}",
>+			"zzz[FIELD_REF]{zzz, LCompletionAfterCase1;, I, zzz, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_EXACT_EXPECTED_TYPE + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED + R_FINAL) + "}",
> 			requestor.getResults());
> }
> public void testCompletionAfterCase2() throws JavaModelException {
>@@ -1921,7 +1921,7 @@
> 	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
> 
> 	assertResults(
>-			"zzz[FIELD_REF]{zzz, LCompletionAfterCase2;, I, zzz, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_EXACT_EXPECTED_TYPE + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED) + "}",
>+			"zzz[FIELD_REF]{zzz, LCompletionAfterCase2;, I, zzz, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_EXACT_EXPECTED_TYPE + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED + R_FINAL) + "}",
> 			requestor.getResults());
> }
> //https://bugs.eclipse.org/bugs/show_bug.cgi?id=111882
>@@ -1952,13 +1952,11 @@
> 	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
> 
> 	assertResults(
>-			"ZZZ2[FIELD_REF]{ZZZ2, Ltest.CompletionAfterCase2;, J, ZZZ2, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED) + "}\n" +
>-			"ZZZ3[FIELD_REF]{ZZZ3, Ltest.CompletionAfterCase2;, D, ZZZ3, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED) + "}\n" +
>-			"ZZZ4[FIELD_REF]{ZZZ4, Ltest.CompletionAfterCase2;, Ljava.lang.Object;, ZZZ4, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED) + "}\n" +
>-			"ZZZ5[FIELD_REF]{ZZZ5, Ltest.CompletionAfterCase2;, [I, ZZZ5, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED) + "}\n" +
>-			"ZZZ6[FIELD_REF]{ZZZ6, Ltest.CompletionAfterCase2;, [Ljava.lang.Object;, ZZZ6, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED) + "}\n" +
>-			"ZZZ7[FIELD_REF]{ZZZ7, Ltest.CompletionAfterCase2;, S, ZZZ7, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_EXPECTED_TYPE + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED) + "}\n" +
>-			"ZZZ1[FIELD_REF]{ZZZ1, Ltest.CompletionAfterCase2;, I, ZZZ1, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_EXACT_EXPECTED_TYPE + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED) + "}",
>+			"ZZZ2[FIELD_REF]{ZZZ2, Ltest.CompletionAfterCase2;, J, ZZZ2, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED + R_FINAL) + "}\n" +
>+			"ZZZ3[FIELD_REF]{ZZZ3, Ltest.CompletionAfterCase2;, D, ZZZ3, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED + R_FINAL) + "}\n" +
>+			"ZZZ4[FIELD_REF]{ZZZ4, Ltest.CompletionAfterCase2;, Ljava.lang.Object;, ZZZ4, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED + R_FINAL) + "}\n" +
>+			"ZZZ7[FIELD_REF]{ZZZ7, Ltest.CompletionAfterCase2;, S, ZZZ7, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_EXPECTED_TYPE + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED + R_FINAL) + "}\n" +
>+			"ZZZ1[FIELD_REF]{ZZZ1, Ltest.CompletionAfterCase2;, I, ZZZ1, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_EXACT_EXPECTED_TYPE + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED + R_FINAL) + "}",
> 			requestor.getResults());
> }
> //https://bugs.eclipse.org/bugs/show_bug.cgi?id=111882
>@@ -1995,13 +1993,11 @@
> 	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
> 
> 	assertResults(
>-			"ZZZ2[FIELD_REF]{ZZZ2, Ltest.TestConstants;, J, ZZZ2, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_QUALIFIED+ R_NON_RESTRICTED) + "}\n" +
>-			"ZZZ3[FIELD_REF]{ZZZ3, Ltest.TestConstants;, D, ZZZ3, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_QUALIFIED+ R_NON_RESTRICTED) + "}\n" +
>-			"ZZZ4[FIELD_REF]{ZZZ4, Ltest.TestConstants;, Ljava.lang.Object;, ZZZ4, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_QUALIFIED+ R_NON_RESTRICTED) + "}\n" +
>-			"ZZZ5[FIELD_REF]{ZZZ5, Ltest.TestConstants;, [I, ZZZ5, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_QUALIFIED+ R_NON_RESTRICTED) + "}\n" +
>-			"ZZZ6[FIELD_REF]{ZZZ6, Ltest.TestConstants;, [Ljava.lang.Object;, ZZZ6, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_QUALIFIED+ R_NON_RESTRICTED) + "}\n" +
>-			"ZZZ7[FIELD_REF]{ZZZ7, Ltest.TestConstants;, S, ZZZ7, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_EXPECTED_TYPE + R_CASE + R_QUALIFIED+ R_NON_RESTRICTED) + "}\n" +
>-			"ZZZ1[FIELD_REF]{ZZZ1, Ltest.TestConstants;, I, ZZZ1, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_EXACT_EXPECTED_TYPE + R_CASE + R_QUALIFIED+ R_NON_RESTRICTED) + "}",
>+			"ZZZ2[FIELD_REF]{ZZZ2, Ltest.TestConstants;, J, ZZZ2, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_QUALIFIED + R_NON_RESTRICTED + R_FINAL) + "}\n" +
>+			"ZZZ3[FIELD_REF]{ZZZ3, Ltest.TestConstants;, D, ZZZ3, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_QUALIFIED + R_NON_RESTRICTED + R_FINAL) + "}\n" +
>+			"ZZZ4[FIELD_REF]{ZZZ4, Ltest.TestConstants;, Ljava.lang.Object;, ZZZ4, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_QUALIFIED + R_NON_RESTRICTED + R_FINAL) + "}\n" +
>+			"ZZZ7[FIELD_REF]{ZZZ7, Ltest.TestConstants;, S, ZZZ7, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_EXPECTED_TYPE + R_CASE + R_QUALIFIED + R_NON_RESTRICTED + R_FINAL) + "}\n" +
>+			"ZZZ1[FIELD_REF]{ZZZ1, Ltest.TestConstants;, I, ZZZ1, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_EXACT_EXPECTED_TYPE + R_CASE + R_QUALIFIED + R_NON_RESTRICTED + R_FINAL) + "}",
> 			requestor.getResults());
> }
> //https://bugs.eclipse.org/bugs/show_bug.cgi?id=222080
>@@ -21333,4 +21329,42 @@
> 			"toString[METHOD_REF]{toString(), Ljava.lang.Object;, ()Ljava.lang.String;, null, null, toString, null, replace[" + start1 + ", " + end1 + "], token[" + start1 + ", " + end1 +"], " + relevance1 + "}",
> 			requestor.getResults());
> }
>+
>+// https://bugs.eclipse.org/bugs/show_bug.cgi?id=195346
>+// To verify that array types arent proposed inside case, and also
>+// that finals have a higher proriority in suggestions inside case expressions.
>+public void testBug195346() throws JavaModelException {
>+	this.workingCopies = new ICompilationUnit[1];
>+	this.workingCopies[0] = getWorkingCopy(
>+		"/Completion/src/test/CompletionAfterCase2.java",
>+		"package test;\n" +
>+		"public class CompletionAfterCase2 {\n" +
>+		"	static char[] AN_ARRAY = new char[10];\n" +
>+		"	static int AN_INT_VALUE = 0;\n" +
>+		"	static final int AN_INT_VALUE2 = 0;\n" +
>+		"	static final char[] AN_ARRAY2 = {'a','b'};\n" +
>+		"	static final int[] AN_INT_ARRAY = null;\n" +
>+		"	static final Object[] ANOTHER_ARRAY = null;\n" +
>+		"	void foo(int i){\n" +
>+		"		final int AN_INT_VAR = 1;\n" +
>+		"		int AN_INT_VAR2 = 1;\n" +
>+		"		switch(i) {\n" +
>+		"			case AN\n" +
>+		"		}\n" +
>+		"	}\n" +
>+		"}\n");
>+
>+	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+	String str = this.workingCopies[0].getSource();
>+	String completeBehind = "AN";
>+	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
>+
>+	assertResults(
>+			"AN_INT_VALUE[FIELD_REF]{AN_INT_VALUE, Ltest.CompletionAfterCase2;, I, AN_INT_VALUE, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED + R_EXACT_EXPECTED_TYPE) + "}\n" +
>+			"AN_INT_VAR2[LOCAL_VARIABLE_REF]{AN_INT_VAR2, null, I, AN_INT_VAR2, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED + R_EXACT_EXPECTED_TYPE) + "}\n" +
>+			"AN_INT_VALUE2[FIELD_REF]{AN_INT_VALUE2, Ltest.CompletionAfterCase2;, I, AN_INT_VALUE2, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED + R_EXACT_EXPECTED_TYPE + R_FINAL) + "}\n" +
>+			"AN_INT_VAR[LOCAL_VARIABLE_REF]{AN_INT_VAR, null, I, AN_INT_VAR, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED + R_EXACT_EXPECTED_TYPE + R_FINAL) + "}",
>+			requestor.getResults());
>+}
> }

Actions: View | Diff

Attachments on bug 195346: 170505 | 170675 | 172318