Attachment #59976 for bug #175834

View | Details | Raw Unified | Return to bug 175834
Collapse All | Expand All

Lines 52-58 Link Here

(-)buildnotes_jdt-core.html (-1 / +3 lines)
52	<h2>What's new in this drop</h2>	52	<h2>What's new in this drop</h2>
53		53
54	<h3>Problem Reports Fixed</h3>	54	<h3>Problem Reports Fixed</h3>
55	<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=175531">175531</a>	55	<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=175834">175834</a>
		56	[assist] already defined name is proposed as variable name
		57	<br><a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=175531">175531</a>
56	Livelock in OverflowingLRUCache.privateRemoveEntry	58	Livelock in OverflowingLRUCache.privateRemoveEntry
57		59
58	<a name="v_739"></a>	60	<a name="v_739"></a>

Lines 3746-3751 Link Here

(-)codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionParser.java (+2 lines)
3746	referenceContext = fakeMethod;	3746	referenceContext = fakeMethod;
3747	compilationUnit = unit;	3747	compilationUnit = unit;
3748		3748
		3749	this.restartRecovery = true;
		3750
3749	scanner.resetTo(start, end);	3751	scanner.resetTo(start, end);
3750	consumeNestedMethod();	3752	consumeNestedMethod();
3751	try {	3753	try {




			"zzzTest2[VARIABLE_DECLARATION]{zzzTest2, null, Ltest.Test2;, zzzTest2, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}",
			requestor.getResults());
}
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=175834
public void testCompletionVariableName36() throws JavaModelException {
	this.workingCopies = new ICompilationUnit[1];
	this.workingCopies[0] = getWorkingCopy(
            "/Completion/src/test/Test.java",
            "package test;\n"+
            "public class Test {\n"+
            "	void bar() {\n"+
            "		/**/int varzz\n"+
            "		{\n"+
            "			int varzz1 = 0;\n"+
            "			varzz1 = 0;\n"+
            "		}\n"+
            "		int varzz2 = 0;\n"+
            "		#\n"+
            "	}\n"+
            "}");
    
    CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
    String str = this.workingCopies[0].getSource();
    String completeBehind = "/**/int varzz";
    int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
    this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);

    assertResults(
			"varzzI[VARIABLE_DECLARATION]{varzzI, null, I, varzzI, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}",
			requestor.getResults());
}
public void testCompletionVariableName4() throws JavaModelException {
	this.wc = getWorkingCopy(
            "/Completion/src/CompletionVariableName4.java",

Return to bug 175834

Lines 12379-12384 Link Here

(-)src/org/eclipse/jdt/core/tests/model/CompletionTests.java (+28 lines)
12379	"zzzTest2[VARIABLE_DECLARATION]{zzzTest2, null, Ltest.Test2;, zzzTest2, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}",	12379	"zzzTest2[VARIABLE_DECLARATION]{zzzTest2, null, Ltest.Test2;, zzzTest2, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}",
12380	requestor.getResults());	12380	requestor.getResults());
12381	}	12381	}
		12382	//https://bugs.eclipse.org/bugs/show_bug.cgi?id=175834
		12383	public void testCompletionVariableName36() throws JavaModelException {
		12384	this.workingCopies = new ICompilationUnit[1];
		12385	this.workingCopies[0] = getWorkingCopy(
		12386	"/Completion/src/test/Test.java",
		12387	"package test;\n"+
		12388	"public class Test {\n"+
		12389	" void bar() {\n"+
		12390	" /**/int varzz\n"+
		12391	" {\n"+
		12392	" int varzz1 = 0;\n"+
		12393	" varzz1 = 0;\n"+
		12394	" }\n"+
		12395	" int varzz2 = 0;\n"+
		12396	" #\n"+
		12397	" }\n"+
		12398	"}");
		12399
		12400	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
		12401	String str = this.workingCopies[0].getSource();
		12402	String completeBehind = "/**/int varzz";
		12403	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
		12404	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
		12405
		12406	assertResults(
		12407	"varzzI[VARIABLE_DECLARATION]{varzzI, null, I, varzzI, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}",
		12408	requestor.getResults());
		12409	}
12382	public void testCompletionVariableName4() throws JavaModelException {	12410	public void testCompletionVariableName4() throws JavaModelException {
12383	this.wc = getWorkingCopy(	12411	this.wc = getWorkingCopy(
12384	"/Completion/src/CompletionVariableName4.java",	12412	"/Completion/src/CompletionVariableName4.java",