Attachment #88560 for bug #212100




					this.requestedKeys.removeKey(fileName);
				} finally {
					// cleanup compilation unit result
//					unit.cleanUp();
				}
//				this.unitsToProcess[i] = null; // release reference to processed unit declaration
				this.requestor.acceptResult(unit.compilationResult.tagAsAccepted());
			}


			this.handleInternalException(e, unit, null);
			throw e; // rethrow
		} finally {
			// clean up and release reference to processed units
			for (int n=0; n < this.totalUnits; n++) {
				if (this.unitsToProcess[n] != null) {
					this.unitsToProcess[n].cleanUp();
					this.unitsToProcess[n] = null;
				}
			}
			// disconnect ourselves from ast requestor
			astRequestor.compilationUnitResolver = null;
		}




import org.eclipse.jdt.core.IClassFile;
import org.eclipse.jdt.core.ICompilationUnit;
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.jdt.core.WorkingCopyOwner;
import org.eclipse.jdt.core.dom.*;


}

/**
 * @bug 212100: [dom] Can't create binding to inner class
 * @test Verify that the binding is well created for an inner class
 * @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=212100"
 */
public void testBug212100a() throws JavaModelException {
	workingCopies = new ICompilationUnit[1];
	this.workingCopies[0] = getWorkingCopy("/Converter15/src/X.java", true/*resolve*/);
	String contents =
		"public class X {\n" +
		"	public class Y {\n" +
		"      void foo() {}\n" +
		"   }\n" +
		"}";
	this.workingCopies[0].getBuffer().setContents(contents);
	this.workingCopies[0].save(null, true);
	final IBinding[] bindings = new IBinding[4];
	final String key = "Ljava/lang/Object;"; // this will make the test fail
//	final String key = "LX;"; // this would make the test pass

	resolveASTs(this.workingCopies,
			new String[] { key },
			new ASTRequestor() {
				public void acceptBinding(String bindingKey, IBinding binding) {
					if (key.equals(bindingKey)) {
						bindings[0] = binding;
						IBinding[] temp = createBindings(new String[] {"LX;", "LX$Y;", "[LX$Y;"});
						for (int i = 0; i < temp.length; ++i) {
							bindings[i + 1] = temp[i];
						}
					}
				}
			},
			getJavaProject("Converter15"),
			null);
	assertNotNull("Binding for java.lang.Object should not be null", bindings[0]);
	assertNotNull("Binding for X should not be null", bindings[1]);
	assertNotNull("Binding for X.Y should not be null", bindings[2]);
	assertNotNull("Binding for X.Y[] should not be null", bindings[3]);
}
public void testONLY_Bug212100b() throws JavaModelException {
	this.workingCopies = new ICompilationUnit[2];
	this.workingCopies[0] = getWorkingCopy("/Converter15/src/X.java", true/*resolve*/);
	String contents =
		"public class X {\n" +
		"	public class Y {\n" +
		"      void foo() {}\n" +
		"   }\n" +
		"}";
	this.workingCopies[0].getBuffer().setContents(contents);
	this.workingCopies[0].save(null, true);

	this.workingCopies[1] = getWorkingCopy("/Converter15/src/Z.java", true/*resolve*/);
	String contentsZ =
		"public class Z {\n" +
		"	public class W {\n" +
		"      void bar() {}\n" +
		"   }\n" +
		"}";
	this.workingCopies[1].getBuffer().setContents(contentsZ);
	this.workingCopies[1].save(null, true);

	final String keyX = "LX;";
	final String keyXY = "LX$Y;";
	final String keyZ = "LZ;";
	final String keyZW = "LZ$W;";

	resolveASTs(this.workingCopies,
			new String[] { keyX, keyZ },
			new ASTRequestor() {
				public void acceptBinding(String bindingKey, IBinding binding) {
					IBinding[] bindings = createBindings(new String[] {
							keyX, keyXY, keyZ, keyZW
					});
					assertNotNull("When accepting " + bindingKey + ", Binding for X should not be null", bindings[0]);
					assertNotNull("When accepting " + bindingKey + ", Binding for X.Y should not be null", bindings[1]);
					assertNotNull("When accepting " + bindingKey + ", Binding for Z should not be null", bindings[2]);
					assertNotNull("When accepting " + bindingKey + ", Binding for Z.W should not be null", bindings[3]);
				}
			},
			getJavaProject("Converter15"),
			null);
}

/**
 * @bug 212834: [dom] IMethodBinding.getParameterAnnotations does not return annotations
 * @test Ensures that the method binding get the parameter annotations even on method invocation
 * @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=212834"

Return to bug 212100

Lines 741-749 Link Here

(-)dom/org/eclipse/jdt/core/dom/CompilationUnitResolver.java (-2 / +9 lines)
741	this.requestedKeys.removeKey(fileName);	741	this.requestedKeys.removeKey(fileName);
742	} finally {	742	} finally {
743	// cleanup compilation unit result	743	// cleanup compilation unit result
744	unit.cleanUp();	744	// unit.cleanUp();
745	}	745	}
746	this.unitsToProcess[i] = null; // release reference to processed unit declaration	746	// this.unitsToProcess[i] = null; // release reference to processed unit declaration
747	this.requestor.acceptResult(unit.compilationResult.tagAsAccepted());	747	this.requestor.acceptResult(unit.compilationResult.tagAsAccepted());
748	}	748	}
749		749
Lines 770-775 Link Here
770	this.handleInternalException(e, unit, null);	770	this.handleInternalException(e, unit, null);
771	throw e; // rethrow	771	throw e; // rethrow
772	} finally {	772	} finally {
		773	// clean up and release reference to processed units
		774	for (int n=0; n < this.totalUnits; n++) {
		775	if (this.unitsToProcess[n] != null) {
		776	this.unitsToProcess[n].cleanUp();
		777	this.unitsToProcess[n] = null;
		778	}
		779	}
773	// disconnect ourselves from ast requestor	780	// disconnect ourselves from ast requestor
774	astRequestor.compilationUnitResolver = null;	781	astRequestor.compilationUnitResolver = null;
775	}	782	}

Lines 19-24 Link Here

(-)src/org/eclipse/jdt/core/tests/dom/ASTConverterBugsTest.java (+85 lines)
19	import org.eclipse.jdt.core.IClassFile;	19	import org.eclipse.jdt.core.IClassFile;
20	import org.eclipse.jdt.core.ICompilationUnit;	20	import org.eclipse.jdt.core.ICompilationUnit;
21	import org.eclipse.jdt.core.IJavaProject;	21	import org.eclipse.jdt.core.IJavaProject;
		22	import org.eclipse.jdt.core.JavaModelException;
22	import org.eclipse.jdt.core.WorkingCopyOwner;	23	import org.eclipse.jdt.core.WorkingCopyOwner;
23	import org.eclipse.jdt.core.dom.*;	24	import org.eclipse.jdt.core.dom.*;
24		25
Lines 231-236 Link Here
231	}	232	}
232		233
233	/**	234	/**
		235	* @bug 212100: [dom] Can't create binding to inner class
		236	* @test Verify that the binding is well created for an inner class
		237	* @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=212100"
		238	*/
		239	public void testBug212100a() throws JavaModelException {
		240	workingCopies = new ICompilationUnit[1];
		241	this.workingCopies[0] = getWorkingCopy("/Converter15/src/X.java", true/resolve/);
		242	String contents =
		243	"public class X {\n" +
		244	" public class Y {\n" +
		245	" void foo() {}\n" +
		246	" }\n" +
		247	"}";
		248	this.workingCopies[0].getBuffer().setContents(contents);
		249	this.workingCopies[0].save(null, true);
		250	final IBinding[] bindings = new IBinding[4];
		251	final String key = "Ljava/lang/Object;"; // this will make the test fail
		252	// final String key = "LX;"; // this would make the test pass
		253
		254	resolveASTs(this.workingCopies,
		255	new String[] { key },
		256	new ASTRequestor() {
		257	public void acceptBinding(String bindingKey, IBinding binding) {
		258	if (key.equals(bindingKey)) {
		259	bindings[0] = binding;
		260	IBinding[] temp = createBindings(new String[] {"LX;", "LX$Y;", "[LX$Y;"});
		261	for (int i = 0; i < temp.length; ++i) {
		262	bindings[i + 1] = temp[i];
		263	}
		264	}
		265	}
		266	},
		267	getJavaProject("Converter15"),
		268	null);
		269	assertNotNull("Binding for java.lang.Object should not be null", bindings[0]);
		270	assertNotNull("Binding for X should not be null", bindings[1]);
		271	assertNotNull("Binding for X.Y should not be null", bindings[2]);
		272	assertNotNull("Binding for X.Y[] should not be null", bindings[3]);
		273	}
		274	public void testONLY_Bug212100b() throws JavaModelException {
		275	this.workingCopies = new ICompilationUnit[2];
		276	this.workingCopies[0] = getWorkingCopy("/Converter15/src/X.java", true/resolve/);
		277	String contents =
		278	"public class X {\n" +
		279	" public class Y {\n" +
		280	" void foo() {}\n" +
		281	" }\n" +
		282	"}";
		283	this.workingCopies[0].getBuffer().setContents(contents);
		284	this.workingCopies[0].save(null, true);
		285
		286	this.workingCopies[1] = getWorkingCopy("/Converter15/src/Z.java", true/resolve/);
		287	String contentsZ =
		288	"public class Z {\n" +
		289	" public class W {\n" +
		290	" void bar() {}\n" +
		291	" }\n" +
		292	"}";
		293	this.workingCopies[1].getBuffer().setContents(contentsZ);
		294	this.workingCopies[1].save(null, true);
		295
		296	final String keyX = "LX;";
		297	final String keyXY = "LX$Y;";
		298	final String keyZ = "LZ;";
299	final String keyZW = "LZ$W;";
300
301	resolveASTs(this.workingCopies,
302	new String[] { keyX, keyZ },
303	new ASTRequestor() {
304	public void acceptBinding(String bindingKey, IBinding binding) {
305	IBinding[] bindings = createBindings(new String[] {
306	keyX, keyXY, keyZ, keyZW
307	});
308	assertNotNull("When accepting " + bindingKey + ", Binding for X should not be null", bindings[0]);
309	assertNotNull("When accepting " + bindingKey + ", Binding for X.Y should not be null", bindings[1]);
310	assertNotNull("When accepting " + bindingKey + ", Binding for Z should not be null", bindings[2]);
311	assertNotNull("When accepting " + bindingKey + ", Binding for Z.W should not be null", bindings[3]);
312	}
313	},
314	getJavaProject("Converter15"),
315	null);
316	}
317
318	/**
234	* @bug 212834: [dom] IMethodBinding.getParameterAnnotations does not return annotations	319	* @bug 212834: [dom] IMethodBinding.getParameterAnnotations does not return annotations
235	* @test Ensures that the method binding get the parameter annotations even on method invocation	320	* @test Ensures that the method binding get the parameter annotations even on method invocation
236	* @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=212834"	321	* @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=212834"