Attachment #179380 for bug #312603

Lines 195-200 Link Here

(-)codeassist/org/eclipse/jdt/internal/codeassist/InternalExtendedCompletionContext.java (+9 lines)
195	if (this.visibleFields.size > 0 && this.visibleFields.contains(fieldDeclaration.binding)) {	195	if (this.visibleFields.size > 0 && this.visibleFields.contains(fieldDeclaration.binding)) {
196	this.visibleFields.remove(fieldDeclaration.binding);	196	this.visibleFields.remove(fieldDeclaration.binding);
197	}	197	}
		198	int count = 0;
		199	while (count < this.visibleFields.size) {
		200	FieldBinding visibleField = (FieldBinding)this.visibleFields.elementAt(count);
		201	if (visibleField.id > fieldDeclaration.binding.id) {
		202	this.visibleFields.remove(visibleField);
		203	continue;
		204	}
		205	count++;
		206	}
198	break done;	207	break done;
199	}	208	}
200	/*(Incase fieldDeclaration != null is not sufficient to infer that	209	/*(Incase fieldDeclaration != null is not sufficient to infer that




		"}",
		result.context);
}

// https://bugs.eclipse.org/bugs/show_bug.cgi?id=312603
public void test0177() throws JavaModelException {
	this.workingCopies = new ICompilationUnit[3];
	this.workingCopies[0] = getWorkingCopy(
		"/Completion/src3/test/X.java",
		"package test;\n" +
		"import java.text.MessageFormat;\n" +
		"public class X {\n" +
		"    String fooBar = \"Hi\";" +
		"	 String furchtbar= MessageFormat.format\n" +
		"    String abc1 = \"Hi\";" +
		"    String abc2 = \"Hi\";" +
		"    String abc3 = \"Hi\";" +
		"    String abc4 = \"Hi\";" +
		"}");

	String str = this.workingCopies[0].getSource();
	int tokenStart = str.lastIndexOf("format");
	int tokenEnd = tokenStart + "format".length() - 1;
	int cursorLocation = str.lastIndexOf("format") + "format".length();

	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation, true, true);
	String jclPath = getExternalJCLPathString();
	assertResults(
		"completion offset="+(cursorLocation)+"\n" +
		"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
		"completion token=\"format\"\n" +
		"completion token kind=TOKEN_KIND_NAME\n" +
		"expectedTypesSignatures={Ljava.lang.String;}\n" +
		"expectedTypesKeys={Ljava/lang/String;}\n" +
		"completion token location=UNKNOWN\n" +
		"enclosingElement=furchtbar {key=Ltest/X;.furchtbar)Ljava/lang/String;} [in X [in [Working copy] X.java [in test [in src3 [in Completion]]]]]\n" +
		"visibleElements={\n" +
		"	fooBar {key=Ltest/X;.fooBar)Ljava/lang/String;} [in X [in [Working copy] X.java [in test [in src3 [in Completion]]]]],\n" +
		"	wait(long, int) {key=Ljava/lang/Object;.wait(JI)V|Ljava/lang/IllegalMonitorStateException;|Ljava/lang/InterruptedException;} [in Object [in Object.class [in java.lang [in " + jclPath + "]]]],\n" +
		"	wait(long) {key=Ljava/lang/Object;.wait(J)V|Ljava/lang/IllegalMonitorStateException;|Ljava/lang/InterruptedException;} [in Object [in Object.class [in java.lang [in " + jclPath + "]]]],\n" +
		"	wait() {key=Ljava/lang/Object;.wait()V|Ljava/lang/IllegalMonitorStateException;|Ljava/lang/InterruptedException;} [in Object [in Object.class [in java.lang [in " + jclPath + "]]]],\n" +
		"	toString() {key=Ljava/lang/Object;.toString()Ljava/lang/String;} [in Object [in Object.class [in java.lang [in " + jclPath + "]]]],\n" +
		"	notifyAll() {key=Ljava/lang/Object;.notifyAll()V|Ljava/lang/IllegalMonitorStateException;} [in Object [in Object.class [in java.lang [in " + jclPath + "]]]],\n" +
		"	notify() {key=Ljava/lang/Object;.notify()V|Ljava/lang/IllegalMonitorStateException;} [in Object [in Object.class [in java.lang [in " + jclPath + "]]]],\n" +
		"	hashCode() {key=Ljava/lang/Object;.hashCode()I} [in Object [in Object.class [in java.lang [in " + jclPath + "]]]],\n" +
		"	getClass() {key=Ljava/lang/Object;.getClass()Ljava/lang/Class;} [in Object [in Object.class [in java.lang [in " + jclPath +"]]]],\n" +
		"	finalize() {key=Ljava/lang/Object;.finalize()V|Ljava/lang/Throwable;} [in Object [in Object.class [in java.lang [in " + jclPath + "]]]],\n" +
		"	equals(java.lang.Object) {key=Ljava/lang/Object;.equals(Ljava/lang/Object;)Z} [in Object [in Object.class [in java.lang [in " + jclPath + "]]]],\n" +
		"	clone() {key=Ljava/lang/Object;.clone()Ljava/lang/Object;|Ljava/lang/CloneNotSupportedException;} [in Object [in Object.class [in java.lang [in " + jclPath +"]]]],\n" +
		"}",
		result.context);
}
}




            "myString2[FIELD_REF]{myString2, Ltest.X;, Ljava.lang.String;, myString2, null, " + (R_NON_STATIC + R_UNQUALIFIED + R_CASE + R_NON_RESTRICTED) + "}",
            requestor.getResults());
}
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=312603
public void test312603() throws JavaModelException {
	this.workingCopies = new ICompilationUnit[1];
	this.workingCopies[0] = getWorkingCopy(
			"/Completion/src3/test/X.java",
			"package test;\n" +
			"public class X {\n" +
			"    void foo(String s) {}\n" +
			"    String myString = \"\";\n" +
			"    String myString2 = foo(my\n" +
			"}");

	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
	String str = this.workingCopies[0].getSource();
	final String completeBehind = "String myString2 = foo(my";
	int cursorLocation = str.lastIndexOf(completeBehind) +
	completeBehind.length();
	this.workingCopies[0].codeComplete(cursorLocation, requestor,
			this.wcOwner);

	assertResults(
			"MyClass[TYPE_REF]{mypackage.MyClass, mypackage, Lmypackage.MyClass;, null, null, 14}\n" + 
			"mypackage[PACKAGE_REF]{mypackage, mypackage, null, null, null, 24}\n" + 
			"myString[FIELD_REF]{myString, Ltest.X;, Ljava.lang.String;, myString, null, 57}",
			requestor.getResults());
}
}

Return to bug 312603

Lines 5425-5428 Link Here

(-)src/org/eclipse/jdt/core/tests/model/CompletionContextTests.java (+49 lines)
5425	"}",	5425	"}",
5426	result.context);	5426	result.context);
5427	}	5427	}
		5428
		5429	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=312603
		5430	public void test0177() throws JavaModelException {
		5431	this.workingCopies = new ICompilationUnit[3];
		5432	this.workingCopies[0] = getWorkingCopy(
		5433	"/Completion/src3/test/X.java",
		5434	"package test;\n" +
		5435	"import java.text.MessageFormat;\n" +
		5436	"public class X {\n" +
		5437	" String fooBar = \"Hi\";" +
		5438	" String furchtbar= MessageFormat.format\n" +
		5439	" String abc1 = \"Hi\";" +
		5440	" String abc2 = \"Hi\";" +
		5441	" String abc3 = \"Hi\";" +
		5442	" String abc4 = \"Hi\";" +
		5443	"}");
		5444
		5445	String str = this.workingCopies[0].getSource();
		5446	int tokenStart = str.lastIndexOf("format");
		5447	int tokenEnd = tokenStart + "format".length() - 1;
		5448	int cursorLocation = str.lastIndexOf("format") + "format".length();
		5449
		5450	CompletionResult result = contextComplete(this.workingCopies[0], cursorLocation, true, true);
		5451	String jclPath = getExternalJCLPathString();
		5452	assertResults(
		5453	"completion offset="+(cursorLocation)+"\n" +
		5454	"completion range=["+(tokenStart)+", "+(tokenEnd)+"]\n" +
		5455	"completion token=\"format\"\n" +
		5456	"completion token kind=TOKEN_KIND_NAME\n" +
		5457	"expectedTypesSignatures={Ljava.lang.String;}\n" +
		5458	"expectedTypesKeys={Ljava/lang/String;}\n" +
		5459	"completion token location=UNKNOWN\n" +
		5460	"enclosingElement=furchtbar {key=Ltest/X;.furchtbar)Ljava/lang/String;} [in X [in [Working copy] X.java [in test [in src3 [in Completion]]]]]\n" +
		5461	"visibleElements={\n" +
		5462	" fooBar {key=Ltest/X;.fooBar)Ljava/lang/String;} [in X [in [Working copy] X.java [in test [in src3 [in Completion]]]]],\n" +
		5463	" wait(long, int) {key=Ljava/lang/Object;.wait(JI)V\|Ljava/lang/IllegalMonitorStateException;\|Ljava/lang/InterruptedException;} [in Object [in Object.class [in java.lang [in " + jclPath + "]]]],\n" +
		5464	" wait(long) {key=Ljava/lang/Object;.wait(J)V\|Ljava/lang/IllegalMonitorStateException;\|Ljava/lang/InterruptedException;} [in Object [in Object.class [in java.lang [in " + jclPath + "]]]],\n" +
		5465	" wait() {key=Ljava/lang/Object;.wait()V\|Ljava/lang/IllegalMonitorStateException;\|Ljava/lang/InterruptedException;} [in Object [in Object.class [in java.lang [in " + jclPath + "]]]],\n" +
		5466	" toString() {key=Ljava/lang/Object;.toString()Ljava/lang/String;} [in Object [in Object.class [in java.lang [in " + jclPath + "]]]],\n" +
		5467	" notifyAll() {key=Ljava/lang/Object;.notifyAll()V\|Ljava/lang/IllegalMonitorStateException;} [in Object [in Object.class [in java.lang [in " + jclPath + "]]]],\n" +
		5468	" notify() {key=Ljava/lang/Object;.notify()V\|Ljava/lang/IllegalMonitorStateException;} [in Object [in Object.class [in java.lang [in " + jclPath + "]]]],\n" +
		5469	" hashCode() {key=Ljava/lang/Object;.hashCode()I} [in Object [in Object.class [in java.lang [in " + jclPath + "]]]],\n" +
		5470	" getClass() {key=Ljava/lang/Object;.getClass()Ljava/lang/Class;} [in Object [in Object.class [in java.lang [in " + jclPath +"]]]],\n" +
		5471	" finalize() {key=Ljava/lang/Object;.finalize()V\|Ljava/lang/Throwable;} [in Object [in Object.class [in java.lang [in " + jclPath + "]]]],\n" +
		5472	" equals(java.lang.Object) {key=Ljava/lang/Object;.equals(Ljava/lang/Object;)Z} [in Object [in Object.class [in java.lang [in " + jclPath + "]]]],\n" +
		5473	" clone() {key=Ljava/lang/Object;.clone()Ljava/lang/Object;\|Ljava/lang/CloneNotSupportedException;} [in Object [in Object.class [in java.lang [in " + jclPath +"]]]],\n" +
		5474	"}",
		5475	result.context);
		5476	}
5428	}	5477	}

Lines 21764-21767 Link Here

(-)src/org/eclipse/jdt/core/tests/model/CompletionTests.java (+26 lines)
21764	"myString2[FIELD_REF]{myString2, Ltest.X;, Ljava.lang.String;, myString2, null, " + (R_NON_STATIC + R_UNQUALIFIED + R_CASE + R_NON_RESTRICTED) + "}",	21764	"myString2[FIELD_REF]{myString2, Ltest.X;, Ljava.lang.String;, myString2, null, " + (R_NON_STATIC + R_UNQUALIFIED + R_CASE + R_NON_RESTRICTED) + "}",
21765	requestor.getResults());	21765	requestor.getResults());
21766	}	21766	}
		21767	//https://bugs.eclipse.org/bugs/show_bug.cgi?id=312603
		21768	public void test312603() throws JavaModelException {
		21769	this.workingCopies = new ICompilationUnit[1];
		21770	this.workingCopies[0] = getWorkingCopy(
		21771	"/Completion/src3/test/X.java",
		21772	"package test;\n" +
		21773	"public class X {\n" +
		21774	" void foo(String s) {}\n" +
		21775	" String myString = \"\";\n" +
		21776	" String myString2 = foo(my\n" +
		21777	"}");
		21778
		21779	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
		21780	String str = this.workingCopies[0].getSource();
		21781	final String completeBehind = "String myString2 = foo(my";
		21782	int cursorLocation = str.lastIndexOf(completeBehind) +
		21783	completeBehind.length();
		21784	this.workingCopies[0].codeComplete(cursorLocation, requestor,
		21785	this.wcOwner);
		21786
		21787	assertResults(
		21788	"MyClass[TYPE_REF]{mypackage.MyClass, mypackage, Lmypackage.MyClass;, null, null, 14}\n" +
		21789	"mypackage[PACKAGE_REF]{mypackage, mypackage, null, null, null, 24}\n" +
		21790	"myString[FIELD_REF]{myString, Ltest.X;, Ljava.lang.String;, myString, null, 57}",
		21791	requestor.getResults());
		21792	}
21767	}	21793	}