Attachment #64989 for bug #158985

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

Lines 2949-2955 Link Here

(-)src/org/eclipse/jdt/core/tests/model/JavaSearchBugsTests.java (-1 / +2 lines)
2949	"java.lang.IllegalMonitorStateException\n" +	2949	"java.lang.IllegalMonitorStateException\n" +
2950	"java.lang.InterruptedException\n" +	2950	"java.lang.InterruptedException\n" +
2951	"java.lang.RuntimeException\n" +	2951	"java.lang.RuntimeException\n" +
2952	"java.lang.annotation.Annotation",	2952	"java.lang.annotation.Annotation\n" +
		2953	"java.lang.annotation.Retention",
2953	requestor);	2954	requestor);
2954	}	2955	}
2955	public void testBug92264c() throws CoreException {	2956	public void testBug92264c() throws CoreException {




	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);

	assertResults(
			"QQAnnotation[TYPE_REF]{pkgannotations.QQAnnotation, pkgannotations, Lpkgannotations.QQAnnotation;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_ANNOTATION + R_TARGET + R_NON_RESTRICTED) + "}",
			requestor.getResults());
}
public void test0076() throws JavaModelException {	

	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);

	assertResults(
			"QQAnnotation[TYPE_REF]{pkgannotations.QQAnnotation, pkgannotations, Lpkgannotations.QQAnnotation;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_ANNOTATION + R_TARGET + R_NON_RESTRICTED) + "}",
			requestor.getResults());
}
public void test0077() throws JavaModelException {

	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);

	assertResults(
			"QQAnnotation[TYPE_REF]{pkgannotations.QQAnnotation, pkgannotations, Lpkgannotations.QQAnnotation;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_ANNOTATION + R_TARGET + R_NON_RESTRICTED) + "}",
			requestor.getResults());
}
public void test0079() throws JavaModelException {

	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);

	assertResults(
			"QQAnnotation[TYPE_REF]{pkgannotations.QQAnnotation, pkgannotations, Lpkgannotations.QQAnnotation;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_ANNOTATION + R_TARGET + R_NON_RESTRICTED) + "}",
			requestor.getResults());
}
public void test0080() throws JavaModelException {

	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);

	assertResults(
			"QQAnnotation[TYPE_REF]{pkgannotations.QQAnnotation, pkgannotations, Lpkgannotations.QQAnnotation;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_ANNOTATION + R_TARGET + R_NON_RESTRICTED) + "}",
			requestor.getResults());
}
public void test0081() throws JavaModelException {

	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);

	assertResults(
			"QQAnnotation[TYPE_REF]{pkgannotations.QQAnnotation, pkgannotations, Lpkgannotations.QQAnnotation;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_ANNOTATION + R_TARGET + R_NON_RESTRICTED) + "}",
			requestor.getResults());
}
public void test0082() throws JavaModelException {

	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);

	assertResults(
			"QQAnnotation[TYPE_REF]{pkgannotations.QQAnnotation, pkgannotations, Lpkgannotations.QQAnnotation;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_ANNOTATION + R_TARGET + R_NON_RESTRICTED) + "}",
			requestor.getResults());
}
public void test0083() throws JavaModelException {

	this.wc.codeComplete(cursorLocation, requestor);

	assertResults(
			"TestAnnotation[TYPE_REF]{TestAnnotation, test0085, Ltest0085.TestAnnotation;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_ANNOTATION + R_TARGET + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
			requestor.getResults());
}
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=85290

	this.wc.codeComplete(cursorLocation, requestor);

	assertResults(
			"TestAnnotation[TYPE_REF]{TestAnnotation, , LTestAnnotation;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_ANNOTATION + R_TARGET + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
			requestor.getResults());
}
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=85402

				requestor.getResults());
	} else {
		assertResults(
				"TestAnnotation[TYPE_REF]{TestAnnotation, test0087, Ltest0087.TestAnnotation;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_ANNOTATION + R_TARGET + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
				requestor.getResults());
	}
}

	            result.context);
	    
	    assertResults(
	            "ZZType.ZZAnnotation[TYPE_REF]{p.ZZType.ZZAnnotation, p, Lp.ZZType$ZZAnnotation;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_ANNOTATION + R_TARGET + R_NON_RESTRICTED) + "}",
	            result.proposals);
	} finally {
		if(aType != null) {

	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);

	assertResults(
			"QQAnnotation[TYPE_REF]{pkgannotations.QQAnnotation, pkgannotations, Lpkgannotations.QQAnnotation;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_ANNOTATION + R_TARGET + R_NON_RESTRICTED) + "}",
			requestor.getResults());
}
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=123225

			"Top<java.lang.Object>.IZZException[TYPE_REF]{test.Top.IZZException, test, Ltest.Top<Ljava.lang.Object;>.IZZException;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXCEPTION + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED) + "}",
			requestor.getResults());
}
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=158985
public void test0301() throws JavaModelException {
	this.workingCopies = new ICompilationUnit[3];
	this.workingCopies[0] = getWorkingCopy(
			"/Completion/src3/test/Test.java",
			"package test;\n" +
			"public class Test {\n" +
			"    @ZZZ\n" +
			"    public void method() {\n" +
			"    }\n" +
			"}");
	
	this.workingCopies[1] = getWorkingCopy(
			"/Completion/src3/p/ZZZ1.java",
			"package p;\n" +
			"public @interface ZZZ1 {\n" +
			"}");
	
	this.workingCopies[2] = getWorkingCopy(
			"/Completion/src3/p/ZZZ2.java",
			"package p;\n" +
			"public @interface ZZZ2 {\n" +
			"}");
	
	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
	String str = this.workingCopies[0].getSource();
	String completeBehind = "ZZZ";
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);

	assertResults(
			"ZZZ1[TYPE_REF]{p.ZZZ1, p, Lp.ZZZ1;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_ANNOTATION + R_TARGET + R_NON_RESTRICTED) + "}\n" +
			"ZZZ2[TYPE_REF]{p.ZZZ2, p, Lp.ZZZ2;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_ANNOTATION + R_TARGET + R_NON_RESTRICTED) + "}",
			requestor.getResults());
}
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=158985
public void test0302() throws JavaModelException {
	this.workingCopies = new ICompilationUnit[3];
	this.workingCopies[0] = getWorkingCopy(
			"/Completion/src3/test/Test.java",
			"package test;\n" +
			"public class Test {\n" +
			"    @ZZZ\n" +
			"    public void method() {\n" +
			"    }\n" +
			"}");
	
	this.workingCopies[1] = getWorkingCopy(
			"/Completion/src3/p/ZZZ1.java",
			"package p;\n" +
			"@java.lang.annotation.Target({java.lang.annotation.ElementType.TYPE})\n" +
			"public @interface ZZZ1 {\n" +
			"}");
	
	this.workingCopies[2] = getWorkingCopy(
			"/Completion/src3/p/ZZZ2.java",
			"package p;\n" +
			"public @interface ZZZ2 {\n" +
			"}");
	
	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
	String str = this.workingCopies[0].getSource();
	String completeBehind = "ZZZ";
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);

	assertResults(
			"ZZZ1[TYPE_REF]{p.ZZZ1, p, Lp.ZZZ1;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_ANNOTATION + R_NON_RESTRICTED) + "}\n" +
			"ZZZ2[TYPE_REF]{p.ZZZ2, p, Lp.ZZZ2;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_ANNOTATION + R_TARGET + R_NON_RESTRICTED) + "}",
			requestor.getResults());
}
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=158985
public void test0303() throws JavaModelException {
	this.workingCopies = new ICompilationUnit[3];
	this.workingCopies[0] = getWorkingCopy(
			"/Completion/src3/test/Test.java",
			"package test;\n" +
			"public class Test {\n" +
			"    @ZZZ\n" +
			"    public void method() {\n" +
			"    }\n" +
			"}");
	
	this.workingCopies[1] = getWorkingCopy(
			"/Completion/src3/p/TOPZZZ1.java",
			"package p;\n" +
			"public class TOPZZZ1 {\n" +
			"  @java.lang.annotation.Target({java.lang.annotation.ElementType.TYPE})\n" +
			"  public @interface ZZZ1 {\n" +
			"  }\n" +
			"}");
	
	this.workingCopies[2] = getWorkingCopy(
			"/Completion/src3/p/TOPZZZ2.java",
			"package p;\n" +
			"public class TOPZZZ2 {\n" +
			"  public @interface ZZZ2 {\n" +
			"  }\n" +
			"}");
	
	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
	String str = this.workingCopies[0].getSource();
	String completeBehind = "ZZZ";
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);

	assertResults(
			"TOPZZZ1.ZZZ1[TYPE_REF]{p.TOPZZZ1.ZZZ1, p, Lp.TOPZZZ1$ZZZ1;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_ANNOTATION + R_NON_RESTRICTED) + "}\n" +
			"TOPZZZ2.ZZZ2[TYPE_REF]{p.TOPZZZ2.ZZZ2, p, Lp.TOPZZZ2$ZZZ2;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_ANNOTATION + R_TARGET + R_NON_RESTRICTED) + "}",
			requestor.getResults());
}
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=158985
public void test0304() throws JavaModelException {
	this.workingCopies = new ICompilationUnit[1];
	this.workingCopies[0] = getWorkingCopy(
			"/Completion/src3/test/Test.java",
			"package test;\n" +
			"@java.lang.annotation.Target({java.lang.annotation.ElementType.TYPE})\n" +
			"@interface ZZZ1 {\n" +
			"}\n" +
			"@interface ZZZ2 {\n" +
			"}\n" +
			"public class Test {\n" +
			"    @ZZZ\n" +
			"    public void method() {\n" +
			"    }\n" +
			"}");
	
	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
	String str = this.workingCopies[0].getSource();
	String completeBehind = "ZZZ";
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);

	assertResults(
			"ZZZ1[TYPE_REF]{ZZZ1, test, Ltest.ZZZ1;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_ANNOTATION + R_NON_RESTRICTED) + "}\n" +
			"ZZZ2[TYPE_REF]{ZZZ2, test, Ltest.ZZZ2;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_ANNOTATION + R_TARGET + R_NON_RESTRICTED) + "}",
			requestor.getResults());
}
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=158985
public void test0305() throws JavaModelException {
	this.workingCopies = new ICompilationUnit[1];
	this.workingCopies[0] = getWorkingCopy(
			"/Completion/src3/test/Test.java",
			"package test;\n" +
			"class TOPZZZ1 {\n" +
			"  @java.lang.annotation.Target({java.lang.annotation.ElementType.TYPE})\n" +
			"  public @interface ZZZ1 {\n" +
			"  }\n" +
			"}\n" +
			"class TOPZZZ2 {\n" +
			"  public @interface ZZZ2 {\n" +
			"  }\n" +
			"}\n" +
			"public class Test {\n" +
			"    @ZZZ\n" +
			"    public void method() {\n" +
			"    }\n" +
			"}");
	
	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
	String str = this.workingCopies[0].getSource();
	String completeBehind = "ZZZ";
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);

	assertResults(
			"TOPZZZ1.ZZZ1[TYPE_REF]{test.TOPZZZ1.ZZZ1, test, Ltest.TOPZZZ1$ZZZ1;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_ANNOTATION + R_NON_RESTRICTED) + "}\n" +
			"TOPZZZ2.ZZZ2[TYPE_REF]{test.TOPZZZ2.ZZZ2, test, Ltest.TOPZZZ2$ZZZ2;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_ANNOTATION + R_TARGET + R_NON_RESTRICTED) + "}",
			requestor.getResults());
}
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=158985
public void test0306() throws JavaModelException {
	this.workingCopies = new ICompilationUnit[1];
	this.workingCopies[0] = getWorkingCopy(
			"/Completion/src3/test/Test.java",
			"package test;\n" +
			"public class Test {\n" +
			"  public static class TOPZZZ1 {\n" +
			"    @java.lang.annotation.Target({java.lang.annotation.ElementType.TYPE})\n" +
			"    public @interface ZZZ1 {\n" +
			"    }\n" +
			"  }\n" +
			"  public static class TOPZZZ2 {\n" +
			"    public @interface ZZZ2 {\n" +
			"    }\n" +
			"  }\n" +
			"  public class TOPZZZ3 {\n" +
			"    public @interface ZZZ3 {\n" +
			"    }\n" +
			"  }\n" +
			"  @ZZZ\n" +
			"  public void method() {\n" +
			"  }\n" +
			"}");
	
	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
	String str = this.workingCopies[0].getSource();
	String completeBehind = "ZZZ";
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);

	assertResults(
			"Test.TOPZZZ1.ZZZ1[TYPE_REF]{test.Test.TOPZZZ1.ZZZ1, test, Ltest.Test$TOPZZZ1$ZZZ1;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_ANNOTATION + R_NON_RESTRICTED) + "}\n" +
			"Test.TOPZZZ2.ZZZ2[TYPE_REF]{test.Test.TOPZZZ2.ZZZ2, test, Ltest.Test$TOPZZZ2$ZZZ2;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_ANNOTATION + R_TARGET + R_NON_RESTRICTED) + "}",
			requestor.getResults());
}
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=158985
public void test0307() throws JavaModelException {
	this.workingCopies = new ICompilationUnit[1];
	this.workingCopies[0] = getWorkingCopy(
			"/Completion/src3/test/Test.java",
			"package test;\n" +
			"public class Test {\n" +
			"    @java.lang.annotation.Target({java.lang.annotation.ElementType.TYPE})\n" +
			"    public @interface ZZZ1 {\n" +
			"    }\n" +
			"    public @interface ZZZ2 {\n" +
			"    }\n" +
			"    @ZZZ\n" +
			"    public void method() {\n" +
			"    }\n" +
			"}");
	
	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
	String str = this.workingCopies[0].getSource();
	String completeBehind = "ZZZ";
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);

	assertResults(
			"Test.ZZZ1[TYPE_REF]{ZZZ1, test, Ltest.Test$ZZZ1;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_ANNOTATION + R_NON_RESTRICTED) + "}\n" +
			"Test.ZZZ2[TYPE_REF]{ZZZ2, test, Ltest.Test$ZZZ2;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_ANNOTATION + R_TARGET + R_NON_RESTRICTED) + "}",
			requestor.getResults());
}
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=158985
public void test0308() throws JavaModelException {
	this.workingCopies = new ICompilationUnit[4];
	this.workingCopies[0] = getWorkingCopy(
			"/Completion/src3/test/Test.java",
			"package test;\n" +
			"public class Test {\n" +
			"    @ZZZ\n" +
			"    public void method() {\n" +
			"    }\n" +
			"}");
	
	this.workingCopies[1] = getWorkingCopy(
			"/Completion/src3/p/ZZZ1.java",
			"package p;\n" +
			"@java.lang.annotation.Target({java.lang.annotation.ElementType.TYPE})\n" +
			"public @interface ZZZ1 {\n" +
			"}");
	
	this.workingCopies[2] = getWorkingCopy(
			"/Completion/src3/p/ZZZ2.java",
			"package p;\n" +
			"@java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD})\n" +
			"public @interface ZZZ2 {\n" +
			"}");
	
	this.workingCopies[3] = getWorkingCopy(
			"/Completion/src3/p/ZZZ3.java",
			"package p;\n" +
			"public @interface ZZZ3 {\n" +
			"}");
	
	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
	String str = this.workingCopies[0].getSource();
	String completeBehind = "ZZZ";
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);

	assertResults(
			"ZZZ1[TYPE_REF]{p.ZZZ1, p, Lp.ZZZ1;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_ANNOTATION + R_NON_RESTRICTED) + "}\n" +
			"ZZZ2[TYPE_REF]{p.ZZZ2, p, Lp.ZZZ2;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_ANNOTATION + R_TARGET + R_NON_RESTRICTED) + "}\n" +
			"ZZZ3[TYPE_REF]{p.ZZZ3, p, Lp.ZZZ3;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_ANNOTATION + R_TARGET + R_NON_RESTRICTED) + "}",
			requestor.getResults());
}
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=158985
public void test0309() throws JavaModelException {
	this.workingCopies = new ICompilationUnit[4];
	this.workingCopies[0] = getWorkingCopy(
			"/Completion/src3/test/Test.java",
			"package test;\n" +
			"public class Test {\n" +
			"    @ZZZ\n" +
			"    public class TestInner {\n" +
			"    }\n" +
			"}");
	
	this.workingCopies[1] = getWorkingCopy(
			"/Completion/src3/p/ZZZ1.java",
			"package p;\n" +
			"@java.lang.annotation.Target({java.lang.annotation.ElementType.FIELD})\n" +
			"public @interface ZZZ1 {\n" +
			"}");
	
	this.workingCopies[2] = getWorkingCopy(
			"/Completion/src3/p/ZZZ2.java",
			"package p;\n" +
			"@java.lang.annotation.Target({java.lang.annotation.ElementType.TYPE})\n" +
			"public @interface ZZZ2 {\n" +
			"}");
	
	this.workingCopies[3] = getWorkingCopy(
			"/Completion/src3/p/ZZZ3.java",
			"package p;\n" +
			"public @interface ZZZ3 {\n" +
			"}");
	
	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
	String str = this.workingCopies[0].getSource();
	String completeBehind = "ZZZ";
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);

	assertResults(
			"ZZZ1[TYPE_REF]{p.ZZZ1, p, Lp.ZZZ1;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_ANNOTATION + R_NON_RESTRICTED) + "}\n" +
			"ZZZ2[TYPE_REF]{p.ZZZ2, p, Lp.ZZZ2;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_ANNOTATION + R_TARGET + R_NON_RESTRICTED) + "}\n" +
			"ZZZ3[TYPE_REF]{p.ZZZ3, p, Lp.ZZZ3;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_ANNOTATION + R_TARGET + R_NON_RESTRICTED) + "}",
			requestor.getResults());
}
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=158985
public void test0310() throws JavaModelException {
	this.workingCopies = new ICompilationUnit[4];
	this.workingCopies[0] = getWorkingCopy(
			"/Completion/src3/test/Test.java",
			"package test;\n" +
			"public class Test {\n" +
			"    @ZZZ\n" +
			"    public int field;\n" +
			"}");
	
	this.workingCopies[1] = getWorkingCopy(
			"/Completion/src3/p/ZZZ1.java",
			"package p;\n" +
			"@java.lang.annotation.Target({java.lang.annotation.ElementType.TYPE})\n" +
			"public @interface ZZZ1 {\n" +
			"}");
	
	this.workingCopies[2] = getWorkingCopy(
			"/Completion/src3/p/ZZZ2.java",
			"package p;\n" +
			"@java.lang.annotation.Target({java.lang.annotation.ElementType.FIELD})\n" +
			"public @interface ZZZ2 {\n" +
			"}");
	
	this.workingCopies[3] = getWorkingCopy(
			"/Completion/src3/p/ZZZ3.java",
			"package p;\n" +
			"public @interface ZZZ3 {\n" +
			"}");
	
	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
	String str = this.workingCopies[0].getSource();
	String completeBehind = "ZZZ";
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);

	assertResults(
			"ZZZ1[TYPE_REF]{p.ZZZ1, p, Lp.ZZZ1;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_ANNOTATION + R_NON_RESTRICTED) + "}\n" +
			"ZZZ2[TYPE_REF]{p.ZZZ2, p, Lp.ZZZ2;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_ANNOTATION + R_TARGET + R_NON_RESTRICTED) + "}\n" +
			"ZZZ3[TYPE_REF]{p.ZZZ3, p, Lp.ZZZ3;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_ANNOTATION + R_TARGET + R_NON_RESTRICTED) + "}",
			requestor.getResults());
}
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=158985
public void test0311() throws JavaModelException {
	this.workingCopies = new ICompilationUnit[4];
	this.workingCopies[0] = getWorkingCopy(
			"/Completion/src3/test/Test.java",
			"package test;\n" +
			"public class Test {\n" +
			"    public void foo(@ZZZ int param){}\n" +
			"}");
	
	this.workingCopies[1] = getWorkingCopy(
			"/Completion/src3/p/ZZZ1.java",
			"package p;\n" +
			"@java.lang.annotation.Target({java.lang.annotation.ElementType.TYPE})\n" +
			"public @interface ZZZ1 {\n" +
			"}");
	
	this.workingCopies[2] = getWorkingCopy(
			"/Completion/src3/p/ZZZ2.java",
			"package p;\n" +
			"@java.lang.annotation.Target({java.lang.annotation.ElementType.PARAMETER})\n" +
			"public @interface ZZZ2 {\n" +
			"}");
	
	this.workingCopies[3] = getWorkingCopy(
			"/Completion/src3/p/ZZZ3.java",
			"package p;\n" +
			"public @interface ZZZ3 {\n" +
			"}");
	
	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
	String str = this.workingCopies[0].getSource();
	String completeBehind = "ZZZ";
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);

	assertResults(
			"ZZZ1[TYPE_REF]{p.ZZZ1, p, Lp.ZZZ1;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_ANNOTATION + R_NON_RESTRICTED) + "}\n" +
			"ZZZ2[TYPE_REF]{p.ZZZ2, p, Lp.ZZZ2;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_ANNOTATION + R_TARGET + R_NON_RESTRICTED) + "}\n" +
			"ZZZ3[TYPE_REF]{p.ZZZ3, p, Lp.ZZZ3;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_ANNOTATION + R_TARGET + R_NON_RESTRICTED) + "}",
			requestor.getResults());
}
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=158985
public void test0312() throws JavaModelException {
	this.workingCopies = new ICompilationUnit[4];
	this.workingCopies[0] = getWorkingCopy(
			"/Completion/src3/test/Test.java",
			"package test;\n" +
			"public class Test {\n" +
			"    @ZZZ\n" +
			"    public Test(){}\n" +
			"}");
	
	this.workingCopies[1] = getWorkingCopy(
			"/Completion/src3/p/ZZZ1.java",
			"package p;\n" +
			"@java.lang.annotation.Target({java.lang.annotation.ElementType.TYPE})\n" +
			"public @interface ZZZ1 {\n" +
			"}");
	
	this.workingCopies[2] = getWorkingCopy(
			"/Completion/src3/p/ZZZ2.java",
			"package p;\n" +
			"@java.lang.annotation.Target({java.lang.annotation.ElementType.CONSTRUCTOR})\n" +
			"public @interface ZZZ2 {\n" +
			"}");
	
	this.workingCopies[3] = getWorkingCopy(
			"/Completion/src3/p/ZZZ3.java",
			"package p;\n" +
			"public @interface ZZZ3 {\n" +
			"}");
	
	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
	String str = this.workingCopies[0].getSource();
	String completeBehind = "ZZZ";
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);

	assertResults(
			"ZZZ1[TYPE_REF]{p.ZZZ1, p, Lp.ZZZ1;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_ANNOTATION + R_NON_RESTRICTED) + "}\n" +
			"ZZZ2[TYPE_REF]{p.ZZZ2, p, Lp.ZZZ2;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_ANNOTATION + R_TARGET + R_NON_RESTRICTED) + "}\n" +
			"ZZZ3[TYPE_REF]{p.ZZZ3, p, Lp.ZZZ3;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_ANNOTATION + R_TARGET + R_NON_RESTRICTED) + "}",
			requestor.getResults());
}
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=158985
// When the completion is inside a method body the annotation cannot be accuratly attached to the correct node by completino recovery.
// So relevance based on annotation target are ignored.
public void test0313() throws JavaModelException {
	this.workingCopies = new ICompilationUnit[4];
	this.workingCopies[0] = getWorkingCopy(
			"/Completion/src3/test/Test.java",
			"package test;\n" +
			"public class Test {\n" +
			"    {\n" +
			"        @ZZZ\n" +
			"        int var = 0;\n" +
			"    }\n" +
			"}");
	
	this.workingCopies[1] = getWorkingCopy(
			"/Completion/src3/p/ZZZ1.java",
			"package p;\n" +
			"@java.lang.annotation.Target({java.lang.annotation.ElementType.TYPE})\n" +
			"public @interface ZZZ1 {\n" +
			"}");
	
	this.workingCopies[2] = getWorkingCopy(
			"/Completion/src3/p/ZZZ2.java",
			"package p;\n" +
			"@java.lang.annotation.Target({java.lang.annotation.ElementType.LOCAL_VARIABLE})\n" +
			"public @interface ZZZ2 {\n" +
			"}");
	
	this.workingCopies[3] = getWorkingCopy(
			"/Completion/src3/p/ZZZ3.java",
			"package p;\n" +
			"public @interface ZZZ3 {\n" +
			"}");
	
	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
	String str = this.workingCopies[0].getSource();
	String completeBehind = "ZZZ";
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);

	assertResults(
			"ZZZ1[TYPE_REF]{p.ZZZ1, p, Lp.ZZZ1;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_ANNOTATION + R_NON_RESTRICTED) + "}\n" +
			"ZZZ2[TYPE_REF]{p.ZZZ2, p, Lp.ZZZ2;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_ANNOTATION + R_NON_RESTRICTED) + "}\n" +
			"ZZZ3[TYPE_REF]{p.ZZZ3, p, Lp.ZZZ3;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_ANNOTATION + R_NON_RESTRICTED) + "}",
			requestor.getResults());
}
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=158985
public void test0314() throws JavaModelException {
	this.workingCopies = new ICompilationUnit[4];
	this.workingCopies[0] = getWorkingCopy(
			"/Completion/src3/test/Test.java",
			"package test;\n" +
			"public class Test {\n" +
			"    @ZZZ\n" +
			"    public @interface TestInner {}\n" +
			"}");
	
	this.workingCopies[1] = getWorkingCopy(
			"/Completion/src3/p/ZZZ1.java",
			"package p;\n" +
			"@java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD})\n" +
			"public @interface ZZZ1 {\n" +
			"}");
	
	this.workingCopies[2] = getWorkingCopy(
			"/Completion/src3/p/ZZZ2.java",
			"package p;\n" +
			"@java.lang.annotation.Target({java.lang.annotation.ElementType.ANNOTATION_TYPE})\n" +
			"public @interface ZZZ2 {\n" +
			"}");
	
	this.workingCopies[3] = getWorkingCopy(
			"/Completion/src3/p/ZZZ3.java",
			"package p;\n" +
			"public @interface ZZZ3 {\n" +
			"}");
	
	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
	String str = this.workingCopies[0].getSource();
	String completeBehind = "ZZZ";
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);

	assertResults(
			"ZZZ1[TYPE_REF]{p.ZZZ1, p, Lp.ZZZ1;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_ANNOTATION + R_NON_RESTRICTED) + "}\n" +
			"ZZZ2[TYPE_REF]{p.ZZZ2, p, Lp.ZZZ2;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_ANNOTATION + R_TARGET + R_NON_RESTRICTED) + "}\n" +
			"ZZZ3[TYPE_REF]{p.ZZZ3, p, Lp.ZZZ3;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_ANNOTATION + R_TARGET + R_NON_RESTRICTED) + "}",
			requestor.getResults());
}
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=158985
public void test0315() throws JavaModelException {
	this.workingCopies = new ICompilationUnit[4];
	this.workingCopies[0] = getWorkingCopy(
			"/Completion/src3/test/Test.java",
			"@ZZZ package test;\n" +
			"public class Test {\n" +
			"}");
	
	this.workingCopies[1] = getWorkingCopy(
			"/Completion/src3/p/ZZZ1.java",
			"package p;\n" +
			"@java.lang.annotation.Target({java.lang.annotation.ElementType.TYPE})\n" +
			"public @interface ZZZ1 {\n" +
			"}");
	
	this.workingCopies[2] = getWorkingCopy(
			"/Completion/src3/p/ZZZ2.java",
			"package p;\n" +
			"@java.lang.annotation.Target({java.lang.annotation.ElementType.PACKAGE})\n" +
			"public @interface ZZZ2 {\n" +
			"}");
	
	this.workingCopies[3] = getWorkingCopy(
			"/Completion/src3/p/ZZZ3.java",
			"package p;\n" +
			"public @interface ZZZ3 {\n" +
			"}");
	
	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
	String str = this.workingCopies[0].getSource();
	String completeBehind = "ZZZ";
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);

	assertResults(
			"ZZZ2[TYPE_REF]{p.ZZZ2, p, Lp.ZZZ2;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_ANNOTATION + R_TARGET + R_NON_RESTRICTED) + "}\n" +
			"ZZZ3[TYPE_REF]{p.ZZZ3, p, Lp.ZZZ3;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_ANNOTATION + R_TARGET + R_NON_RESTRICTED) + "}",
			requestor.getResults());
}
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=158985
public void test0316() throws JavaModelException {
	this.workingCopies = new ICompilationUnit[4];
	this.workingCopies[0] = getWorkingCopy(
			"/Completion/src3/test/Test.java",
			"package test;\n" +
			"public class Test {\n" +
			"    @ZZZ\n" +
			"    public Test(){}\n" +
			"}");
	
	this.workingCopies[1] = getWorkingCopy(
			"/Completion/src3/p/ZZZ1.java",
			"package p;\n" +
			"@java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD})\n" +
			"public @interface ZZZ1 {\n" +
			"}");
	
	this.workingCopies[2] = getWorkingCopy(
			"/Completion/src3/p/ZZZ2.java",
			"package p;\n" +
			"@java.lang.annotation.Target({java.lang.annotation.ElementType.CONSTRUCTOR})\n" +
			"public @interface ZZZ2 {\n" +
			"}");
	
	this.workingCopies[3] = getWorkingCopy(
			"/Completion/src3/p/ZZZ3.java",
			"package p;\n" +
			"public @interface ZZZ3 {\n" +
			"}");
	
	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
	String str = this.workingCopies[0].getSource();
	String completeBehind = "ZZZ";
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);

	assertResults(
			"ZZZ1[TYPE_REF]{p.ZZZ1, p, Lp.ZZZ1;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_ANNOTATION + R_NON_RESTRICTED) + "}\n" +
			"ZZZ2[TYPE_REF]{p.ZZZ2, p, Lp.ZZZ2;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_ANNOTATION + R_TARGET + R_NON_RESTRICTED) + "}\n" +
			"ZZZ3[TYPE_REF]{p.ZZZ3, p, Lp.ZZZ3;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_ANNOTATION + R_TARGET + R_NON_RESTRICTED) + "}",
			requestor.getResults());
}
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=158985
public void test0317() throws JavaModelException {
	this.workingCopies = new ICompilationUnit[4];
	this.workingCopies[0] = getWorkingCopy(
			"/Completion/src3/test/Test.java",
			"package test;\n" +
			"public class Test {\n" +
			"    @ZZZ\n" +
			"    public @interface TestInner {}\n" +
			"}");
	
	this.workingCopies[1] = getWorkingCopy(
			"/Completion/src3/p/ZZZ1.java",
			"package p;\n" +
			"@java.lang.annotation.Target({java.lang.annotation.ElementType.TYPE})\n" +
			"public @interface ZZZ1 {\n" +
			"}");
	
	this.workingCopies[2] = getWorkingCopy(
			"/Completion/src3/p/ZZZ2.java",
			"package p;\n" +
			"@java.lang.annotation.Target({java.lang.annotation.ElementType.ANNOTATION_TYPE})\n" +
			"public @interface ZZZ2 {\n" +
			"}");
	
	this.workingCopies[3] = getWorkingCopy(
			"/Completion/src3/p/ZZZ3.java",
			"package p;\n" +
			"public @interface ZZZ3 {\n" +
			"}");
	
	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
	String str = this.workingCopies[0].getSource();
	String completeBehind = "ZZZ";
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);

	assertResults(
			"ZZZ1[TYPE_REF]{p.ZZZ1, p, Lp.ZZZ1;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_ANNOTATION + R_TARGET + R_NON_RESTRICTED) + "}\n" +
			"ZZZ2[TYPE_REF]{p.ZZZ2, p, Lp.ZZZ2;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_ANNOTATION + R_TARGET + R_NON_RESTRICTED) + "}\n" +
			"ZZZ3[TYPE_REF]{p.ZZZ3, p, Lp.ZZZ3;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_ANNOTATION + R_TARGET + R_NON_RESTRICTED) + "}",
			requestor.getResults());
}
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=158985
public void test0318() throws JavaModelException {
	this.workingCopies = new ICompilationUnit[3];
	this.workingCopies[0] = getWorkingCopy(
			"/Completion/src3/test/Test.java",
			"package test;\n" +
			"@ZZZ\n" +
			"import test.*;\n" +
			"public class Test {\n" +
			"}");
	
	this.workingCopies[1] = getWorkingCopy(
			"/Completion/src3/p/ZZZ1.java",
			"package p;\n" +
			"@java.lang.annotation.Target({java.lang.annotation.ElementType.TYPE})\n" +
			"public @interface ZZZ1 {\n" +
			"}");
	
	this.workingCopies[2] = getWorkingCopy(
			"/Completion/src3/p/ZZZ2.java",
			"package p;\n" +
			"public @interface ZZZ2 {\n" +
			"}");
	
	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
	String str = this.workingCopies[0].getSource();
	String completeBehind = "ZZZ";
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);

	assertResults(
			"ZZZ1[TYPE_REF]{p.ZZZ1, p, Lp.ZZZ1;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_ANNOTATION + R_NON_RESTRICTED) + "}\n" +
			"ZZZ2[TYPE_REF]{p.ZZZ2, p, Lp.ZZZ2;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_ANNOTATION + R_NON_RESTRICTED) + "}",
			requestor.getResults());
}
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=158985
public void test0319() throws JavaModelException {
	this.workingCopies = new ICompilationUnit[3];
	this.workingCopies[0] = getWorkingCopy(
			"/Completion/src3/test/Test.java",
			"package test;\n" +
			"public class Test {\n" +
			"    @ZZZ\n" +
			"    {}\n" +
			"    public void foo() {}\n" +
			"}");
	
	this.workingCopies[1] = getWorkingCopy(
			"/Completion/src3/p/ZZZ1.java",
			"package p;\n" +
			"@java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD})\n" +
			"public @interface ZZZ1 {\n" +
			"}");
	
	this.workingCopies[2] = getWorkingCopy(
			"/Completion/src3/p/ZZZ2.java",
			"package p;\n" +
			"public @interface ZZZ2 {\n" +
			"}");
	
	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
	String str = this.workingCopies[0].getSource();
	String completeBehind = "ZZZ";
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);

	assertResults(
			"ZZZ1[TYPE_REF]{p.ZZZ1, p, Lp.ZZZ1;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_ANNOTATION + R_NON_RESTRICTED) + "}\n" +
			"ZZZ2[TYPE_REF]{p.ZZZ2, p, Lp.ZZZ2;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_ANNOTATION + R_NON_RESTRICTED) + "}",
			requestor.getResults());
}
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=158985
public void test0320() throws JavaModelException {
	this.workingCopies = new ICompilationUnit[5];
	this.workingCopies[0] = getWorkingCopy(
			"/Completion/src3/test/Test.java",
			"package test;\n" +
			"public class Test {\n" +
			"    @ZZZ\n" +
			"    {\n" +
			"        int var = 0;\n" +
			"    }\n" +
			"}");
	
	this.workingCopies[1] = getWorkingCopy(
			"/Completion/src3/p/ZZZ1.java",
			"package p;\n" +
			"@java.lang.annotation.Target({java.lang.annotation.ElementType.FIELD})\n" +
			"public @interface ZZZ1 {\n" +
			"}");
	
	this.workingCopies[2] = getWorkingCopy(
			"/Completion/src3/p/ZZZ2.java",
			"package p;\n" +
			"@java.lang.annotation.Target({java.lang.annotation.ElementType.PARAMETER})\n" +
			"public @interface ZZZ2 {\n" +
			"}");
	
	this.workingCopies[3] = getWorkingCopy(
			"/Completion/src3/p/ZZZ3.java",
			"package p;\n" +
			"@java.lang.annotation.Target({java.lang.annotation.ElementType.LOCAL_VARIABLE})\n" +
			"public @interface ZZZ3 {\n" +
			"}");
	
	this.workingCopies[4] = getWorkingCopy(
			"/Completion/src3/p/ZZZ4.java",
			"package p;\n" +
			"public @interface ZZZ4 {\n" +
			"}");
	
	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
	String str = this.workingCopies[0].getSource();
	String completeBehind = "ZZZ";
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);

	assertResults(
			"ZZZ1[TYPE_REF]{p.ZZZ1, p, Lp.ZZZ1;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_ANNOTATION + R_NON_RESTRICTED) + "}\n" +
			"ZZZ2[TYPE_REF]{p.ZZZ2, p, Lp.ZZZ2;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_ANNOTATION + R_NON_RESTRICTED) + "}\n" +
			"ZZZ3[TYPE_REF]{p.ZZZ3, p, Lp.ZZZ3;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_ANNOTATION + R_NON_RESTRICTED) + "}\n" +
			"ZZZ4[TYPE_REF]{p.ZZZ4, p, Lp.ZZZ4;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_ANNOTATION + R_NON_RESTRICTED) + "}",
			requestor.getResults());
}
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=158985
public void test0321() throws JavaModelException {
	this.workingCopies = new ICompilationUnit[3];
	this.workingCopies[0] = getWorkingCopy(
			"/Completion/src3/test/Test.java",
			"package test;\n" +
			"public class Test {\n" +
			"    @ZZZ({})\n" +
			"    int var = 0;\n" +
			"}");
	
	this.workingCopies[1] = getWorkingCopy(
			"/Completion/src3/p/ZZZ1.java",
			"package p;\n" +
			"@java.lang.annotation.Target({java.lang.annotation.ElementType.FIELD})\n" +
			"public @interface ZZZ1 {\n" +
			"}");
	
	this.workingCopies[2] = getWorkingCopy(
			"/Completion/src3/p/ZZZ2.java",
			"package p;\n" +
			"public @interface ZZZ2 {\n" +
			"}");
	
	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
	String str = this.workingCopies[0].getSource();
	String completeBehind = "ZZZ";
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);

	assertResults(
			"ZZZ1[TYPE_REF]{p.ZZZ1, p, Lp.ZZZ1;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_ANNOTATION + R_TARGET + R_NON_RESTRICTED) + "}\n" +
			"ZZZ2[TYPE_REF]{p.ZZZ2, p, Lp.ZZZ2;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_ANNOTATION + R_TARGET + R_NON_RESTRICTED) + "}",
			requestor.getResults());
}
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=158985
public void test0321b() throws JavaModelException {
	this.workingCopies = new ICompilationUnit[3];
	this.workingCopies[0] = getWorkingCopy(
			"/Completion/src3/test/Test.java",
			"package test;\n" +
			"public class Test {\n" +
			"    @ZZZ(value={})\n" +
			"    int var = 0;\n" +
			"}");
	
	this.workingCopies[1] = getWorkingCopy(
			"/Completion/src3/p/ZZZ1.java",
			"package p;\n" +
			"@java.lang.annotation.Target({java.lang.annotation.ElementType.FIELD})\n" +
			"public @interface ZZZ1 {\n" +
			"}");
	
	this.workingCopies[2] = getWorkingCopy(
			"/Completion/src3/p/ZZZ2.java",
			"package p;\n" +
			"public @interface ZZZ2 {\n" +
			"}");
	
	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
	String str = this.workingCopies[0].getSource();
	String completeBehind = "ZZZ";
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);

	assertResults(
			"ZZZ1[TYPE_REF]{p.ZZZ1, p, Lp.ZZZ1;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_ANNOTATION + R_TARGET + R_NON_RESTRICTED) + "}\n" +
			"ZZZ2[TYPE_REF]{p.ZZZ2, p, Lp.ZZZ2;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_ANNOTATION + R_TARGET + R_NON_RESTRICTED) + "}",
			requestor.getResults());
}
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=158985
public void test0322() throws JavaModelException {
	this.workingCopies = new ICompilationUnit[3];
	this.workingCopies[0] = getWorkingCopy(
			"/Completion/src3/test/Test.java",
			"package test;\n" +
			"public class Test {\n" +
			"    @ZZZ @Annot\n" +
			"    int var = 0;\n" +
			"}");
	
	this.workingCopies[1] = getWorkingCopy(
			"/Completion/src3/p/ZZZ1.java",
			"package p;\n" +
			"@java.lang.annotation.Target({java.lang.annotation.ElementType.FIELD})\n" +
			"public @interface ZZZ1 {\n" +
			"}");
	
	this.workingCopies[2] = getWorkingCopy(
			"/Completion/src3/p/ZZZ2.java",
			"package p;\n" +
			"public @interface ZZZ2 {\n" +
			"}");
	
	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
	String str = this.workingCopies[0].getSource();
	String completeBehind = "ZZZ";
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);

	assertResults(
			"ZZZ1[TYPE_REF]{p.ZZZ1, p, Lp.ZZZ1;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_ANNOTATION + R_TARGET + R_NON_RESTRICTED) + "}\n" +
			"ZZZ2[TYPE_REF]{p.ZZZ2, p, Lp.ZZZ2;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_ANNOTATION + R_TARGET + R_NON_RESTRICTED) + "}",
			requestor.getResults());
}
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=158985
public void test0323() throws JavaModelException {
	this.workingCopies = new ICompilationUnit[3];
	this.workingCopies[0] = getWorkingCopy(
			"/Completion/src3/test/Test.java",
			"package test;\n" +
			"public class Test {\n" +
			"    @ZZZ @Annot({})\n" +
			"    int var = 0;\n" +
			"}");
	
	this.workingCopies[1] = getWorkingCopy(
			"/Completion/src3/p/ZZZ1.java",
			"package p;\n" +
			"@java.lang.annotation.Target({java.lang.annotation.ElementType.FIELD})\n" +
			"public @interface ZZZ1 {\n" +
			"}");
	
	this.workingCopies[2] = getWorkingCopy(
			"/Completion/src3/p/ZZZ2.java",
			"package p;\n" +
			"public @interface ZZZ2 {\n" +
			"}");
	
	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
	String str = this.workingCopies[0].getSource();
	String completeBehind = "ZZZ";
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);

	assertResults(
			"ZZZ1[TYPE_REF]{p.ZZZ1, p, Lp.ZZZ1;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_ANNOTATION + R_TARGET + R_NON_RESTRICTED) + "}\n" +
			"ZZZ2[TYPE_REF]{p.ZZZ2, p, Lp.ZZZ2;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_ANNOTATION + R_TARGET + R_NON_RESTRICTED) + "}",
			requestor.getResults());
}
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=158985
public void test0324() throws JavaModelException {
	this.workingCopies = new ICompilationUnit[4];
	this.workingCopies[0] = getWorkingCopy(
			"/Completion/src3/test/Test.java",
			"package test;\n" +
			"public class Test {\n" +
			"    public void foo(@ZZZ int param){}\n" +
			"}");
	
	this.workingCopies[1] = getWorkingCopy(
			"/Completion/src3/p/ZZZ1.java",
			"package p;\n" +
			"@java.lang.annotation.Target({java.lang.annotation.ElementType.FIELD})\n" +
			"public @interface ZZZ1 {\n" +
			"}");
	
	this.workingCopies[2] = getWorkingCopy(
			"/Completion/src3/p/ZZZ2.java",
			"package p;\n" +
			"@java.lang.annotation.Target({java.lang.annotation.ElementType.PARAMETER})\n" +
			"public @interface ZZZ2 {\n" +
			"}");
	
	this.workingCopies[3] = getWorkingCopy(
			"/Completion/src3/p/ZZZ3.java",
			"package p;\n" +
			"public @interface ZZZ3 {\n" +
			"}");
	
	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
	String str = this.workingCopies[0].getSource();
	String completeBehind = "ZZZ";
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);

	assertResults(
			"ZZZ1[TYPE_REF]{p.ZZZ1, p, Lp.ZZZ1;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_ANNOTATION + R_NON_RESTRICTED) + "}\n" +
			"ZZZ2[TYPE_REF]{p.ZZZ2, p, Lp.ZZZ2;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_ANNOTATION + R_TARGET + R_NON_RESTRICTED) + "}\n" +
			"ZZZ3[TYPE_REF]{p.ZZZ3, p, Lp.ZZZ3;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_ANNOTATION + R_TARGET + R_NON_RESTRICTED) + "}",
			requestor.getResults());
}
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=158985
public void test0325() throws JavaModelException {
	this.workingCopies = new ICompilationUnit[4];
	this.workingCopies[0] = getWorkingCopy(
			"/Completion/src3/test/Test.java",
			"package test;\n" +
			"public class Test {\n" +
			"    @p.Annot(@ZZZ)\n" +
			"    public void foo(){}\n" +
			"}");
	
	this.workingCopies[1] = getWorkingCopy(
			"/Completion/src3/p/ZZZ1.java",
			"package p;\n" +
			"@java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD})\n" +
			"public @interface ZZZ1 {\n" +
			"}");
	
	this.workingCopies[2] = getWorkingCopy(
			"/Completion/src3/p/ZZZ2.java",
			"package p;\n" +
			"public @interface ZZZ2 {\n" +
			"}");
	
	this.workingCopies[3] = getWorkingCopy(
			"/Completion/src3/p/Annot.java",
			"package p;\n" +
			"public @interface Annot {\n" +
			"    ZZZ2 value();\n" +
			"}");
	
	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
	String str = this.workingCopies[0].getSource();
	String completeBehind = "ZZZ";
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);

	assertResults(
			"ZZZ1[TYPE_REF]{p.ZZZ1, p, Lp.ZZZ1;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_ANNOTATION + R_NON_RESTRICTED) + "}\n" +
			"ZZZ2[TYPE_REF]{p.ZZZ2, p, Lp.ZZZ2;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_ANNOTATION + R_NON_RESTRICTED) + "}",
			requestor.getResults());
}
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=158985
public void test0326() throws JavaModelException {
	this.workingCopies = new ICompilationUnit[4];
	this.workingCopies[0] = getWorkingCopy(
			"/Completion/src3/test/Test.java",
			"package test;\n" +
			"public class Test {\n" +
			"    @p.Annot(@ZZZ(value=0))\n" +
			"    public void foo(){}\n" +
			"}");
	
	this.workingCopies[1] = getWorkingCopy(
			"/Completion/src3/p/ZZZ1.java",
			"package p;\n" +
			"@java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD})\n" +
			"public @interface ZZZ1 {\n" +
			"}");
	
	this.workingCopies[2] = getWorkingCopy(
			"/Completion/src3/p/ZZZ2.java",
			"package p;\n" +
			"public @interface ZZZ2 {\n" +
			"}");
	
	this.workingCopies[3] = getWorkingCopy(
			"/Completion/src3/p/Annot.java",
			"package p;\n" +
			"public @interface Annot {\n" +
			"    ZZZ2 value();\n" +
			"}");
	
	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
	String str = this.workingCopies[0].getSource();
	String completeBehind = "ZZZ";
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);

	assertResults(
			"ZZZ1[TYPE_REF]{p.ZZZ1, p, Lp.ZZZ1;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_ANNOTATION + R_NON_RESTRICTED) + "}\n" +
			"ZZZ2[TYPE_REF]{p.ZZZ2, p, Lp.ZZZ2;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_ANNOTATION + R_NON_RESTRICTED) + "}",
			requestor.getResults());
}
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=158985
public void test0327() throws JavaModelException {
	this.workingCopies = new ICompilationUnit[4];
	this.workingCopies[0] = getWorkingCopy(
			"/Completion/src3/test/Test.java",
			"package test;\n" +
			"public class Test {\n" +
			"    @p.Annot(@ZZZ(value=0\n" +
			"    public void foo(){}\n" +
			"}");
	
	this.workingCopies[1] = getWorkingCopy(
			"/Completion/src3/p/ZZZ1.java",
			"package p;\n" +
			"@java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD})\n" +
			"public @interface ZZZ1 {\n" +
			"}");
	
	this.workingCopies[2] = getWorkingCopy(
			"/Completion/src3/p/ZZZ2.java",
			"package p;\n" +
			"public @interface ZZZ2 {\n" +
			"}");
	
	this.workingCopies[3] = getWorkingCopy(
			"/Completion/src3/p/Annot.java",
			"package p;\n" +
			"public @interface Annot {\n" +
			"    ZZZ2 value();\n" +
			"}");
	
	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
	String str = this.workingCopies[0].getSource();
	String completeBehind = "ZZZ";
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);

	assertResults(
			"ZZZ1[TYPE_REF]{p.ZZZ1, p, Lp.ZZZ1;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_ANNOTATION + R_NON_RESTRICTED) + "}\n" +
			"ZZZ2[TYPE_REF]{p.ZZZ2, p, Lp.ZZZ2;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_ANNOTATION + R_NON_RESTRICTED) + "}",
			requestor.getResults());
}
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=158985
public void test0328() throws JavaModelException {
	this.workingCopies = new ICompilationUnit[4];
	this.workingCopies[0] = getWorkingCopy(
			"/Completion/src3/test/Test.java",
			"package test;\n" +
			"public class Test {\n" +
			"    @p.Annot(@ZZZ(value=\n" +
			"    public void foo(){}\n" +
			"}");
	
	this.workingCopies[1] = getWorkingCopy(
			"/Completion/src3/p/ZZZ1.java",
			"package p;\n" +
			"@java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD})\n" +
			"public @interface ZZZ1 {\n" +
			"}");
	
	this.workingCopies[2] = getWorkingCopy(
			"/Completion/src3/p/ZZZ2.java",
			"package p;\n" +
			"public @interface ZZZ2 {\n" +
			"}");
	
	this.workingCopies[3] = getWorkingCopy(
			"/Completion/src3/p/Annot.java",
			"package p;\n" +
			"public @interface Annot {\n" +
			"    ZZZ2 value();\n" +
			"}");
	
	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
	String str = this.workingCopies[0].getSource();
	String completeBehind = "ZZZ";
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);

	assertResults(
			"ZZZ1[TYPE_REF]{p.ZZZ1, p, Lp.ZZZ1;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_ANNOTATION + R_NON_RESTRICTED) + "}\n" +
			"ZZZ2[TYPE_REF]{p.ZZZ2, p, Lp.ZZZ2;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_ANNOTATION + R_NON_RESTRICTED) + "}",
			requestor.getResults());
}
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=158985
public void test0329() throws JavaModelException {
	this.workingCopies = new ICompilationUnit[4];
	this.workingCopies[0] = getWorkingCopy(
			"/Completion/src3/test/Test.java",
			"package test;\n" +
			"@ZZZ\n" +
			"public class Test {\n" +
			"}");
	
	this.workingCopies[1] = getWorkingCopy(
			"/Completion/src3/p/ZZZ1.java",
			"package p;\n" +
			"@java.lang.annotation.Target({java.lang.annotation.ElementType.TYPE})\n" +
			"public @interface ZZZ1 {\n" +
			"}");
	
	this.workingCopies[1] = getWorkingCopy(
			"/Completion/src3/p/ZZZ2.java",
			"package p;\n" +
			"@java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD})\n" +
			"public @interface ZZZ2 {\n" +
			"}");
	
	this.workingCopies[2] = getWorkingCopy(
			"/Completion/src3/p/ZZZ3.java",
			"package p;\n" +
			"public @interface ZZZ3 {\n" +
			"}");
	
	
	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
	String str = this.workingCopies[0].getSource();
	String completeBehind = "ZZZ";
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);

	assertResults(
			"ZZZ1[TYPE_REF]{p.ZZZ1, p, Lp.ZZZ1;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_ANNOTATION + R_TARGET + R_NON_RESTRICTED) + "}\n" +
			"ZZZ3[TYPE_REF]{p.ZZZ3, p, Lp.ZZZ3;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_ANNOTATION + R_TARGET + R_NON_RESTRICTED) + "}",
			requestor.getResults());
}
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=153130
public void testEC001() throws JavaModelException {
	this.workingCopies = new ICompilationUnit[1];

Lines 112-117 Link Here

(-)codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionParser.java (-51 / +215 lines)
112	// K_BETWEEN_ANNOTATION_NAME_AND_RPAREN arguments	112	// K_BETWEEN_ANNOTATION_NAME_AND_RPAREN arguments
113	static final int LPAREN_NOT_CONSUMED = 1;	113	static final int LPAREN_NOT_CONSUMED = 1;
114	static final int LPAREN_CONSUMED = 2;	114	static final int LPAREN_CONSUMED = 2;
		115	static final int ANNOTATION_NAME_COMPLETION = 4;
115		116
116	// K_PARAMETERIZED_METHOD_INVOCATION arguments	117	// K_PARAMETERIZED_METHOD_INVOCATION arguments
117	static final int INSIDE_NAME = 1;	118	static final int INSIDE_NAME = 1;
Lines 150-155 Link Here
150	public int[] potentialVariableNameStarts;	151	public int[] potentialVariableNameStarts;
151	public int[] potentialVariableNameEnds;	152	public int[] potentialVariableNameEnds;
152		153
		154	CompletionOnAnnotationOfType pendingAnnotation;
		155
153	public CompletionParser(ProblemReporter problemReporter) {	156	public CompletionParser(ProblemReporter problemReporter) {
154	super(problemReporter);	157	super(problemReporter);
155	this.reportSyntaxErrorIsRequired = false;	158	this.reportSyntaxErrorIsRequired = false;
Lines 263-274 Link Here
263	}	266	}
264		267
265	if(orphan instanceof Annotation) {	268	if(orphan instanceof Annotation) {
266	TypeDeclaration fakeType =	269	CompletionOnAnnotationOfType fakeType =
267	new CompletionOnAnnotationOfType(	270	new CompletionOnAnnotationOfType(
268	FAKE_TYPE_NAME,	271	FAKE_TYPE_NAME,
269	this.compilationUnit.compilationResult(),	272	this.compilationUnit.compilationResult(),
270	(Annotation)orphan);	273	(Annotation)orphan);
271	currentElement.parent.add(fakeType, 0);	274	currentElement.parent.add(fakeType, 0);
		275	this.pendingAnnotation = fakeType;
272	return;	276	return;
273	}	277	}
274	}	278	}
Lines 280-292 Link Here
280	}	284	}
281		285
282	if(orphan instanceof Annotation) {	286	if(orphan instanceof Annotation) {
283	TypeDeclaration fakeType =	287	popUntilCompletedAnnotationIfNecessary();
284	new CompletionOnAnnotationOfType(	288
285	FAKE_TYPE_NAME,	289	CompletionOnAnnotationOfType fakeType =
286	this.compilationUnit.compilationResult(),	290	new CompletionOnAnnotationOfType(
287	(Annotation)orphan);	291	FAKE_TYPE_NAME,
288	currentElement.add(fakeType, 0);	292	this.compilationUnit.compilationResult(),
289	return;	293	(Annotation)orphan);
		294	currentElement.add(fakeType, 0);
		295
		296	if (!isInsideAnnotation()) {
		297	this.pendingAnnotation = fakeType;
		298	}
		299
		300	return;
290	}	301	}
291		302
292	if ((topKnownElementKind(COMPLETION_OR_ASSIST_PARSER) == K_BETWEEN_CATCH_AND_RIGHT_PAREN)) {	303	if ((topKnownElementKind(COMPLETION_OR_ASSIST_PARSER) == K_BETWEEN_CATCH_AND_RIGHT_PAREN)) {
Lines 597-609 Link Here
597	annotation.memberValuePairs = memberValuePairs;	608	annotation.memberValuePairs = memberValuePairs;
598		609
599	}	610	}
600	TypeDeclaration fakeType =	611	CompletionOnAnnotationOfType fakeType =
601	new CompletionOnAnnotationOfType(	612	new CompletionOnAnnotationOfType(
602	FAKE_TYPE_NAME,	613	FAKE_TYPE_NAME,
603	this.compilationUnit.compilationResult(),	614	this.compilationUnit.compilationResult(),
604	annotation);	615	annotation);
605		616
606	currentElement.add(fakeType, 0);	617	currentElement.add(fakeType, 0);
		618	this.pendingAnnotation = fakeType;
607	}	619	}
608	private void buildMoreCompletionContext(Expression expression) {	620	private void buildMoreCompletionContext(Expression expression) {
609	Statement statement = expression;	621	Statement statement = expression;
Lines 1892-1897 Link Here
1892	protected void consumeClassBodyDeclaration() {	1904	protected void consumeClassBodyDeclaration() {
1893	popElement(K_BLOCK_DELIMITER);	1905	popElement(K_BLOCK_DELIMITER);
1894	super.consumeClassBodyDeclaration();	1906	super.consumeClassBodyDeclaration();
		1907	this.pendingAnnotation = null; // the pending annotation cannot be attached to next nodes
1895	}	1908	}
1896	protected void consumeClassBodyopt() {	1909	protected void consumeClassBodyopt() {
1897	popElement(K_SELECTOR_QUALIFIER);	1910	popElement(K_SELECTOR_QUALIFIER);
Lines 1919-1925 Link Here
1919	}	1932	}
1920	protected void consumeClassHeaderName1() {	1933	protected void consumeClassHeaderName1() {
1921	super.consumeClassHeaderName1();	1934	super.consumeClassHeaderName1();
1922		1935	if (this.pendingAnnotation != null) {
		1936	this.pendingAnnotation.potentialAnnotatedNode = this.astStack[this.astPtr];
		1937	this.pendingAnnotation = null;
		1938	}
1923	classHeaderExtendsOrImplements(false);	1939	classHeaderExtendsOrImplements(false);
1924	}	1940	}
1925		1941
Lines 2002-2008 Link Here
2002		2018
2003	/* no need to take action if not inside assist identifiers */	2019	/* no need to take action if not inside assist identifiers */
2004	if (indexOfAssistIdentifier() < 0) {	2020	if (indexOfAssistIdentifier() < 0) {
2005	super.consumeConstructorHeaderName();	2021	/* recovering - might be an empty message send */
		2022	if (this.currentElement != null && this.lastIgnoredToken == TokenNamenew){ // was an allocation expression
		2023	super.consumeConstructorHeaderName();
		2024	} else {
		2025	super.consumeConstructorHeaderName();
		2026	if (this.pendingAnnotation != null) {
		2027	this.pendingAnnotation.potentialAnnotatedNode = this.astStack[this.astPtr];
		2028	this.pendingAnnotation = null;
		2029	}
		2030	}
2006	return;	2031	return;
2007	}	2032	}
2008		2033
Lines 2014-2019 Link Here
2014	pushOnGenericsLengthStack(0); // handle type arguments	2039	pushOnGenericsLengthStack(0); // handle type arguments
2015	this.restartRecovery = true;	2040	this.restartRecovery = true;
2016	}	2041	}
		2042	protected void consumeConstructorHeaderNameWithTypeParameters() {
		2043	if (this.currentElement != null && this.lastIgnoredToken == TokenNamenew){ // was an allocation expression
		2044	super.consumeConstructorHeaderNameWithTypeParameters();
		2045	} else {
		2046	super.consumeConstructorHeaderNameWithTypeParameters();
		2047	if (this.pendingAnnotation != null) {
		2048	this.pendingAnnotation.potentialAnnotatedNode = this.astStack[this.astPtr];
		2049	this.pendingAnnotation = null;
		2050	}
		2051	}
		2052	}
2017	protected void consumeDefaultLabel() {	2053	protected void consumeDefaultLabel() {
2018	super.consumeDefaultLabel();	2054	super.consumeDefaultLabel();
2019	if(topKnownElementKind(COMPLETION_OR_ASSIST_PARSER) == K_SWITCH_LABEL) {	2055	if(topKnownElementKind(COMPLETION_OR_ASSIST_PARSER) == K_SWITCH_LABEL) {
Lines 2025-2030 Link Here
2025	// DimWithOrWithOutExpr ::= '[' ']'	2061	// DimWithOrWithOutExpr ::= '[' ']'
2026	pushOnExpressionStack(null);	2062	pushOnExpressionStack(null);
2027	}	2063	}
		2064	protected void consumeEnhancedForStatementHeaderInit(boolean hasModifiers) {
		2065	super.consumeEnhancedForStatementHeaderInit(hasModifiers);
		2066	if (this.pendingAnnotation != null) {
		2067	this.pendingAnnotation.potentialAnnotatedNode = this.astStack[this.astPtr];
		2068	this.pendingAnnotation = null;
		2069	}
		2070	}
2028	protected void consumeEnterAnonymousClassBody() {	2071	protected void consumeEnterAnonymousClassBody() {
2029	popElement(K_SELECTOR_QUALIFIER);	2072	popElement(K_SELECTOR_QUALIFIER);
2030	popElement(K_SELECTOR_INVOCATION_TYPE);	2073	popElement(K_SELECTOR_INVOCATION_TYPE);
Lines 2041-2083 Link Here
2041	if(isLocalDeclaration \|\| indexOfAssistIdentifier() < 0 \|\| variableIndex != 0 \|\| extendedDimension != 0) {	2084	if(isLocalDeclaration \|\| indexOfAssistIdentifier() < 0 \|\| variableIndex != 0 \|\| extendedDimension != 0) {
2042	identifierPtr++;	2085	identifierPtr++;
2043	identifierLengthPtr++;	2086	identifierLengthPtr++;
2044	super.consumeEnterVariable();	2087
		2088	if (this.pendingAnnotation != null &&
		2089	this.assistNode != null &&
		2090	this.currentElement != null &&
		2091	this.currentElement instanceof RecoveredMethod &&
		2092	!this.currentElement.foundOpeningBrace &&
		2093	((RecoveredMethod)this.currentElement).methodDeclaration.declarationSourceEnd == 0) {
		2094	// this is a method parameter
		2095	super.consumeEnterVariable();
		2096	this.pendingAnnotation.potentialAnnotatedNode = this.astStack[this.astPtr];
		2097	this.pendingAnnotation.isParameter = true;
		2098	this.pendingAnnotation = null;
		2099
		2100	} else {
		2101	super.consumeEnterVariable();
		2102	if (this.pendingAnnotation != null) {
		2103	this.pendingAnnotation.potentialAnnotatedNode = this.astStack[this.astPtr];
		2104	this.pendingAnnotation = null;
		2105	}
		2106	}
2045	} else {	2107	} else {
2046	restartRecovery = true;	2108	restartRecovery = true;
2047		2109
2048	// private boolean checkKeyword() {
2049	// if (currentElement instanceof RecoveredUnit) {
2050	// RecoveredUnit unit = (RecoveredUnit) currentElement;
2051	// int index = -1;
2052	// if ((index = this.indexOfAssistIdentifier()) > -1) {
2053	// if(unit.typeCount == 0
2054	// && CharOperation.prefixEquals(identifierStack[index], Keywords.IMPORT)) {
2055	// CompletionOnKeyword2 completionOnImportKeyword = new CompletionOnKeyword2(Keywords.IMPORT, identifierPositionStack[index]);
2056	// this.assistNode = completionOnImportKeyword;
2057	// this.lastCheckPoint = completionOnImportKeyword.sourceEnd + 1;
2058	// this.isOrphanCompletionNode = true;
2059	// return true;
2060	// } else if(unit.typeCount == 0
2061	// && unit.importCount == 0
2062	// && CharOperation.prefixEquals(identifierStack[index], Keywords.PACKAGE)) {
2063	// CompletionOnKeyword2 completionOnImportKeyword = new CompletionOnKeyword2(Keywords.PACKAGE, identifierPositionStack[index]);
2064	// this.assistNode = completionOnImportKeyword;
2065	// this.lastCheckPoint = completionOnImportKeyword.sourceEnd + 1;
2066	// this.isOrphanCompletionNode = true;
2067	// return true;
2068	// }
2069	// }
2070	// }
2071	// return false;
2072	// }
2073
2074	// recovery	2110	// recovery
2075	if (currentElement != null) {	2111	if (currentElement != null) {
2076	if(!checkKeyword() && !(currentElement instanceof RecoveredUnit && ((RecoveredUnit)currentElement).typeCount == 0)) {	2112	if(!checkKeyword() && !(currentElement instanceof RecoveredUnit && ((RecoveredUnit)currentElement).typeCount == 0)) {
2077	int nameSourceStart = (int)(identifierPositionStack[identifierPtr] >>> 32);	2113	int nameSourceStart = (int)(identifierPositionStack[identifierPtr] >>> 32);
2078	intPtr--;	2114	intPtr--;
2079	// pushOnGenericsIdentifiersLengthStack(identifierLengthStack[identifierLengthPtr]);
2080	// pushOnGenericsLengthStack(0);
2081	TypeReference type = getTypeReference(intStack[intPtr--]);	2115	TypeReference type = getTypeReference(intStack[intPtr--]);
2082	intPtr--;	2116	intPtr--;
2083		2117
Lines 2100-2105 Link Here
2100	}	2134	}
2101	}	2135	}
2102	}	2136	}
		2137	protected void consumeEnumConstantHeaderName() {
		2138	if (this.currentElement != null) {
		2139	if (!(this.currentElement instanceof RecoveredType
		2140	\|\| (this.currentElement instanceof RecoveredField && ((RecoveredField)currentElement).fieldDeclaration.type == null))
		2141	\|\| (this.lastIgnoredToken == TokenNameDOT)) {
		2142	super.consumeEnumConstantHeaderName();
		2143	return;
		2144	}
		2145	}
		2146	super.consumeEnumConstantHeaderName();
		2147	if (this.pendingAnnotation != null) {
		2148	this.pendingAnnotation.potentialAnnotatedNode = this.astStack[this.astPtr];
		2149	this.pendingAnnotation = null;
		2150	}
		2151	}
		2152	protected void consumeEnumHeaderName() {
		2153	super.consumeEnumHeaderName();
		2154	if (this.pendingAnnotation != null) {
		2155	this.pendingAnnotation.potentialAnnotatedNode = this.astStack[this.astPtr];
		2156	this.pendingAnnotation = null;
		2157	}
		2158	}
2103	protected void consumeEqualityExpression(int op) {	2159	protected void consumeEqualityExpression(int op) {
2104	super.consumeEqualityExpression(op);	2160	super.consumeEqualityExpression(op);
2105	popElement(K_BINARY_OPERATOR);	2161	popElement(K_BINARY_OPERATOR);
Lines 2163-2168 Link Here
2163	protected void consumeFormalParameter(boolean isVarArgs) {	2219	protected void consumeFormalParameter(boolean isVarArgs) {
2164	if (this.indexOfAssistIdentifier() < 0) {	2220	if (this.indexOfAssistIdentifier() < 0) {
2165	super.consumeFormalParameter(isVarArgs);	2221	super.consumeFormalParameter(isVarArgs);
		2222	if (this.pendingAnnotation != null) {
		2223	this.pendingAnnotation.potentialAnnotatedNode = this.astStack[this.astPtr];
		2224	this.pendingAnnotation = null;
		2225	}
2166	} else {	2226	} else {
2167		2227
2168	identifierLengthPtr--;	2228	identifierLengthPtr--;
Lines 2298-2304 Link Here
2298	}	2358	}
2299	protected void consumeInterfaceHeaderName1() {	2359	protected void consumeInterfaceHeaderName1() {
2300	super.consumeInterfaceHeaderName1();	2360	super.consumeInterfaceHeaderName1();
2301		2361	if (this.pendingAnnotation != null) {
		2362	this.pendingAnnotation.potentialAnnotatedNode = this.astStack[this.astPtr];
		2363	this.pendingAnnotation = null;
		2364	}
2302	classHeaderExtendsOrImplements(true);	2365	classHeaderExtendsOrImplements(true);
2303	}	2366	}
2304	protected void consumeInterfaceHeaderExtends() {	2367	protected void consumeInterfaceHeaderExtends() {
Lines 2349-2354 Link Here
2349	identifierPtr++;	2412	identifierPtr++;
2350	identifierLengthPtr++;	2413	identifierLengthPtr++;
2351	super.consumeMethodHeaderName(isAnnotationMethod);	2414	super.consumeMethodHeaderName(isAnnotationMethod);
		2415	if (this.pendingAnnotation != null) {
		2416	this.pendingAnnotation.potentialAnnotatedNode = this.astStack[this.astPtr];
		2417	this.pendingAnnotation = null;
		2418	}
2352	} else {	2419	} else {
2353	restartRecovery = true;	2420	restartRecovery = true;
2354		2421
Lines 2463-2468 Link Here
2463	}	2530	}
2464	}	2531	}
2465	}	2532	}
		2533	protected void consumeMethodHeaderNameWithTypeParameters( boolean isAnnotationMethod) {
		2534	super.consumeMethodHeaderNameWithTypeParameters(isAnnotationMethod);
		2535	if (this.pendingAnnotation != null) {
		2536	this.pendingAnnotation.potentialAnnotatedNode = this.astStack[this.astPtr];
		2537	this.pendingAnnotation = null;
		2538	}
		2539	}
2466	protected void consumeMethodHeaderRightParen() {	2540	protected void consumeMethodHeaderRightParen() {
2467	super.consumeMethodHeaderRightParen();	2541	super.consumeMethodHeaderRightParen();
2468		2542
Lines 2576-2584 Link Here
2576		2650
2577	assistNode = markerAnnotation;	2651	assistNode = markerAnnotation;
2578	this.isOrphanCompletionNode = true;	2652	this.isOrphanCompletionNode = true;
2579	this.restartRecovery = true;
2580		2653
2581	this.lastCheckPoint = markerAnnotation.sourceEnd + 1;	2654	this.lastCheckPoint = markerAnnotation.sourceEnd + 1;
		2655
		2656	this.pushOnElementStack(K_BETWEEN_ANNOTATION_NAME_AND_RPAREN, LPAREN_NOT_CONSUMED \| ANNOTATION_NAME_COMPLETION);
		2657	}
		2658	protected void consumeAnnotationTypeDeclarationHeaderName() {
		2659	super.consumeAnnotationTypeDeclarationHeaderName();
		2660	if (this.pendingAnnotation != null) {
		2661	this.pendingAnnotation.potentialAnnotatedNode = this.astStack[this.astPtr];
		2662	this.pendingAnnotation = null;
		2663	}
2582	}	2664	}
2583	protected void consumeLabel() {	2665	protected void consumeLabel() {
2584	super.consumeLabel();	2666	super.consumeLabel();
Lines 2586-2593 Link Here
2586	this.pushOnElementStack(K_LABEL, this.labelPtr);	2668	this.pushOnElementStack(K_LABEL, this.labelPtr);
2587	}	2669	}
2588	protected void consumeMarkerAnnotation() {	2670	protected void consumeMarkerAnnotation() {
2589	this.popElement(K_BETWEEN_ANNOTATION_NAME_AND_RPAREN);	2671	if (this.topKnownElementKind(COMPLETION_OR_ASSIST_PARSER) == K_BETWEEN_ANNOTATION_NAME_AND_RPAREN &&
2590	super.consumeMarkerAnnotation();	2672	(this.topKnownElementInfo(COMPLETION_OR_ASSIST_PARSER) & ANNOTATION_NAME_COMPLETION) != 0 ) {
		2673	this.popElement(K_BETWEEN_ANNOTATION_NAME_AND_RPAREN);
		2674	this.restartRecovery = true;
		2675	} else {
		2676	this.popElement(K_BETWEEN_ANNOTATION_NAME_AND_RPAREN);
		2677	super.consumeMarkerAnnotation();
		2678	}
2591	}	2679	}
2592	protected void consumeMemberValuePair() {	2680	protected void consumeMemberValuePair() {
2593	/* check if current awaiting identifier is the completion identifier */	2681	/* check if current awaiting identifier is the completion identifier */
Lines 2656-2663 Link Here
2656	}	2744	}
2657	}	2745	}
2658	protected void consumeSingleMemberAnnotation() {	2746	protected void consumeSingleMemberAnnotation() {
2659	this.popElement(K_BETWEEN_ANNOTATION_NAME_AND_RPAREN);	2747	if (this.topKnownElementKind(COMPLETION_OR_ASSIST_PARSER) == K_BETWEEN_ANNOTATION_NAME_AND_RPAREN &&
2660	super.consumeSingleMemberAnnotation();	2748	(this.topKnownElementInfo(COMPLETION_OR_ASSIST_PARSER) & ANNOTATION_NAME_COMPLETION) != 0 ) {
		2749	this.popElement(K_BETWEEN_ANNOTATION_NAME_AND_RPAREN);
		2750	this.restartRecovery = true;
		2751	} else {
		2752	this.popElement(K_BETWEEN_ANNOTATION_NAME_AND_RPAREN);
		2753	super.consumeSingleMemberAnnotation();
		2754	}
		2755	}
		2756	protected void consumeSingleStaticImportDeclarationName() {
		2757	super.consumeSingleStaticImportDeclarationName();
		2758	this.pendingAnnotation = null; // the pending annotation cannot be attached to next nodes
		2759	}
		2760	protected void consumeSingleTypeImportDeclarationName() {
		2761	super.consumeSingleTypeImportDeclarationName();
		2762	this.pendingAnnotation = null; // the pending annotation cannot be attached to next nodes
2661	}	2763	}
2662	protected void consumeStatementBreakWithLabel() {	2764	protected void consumeStatementBreakWithLabel() {
2663	super.consumeStatementBreakWithLabel();	2765	super.consumeStatementBreakWithLabel();
Lines 2680-2692 Link Here
2680	popElement(K_BLOCK_DELIMITER);	2782	popElement(K_BLOCK_DELIMITER);
2681	}	2783	}
2682	}	2784	}
		2785	protected void consumeStaticImportOnDemandDeclarationName() {
		2786	super.consumeStaticImportOnDemandDeclarationName();
		2787	this.pendingAnnotation = null; // the pending annotation cannot be attached to next nodes
		2788	}
		2789	protected void consumeStaticInitializer() {
		2790	super.consumeStaticInitializer();
		2791	this.pendingAnnotation = null; // the pending annotation cannot be attached to next nodes
		2792	}
2683	protected void consumeNestedMethod() {	2793	protected void consumeNestedMethod() {
2684	super.consumeNestedMethod();	2794	super.consumeNestedMethod();
2685	if(!(topKnownElementKind(COMPLETION_OR_ASSIST_PARSER) == K_BLOCK_DELIMITER)) pushOnElementStack(K_BLOCK_DELIMITER);	2795	if(!(topKnownElementKind(COMPLETION_OR_ASSIST_PARSER) == K_BLOCK_DELIMITER)) pushOnElementStack(K_BLOCK_DELIMITER);
2686	}	2796	}
2687	protected void consumeNormalAnnotation() {	2797	protected void consumeNormalAnnotation() {
2688	this.popElement(K_BETWEEN_ANNOTATION_NAME_AND_RPAREN);	2798	if (this.topKnownElementKind(COMPLETION_OR_ASSIST_PARSER) == K_BETWEEN_ANNOTATION_NAME_AND_RPAREN &&
2689	super.consumeNormalAnnotation();	2799	(this.topKnownElementInfo(COMPLETION_OR_ASSIST_PARSER) & ANNOTATION_NAME_COMPLETION) != 0 ) {
		2800	this.popElement(K_BETWEEN_ANNOTATION_NAME_AND_RPAREN);
		2801	this.restartRecovery = true;
		2802	} else {
		2803	this.popElement(K_BETWEEN_ANNOTATION_NAME_AND_RPAREN);
		2804	super.consumeNormalAnnotation();
		2805	}
		2806	}
		2807	protected void consumePackageDeclarationName() {
		2808	super.consumePackageDeclarationName();
		2809	if (this.pendingAnnotation != null) {
		2810	this.pendingAnnotation.potentialAnnotatedNode = this.compilationUnit.currentPackage;
		2811	this.pendingAnnotation = null;
		2812	}
		2813	}
		2814	protected void consumePackageDeclarationNameWithModifiers() {
		2815	super.consumePackageDeclarationNameWithModifiers();
		2816	if (this.pendingAnnotation != null) {
		2817	this.pendingAnnotation.potentialAnnotatedNode = this.compilationUnit.currentPackage;
		2818	this.pendingAnnotation = null;
		2819	}
2690	}	2820	}
2691	protected void consumePrimaryNoNewArrayName() {	2821	protected void consumePrimaryNoNewArrayName() {
2692	// this is class literal access, so reset potential receiver	2822	// this is class literal access, so reset potential receiver
Lines 2849-2859 Link Here
2849	switch (previous) {	2979	switch (previous) {
2850	case TokenNameIdentifier: // eg. fred[(]) or foo.fred[(])	2980	case TokenNameIdentifier: // eg. fred[(]) or foo.fred[(])
2851	if (topKnownElementKind(COMPLETION_OR_ASSIST_PARSER) == K_SELECTOR) {	2981	if (topKnownElementKind(COMPLETION_OR_ASSIST_PARSER) == K_SELECTOR) {
		2982	int info = 0;
2852	if(topKnownElementKind(COMPLETION_OR_ASSIST_PARSER,1) == K_BETWEEN_ANNOTATION_NAME_AND_RPAREN &&	2983	if(topKnownElementKind(COMPLETION_OR_ASSIST_PARSER,1) == K_BETWEEN_ANNOTATION_NAME_AND_RPAREN &&
2853	topKnownElementInfo(COMPLETION_OR_ASSIST_PARSER,1) == LPAREN_NOT_CONSUMED) {	2984	(info=topKnownElementInfo(COMPLETION_OR_ASSIST_PARSER,1) & LPAREN_NOT_CONSUMED) != 0) {
2854	this.popElement(K_SELECTOR);	2985	this.popElement(K_SELECTOR);
2855	this.popElement(K_BETWEEN_ANNOTATION_NAME_AND_RPAREN);	2986	this.popElement(K_BETWEEN_ANNOTATION_NAME_AND_RPAREN);
2856	this.pushOnElementStack(K_BETWEEN_ANNOTATION_NAME_AND_RPAREN, LPAREN_CONSUMED);	2987	if ((info & ANNOTATION_NAME_COMPLETION) != 0) {
		2988	this.pushOnElementStack(K_BETWEEN_ANNOTATION_NAME_AND_RPAREN, LPAREN_CONSUMED \| ANNOTATION_NAME_COMPLETION);
		2989	} else {
		2990	this.pushOnElementStack(K_BETWEEN_ANNOTATION_NAME_AND_RPAREN, LPAREN_CONSUMED);
		2991	}
2857	} else {	2992	} else {
2858	this.pushOnElementStack(K_SELECTOR_INVOCATION_TYPE, this.invocationType);	2993	this.pushOnElementStack(K_SELECTOR_INVOCATION_TYPE, this.invocationType);
2859	this.pushOnElementStack(K_SELECTOR_QUALIFIER, this.qualifier);	2994	this.pushOnElementStack(K_SELECTOR_QUALIFIER, this.qualifier);
Lines 3238-3243 Link Here
3238	TypeDeclaration typeDecl = (TypeDeclaration)this.astStack[this.astPtr];	3373	TypeDeclaration typeDecl = (TypeDeclaration)this.astStack[this.astPtr];
3239	classHeaderExtendsOrImplements((typeDecl.modifiers & ClassFileConstants.AccInterface) != 0);	3374	classHeaderExtendsOrImplements((typeDecl.modifiers & ClassFileConstants.AccInterface) != 0);
3240	}	3375	}
		3376	protected void consumeTypeImportOnDemandDeclarationName() {
		3377	super.consumeTypeImportOnDemandDeclarationName();
		3378	this.pendingAnnotation = null; // the pending annotation cannot be attached to next nodes
		3379	}
3241	protected void consumeTypeParameters() {	3380	protected void consumeTypeParameters() {
3242	super.consumeTypeParameters();	3381	super.consumeTypeParameters();
3243	popElement(K_BINARY_OPERATOR);	3382	popElement(K_BINARY_OPERATOR);
Lines 3780-3785 Link Here
3780	}	3919	}
3781	return false;	3920	return false;
3782	}	3921	}
		3922
3783	protected boolean isIndirectlyInsideBlock(){	3923	protected boolean isIndirectlyInsideBlock(){
3784	int i = elementPtr;	3924	int i = elementPtr;
3785	while(i > -1) {	3925	while(i > -1) {
Lines 3919-3924 Link Here
3919		4059
3920	return fakeMethod;	4060	return fakeMethod;
3921	}	4061	}
		4062	protected void popUntilCompletedAnnotationIfNecessary() {
		4063	if(elementPtr < 0) return;
		4064
		4065	int i = elementPtr;
		4066	while(i > -1 &&
		4067	(elementKindStack[i] != K_BETWEEN_ANNOTATION_NAME_AND_RPAREN \|\|
		4068	(elementInfoStack[i] & ANNOTATION_NAME_COMPLETION) == 0)) {
		4069	i--;
		4070	}
		4071
		4072	if(i >= 0) {
		4073	previousKind = elementKindStack[i];
		4074	previousInfo = elementInfoStack[i];
		4075	elementPtr = i - 1;
		4076	}
		4077	}
3922	/*	4078	/*
3923	* Prepares the state of the parser to go for BlockStatements.	4079	* Prepares the state of the parser to go for BlockStatements.
3924	*/	4080	*/
Lines 4012-4017 Link Here
4012	public void recoveryTokenCheck() {	4168	public void recoveryTokenCheck() {
4013	RecoveredElement oldElement = currentElement;	4169	RecoveredElement oldElement = currentElement;
4014	switch (currentToken) {	4170	switch (currentToken) {
		4171	case TokenNameLBRACE :
		4172	if(!this.ignoreNextOpeningBrace) {
		4173	this.pendingAnnotation = null; // the pending annotation cannot be attached to next nodes
		4174	}
		4175	super.recoveryTokenCheck();
		4176	break;
4015	case TokenNameRBRACE :	4177	case TokenNameRBRACE :
4016	super.recoveryTokenCheck();	4178	super.recoveryTokenCheck();
4017	if(currentElement != oldElement && oldElement instanceof RecoveredBlock) {	4179	if(currentElement != oldElement && oldElement instanceof RecoveredBlock) {
Lines 4099-4105 Link Here
4099	/* restart in diet mode for finding sibling constructs */	4261	/* restart in diet mode for finding sibling constructs */
4100	if (currentElement instanceof RecoveredType	4262	if (currentElement instanceof RecoveredType
4101	\|\| currentElement.enclosingType() != null){	4263	\|\| currentElement.enclosingType() != null){
4102		4264
		4265	this.pendingAnnotation = null;
		4266
4103	if(lastCheckPoint <= this.assistNode.sourceEnd) {	4267	if(lastCheckPoint <= this.assistNode.sourceEnd) {
4104	lastCheckPoint = this.assistNode.sourceEnd+1;	4268	lastCheckPoint = this.assistNode.sourceEnd+1;
4105	}	4269	}

Lines 11-20 Link Here

(-)codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionOnAnnotationOfType.java (+6 lines)
11	package org.eclipse.jdt.internal.codeassist.complete;	11	package org.eclipse.jdt.internal.codeassist.complete;
12		12
13	import org.eclipse.jdt.internal.compiler.CompilationResult;	13	import org.eclipse.jdt.internal.compiler.CompilationResult;
		14	import org.eclipse.jdt.internal.compiler.ast.ASTNode;
14	import org.eclipse.jdt.internal.compiler.ast.Annotation;	15	import org.eclipse.jdt.internal.compiler.ast.Annotation;
15	import org.eclipse.jdt.internal.compiler.ast.TypeDeclaration;	16	import org.eclipse.jdt.internal.compiler.ast.TypeDeclaration;
16		17
17	public class CompletionOnAnnotationOfType extends TypeDeclaration {	18	public class CompletionOnAnnotationOfType extends TypeDeclaration {
		19	public ASTNode potentialAnnotatedNode;
		20	// During recovery a parameter can be parsed as a FieldDeclaration instead of Argument.
		21	// 'isParameter' is set to true in this case.
		22	public boolean isParameter;
		23
18	public CompletionOnAnnotationOfType(char[] typeName, CompilationResult compilationResult, Annotation annotation){	24	public CompletionOnAnnotationOfType(char[] typeName, CompilationResult compilationResult, Annotation annotation){
19	super(compilationResult);	25	super(compilationResult);
20	this.sourceEnd = annotation.sourceEnd;	26	this.sourceEnd = annotation.sourceEnd;

Lines 42-45 Link Here

(-)codeassist/org/eclipse/jdt/internal/codeassist/RelevanceConstants.java (+1 lines)
42	int R_NON_INHERITED = 2;	42	int R_NON_INHERITED = 2;
43	int R_NO_PROBLEMS = 1;	43	int R_NO_PROBLEMS = 1;
44	int R_RESOLVED = 1;	44	int R_RESOLVED = 1;
		45	int R_TARGET = 5;
45	}	46	}

Lines 255-260 Link Here

(-)codeassist/org/eclipse/jdt/internal/codeassist/CompletionEngine.java (-11 / +129 lines)
255	int assistNodeInJavadoc = 0;	255	int assistNodeInJavadoc = 0;
256	boolean assistNodeCanBeSingleMemberAnnotation = false;	256	boolean assistNodeCanBeSingleMemberAnnotation = false;
257		257
		258	long targetedElement;
		259
258	IJavaProject javaProject;	260	IJavaProject javaProject;
259	CompletionParser parser;	261	CompletionParser parser;
260	CompletionRequestor requestor;	262	CompletionRequestor requestor;
Lines 436-442 Link Here
436	acceptedTypes.add(new AcceptedType(packageName, simpleTypeName, enclosingTypeNames, modifiers, accessibility));	438	acceptedTypes.add(new AcceptedType(packageName, simpleTypeName, enclosingTypeNames, modifiers, accessibility));
437	}	439	}
438		440
439	private void acceptTypes() {	441	private void acceptTypes(Scope scope) {
440	if(this.acceptedTypes == null) return;	442	if(this.acceptedTypes == null) return;
441		443
442	int length = this.acceptedTypes.size();	444	int length = this.acceptedTypes.size();
Lines 512-518 Link Here
512	accessibility,	514	accessibility,
513	typeName,	515	typeName,
514	fullyQualifiedName,	516	fullyQualifiedName,
515	!CharOperation.equals(fullyQualifiedName, importName[1]));	517	!CharOperation.equals(fullyQualifiedName, importName[1]),
		518	scope);
516	continue next;	519	continue next;
517	}	520	}
518	}	521	}
Lines 526-532 Link Here
526	accessibility,	529	accessibility,
527	typeName,	530	typeName,
528	fullyQualifiedName,	531	fullyQualifiedName,
529	false);	532	false,
		533	scope);
530	continue next;	534	continue next;
531	} else {	535	} else {
532	char[] fullyQualifiedEnclosingTypeOrPackageName = null;	536	char[] fullyQualifiedEnclosingTypeOrPackageName = null;
Lines 610-616 Link Here
610	accessibility,	614	accessibility,
611	typeName,	615	typeName,
612	fullyQualifiedName,	616	fullyQualifiedName,
613	true);	617	true,
		618	scope);
614	}	619	}
615	}	620	}
616	}	621	}
Lines 628-634 Link Here
628	value.accessibility,	633	value.accessibility,
629	value.qualifiedTypeName,	634	value.qualifiedTypeName,
630	value.fullyQualifiedName,	635	value.fullyQualifiedName,
631	value.mustBeQualified);	636	value.mustBeQualified,
		637	scope);
632	}	638	}
633	}	639	}
634	}	640	}
Lines 691-697 Link Here
691	return true;	697	return true;
692	}	698	}
693		699
694	private void proposeType(char[] packageName, char[] simpleTypeName, int modifiers, int accessibility, char[] typeName, char[] fullyQualifiedName, boolean isQualified) {	700	private void proposeType(char[] packageName, char[] simpleTypeName, int modifiers, int accessibility, char[] typeName, char[] fullyQualifiedName, boolean isQualified, Scope scope) {
695	char[] completionName = fullyQualifiedName;	701	char[] completionName = fullyQualifiedName;
696	if(isQualified) {	702	if(isQualified) {
697	if (packageName == null \|\| packageName.length == 0)	703	if (packageName == null \|\| packageName.length == 0)
Lines 700-705 Link Here
700	} else {	706	} else {
701	completionName = simpleTypeName;	707	completionName = simpleTypeName;
702	}	708	}
		709
		710	TypeBinding guessedType = null;
		711	if ((modifiers & ClassFileConstants.AccAnnotation) != 0 &&
		712	this.assistNodeIsAnnotation &&
		713	(this.targetedElement & TagBits.AnnotationTargetMASK) != 0) {
		714	char[][] cn = CharOperation.splitOn('.', fullyQualifiedName);
		715
		716	TypeReference ref;
		717	if (cn.length == 1) {
		718	ref = new SingleTypeReference(simpleTypeName, 0);
		719	} else {
		720	ref = new QualifiedTypeReference(cn,new long[cn.length]);
		721	}
		722
		723	switch (scope.kind) {
		724	case Scope.METHOD_SCOPE :
		725	case Scope.BLOCK_SCOPE :
		726	guessedType = ref.resolveType((BlockScope)scope);
		727	break;
		728	case Scope.CLASS_SCOPE :
		729	guessedType = ref.resolveType((ClassScope)scope);
		730	break;
		731	}
		732
		733	if (!guessedType.isValidBinding()) return;
		734
		735	if (!hasPossibleAnnotationTarget(guessedType, scope)) return;
		736	}
703		737
704	int relevance = computeBaseRelevance();	738	int relevance = computeBaseRelevance();
705	relevance += computeRelevanceForResolution();	739	relevance += computeRelevanceForResolution();
Lines 714-719 Link Here
714	case ClassFileConstants.AccAnnotation:	748	case ClassFileConstants.AccAnnotation:
715	case ClassFileConstants.AccAnnotation \| ClassFileConstants.AccInterface:	749	case ClassFileConstants.AccAnnotation \| ClassFileConstants.AccInterface:
716	relevance += computeRelevanceForAnnotation();	750	relevance += computeRelevanceForAnnotation();
		751	if (guessedType != null) relevance += computeRelevanceForAnnotationTarget(guessedType);
717	relevance += computeRelevanceForInterface();	752	relevance += computeRelevanceForInterface();
718	break;	753	break;
719	case ClassFileConstants.AccEnum:	754	case ClassFileConstants.AccEnum:
Lines 1428-1433 Link Here
1428	} else if (astNode instanceof CompletionOnMarkerAnnotationName) {	1463	} else if (astNode instanceof CompletionOnMarkerAnnotationName) {
1429	CompletionOnMarkerAnnotationName annot = (CompletionOnMarkerAnnotationName) astNode;	1464	CompletionOnMarkerAnnotationName annot = (CompletionOnMarkerAnnotationName) astNode;
1430		1465
		1466	CompletionOnAnnotationOfType fakeType = (CompletionOnAnnotationOfType)scope.parent.referenceContext();
		1467	if (fakeType.annotations[0] == annot) {
		1468	// When the completion is inside a method body the annotation cannot be accuratly attached to the correct node by completion recovery.
		1469	// So 'targetedElement' is not computed in this case.
		1470	if (scope.parent.parent == null \|\| !(scope.parent.parent instanceof MethodScope)) {
		1471	this.targetedElement = computeTargetedElement(fakeType);
		1472	}
		1473
		1474	}
		1475
1431	this.assistNodeIsAnnotation = true;	1476	this.assistNodeIsAnnotation = true;
1432	if (annot.type instanceof CompletionOnSingleTypeReference) {	1477	if (annot.type instanceof CompletionOnSingleTypeReference) {
1433	CompletionOnSingleTypeReference type = (CompletionOnSingleTypeReference) annot.type;	1478	CompletionOnSingleTypeReference type = (CompletionOnSingleTypeReference) annot.type;
Lines 2110-2115 Link Here
2110	}	2155	}
2111	}	2156	}
2112		2157
		2158	private long computeTargetedElement(CompletionOnAnnotationOfType fakeNode) {
		2159	ASTNode annotatedElement = fakeNode.potentialAnnotatedNode;
		2160
		2161	if (annotatedElement instanceof TypeDeclaration) {
		2162	TypeDeclaration annotatedTypeDeclaration = (TypeDeclaration) annotatedElement;
		2163	if (TypeDeclaration.kind(annotatedTypeDeclaration.modifiers) == TypeDeclaration.ANNOTATION_TYPE_DECL) {
		2164	return TagBits.AnnotationForAnnotationType \| TagBits.AnnotationForType;
		2165	}
		2166	return TagBits.AnnotationForType;
		2167	} else if (annotatedElement instanceof FieldDeclaration) {
		2168	if (fakeNode.isParameter) {
		2169	return TagBits.AnnotationForParameter;
		2170	}
		2171	return TagBits.AnnotationForField;
		2172	} else if (annotatedElement instanceof MethodDeclaration) {
		2173	return TagBits.AnnotationForMethod;
		2174	} else if (annotatedElement instanceof Argument) {
		2175	return TagBits.AnnotationForParameter;
		2176	} else if (annotatedElement instanceof ConstructorDeclaration) {
		2177	return TagBits.AnnotationForConstructor;
		2178	} else if (annotatedElement instanceof LocalDeclaration) {
		2179	return TagBits.AnnotationForLocalVariable;
		2180	} else if (annotatedElement instanceof ImportReference) {
		2181	return TagBits.AnnotationForPackage;
		2182	}
		2183	return 0;
		2184	}
		2185
2113	private TypeBinding[] computeTypes(Expression[] arguments) {	2186	private TypeBinding[] computeTypes(Expression[] arguments) {
2114	if (arguments == null) return null;	2187	if (arguments == null) return null;
2115	int argsLength = arguments.length;	2188	int argsLength = arguments.length;
Lines 3784-3790 Link Here
3784	this.options.camelCaseMatch,	3857	this.options.camelCaseMatch,
3785	IJavaSearchConstants.TYPE,	3858	IJavaSearchConstants.TYPE,
3786	this);	3859	this);
3787	acceptTypes();	3860	acceptTypes(null);
3788	}	3861	}
3789	}	3862	}
3790		3863
Lines 4325-4331 Link Here
4325	}	4398	}
4326	if (staticFieldsAndMethodOnly && this.insideQualifiedReference) relevance += R_NON_INHERITED; // This criterion doesn't concern types and is added to be balanced with field and method relevance.	4399	if (staticFieldsAndMethodOnly && this.insideQualifiedReference) relevance += R_NON_INHERITED; // This criterion doesn't concern types and is added to be balanced with field and method relevance.
4327		4400
4328	if (memberType.isClass()) {	4401	if (memberType.isAnnotationType()) {
		4402	relevance += computeRelevanceForAnnotation();
		4403	relevance += computeRelevanceForAnnotationTarget(memberType);
		4404	} else if (memberType.isClass()) {
4329	relevance += computeRelevanceForClass();	4405	relevance += computeRelevanceForClass();
4330	relevance += computeRelevanceForException(memberType.sourceName);	4406	relevance += computeRelevanceForException(memberType.sourceName);
4331	} else if(memberType.isEnum()) {	4407	} else if(memberType.isEnum()) {
Lines 5441-5446 Link Here
5441	}	5517	}
5442	return 0;	5518	return 0;
5443	}	5519	}
		5520	private int computeRelevanceForAnnotationTarget(TypeBinding typeBinding){
		5521	if (this.assistNodeIsAnnotation &&
		5522	(this.targetedElement & TagBits.AnnotationTargetMASK) != 0) {
		5523	long target = typeBinding.getAnnotationTagBits() & TagBits.AnnotationTargetMASK;
		5524	if(target == 0 \|\| (target & this.targetedElement) != 0) {
		5525	return R_TARGET;
		5526	}
		5527	}
		5528	return 0;
		5529	}
5444	private int computeRelevanceForClass(){	5530	private int computeRelevanceForClass(){
5445	if(this.assistNodeIsClass) {	5531	if(this.assistNodeIsClass) {
5446	return R_CLASS;	5532	return R_CLASS;
Lines 6259-6264 Link Here
6259	relevance += computeRelevanceForClass();	6345	relevance += computeRelevanceForClass();
6260	relevance += computeRelevanceForQualification(false);	6346	relevance += computeRelevanceForQualification(false);
6261	relevance += computeRelevanceForRestrictions(IAccessRule.K_ACCESSIBLE); // no access restriction for nested type	6347	relevance += computeRelevanceForRestrictions(IAccessRule.K_ACCESSIBLE); // no access restriction for nested type
		6348	relevance += computeRelevanceForAnnotationTarget(localType);
6262		6349
6263	this.noProposal = false;	6350	this.noProposal = false;
6264	if(!this.requestor.isIgnored(CompletionProposal.TYPE_REF)) {	6351	if(!this.requestor.isIgnored(CompletionProposal.TYPE_REF)) {
Lines 6412-6418 Link Here
6412		6499
6413	if (!skip && proposeType && scope.enclosingSourceType() != null) {	6500	if (!skip && proposeType && scope.enclosingSourceType() != null) {
6414	findNestedTypes(token, scope.enclosingSourceType(), scope, proposeAllMemberTypes, typesFound);	6501	findNestedTypes(token, scope.enclosingSourceType(), scope, proposeAllMemberTypes, typesFound);
6415	if(!assistNodeIsConstructor) {	6502	if(!assistNodeIsConstructor && !assistNodeIsAnnotation) {
6416	// don't propose type parameters if the completion is a constructor ('new \|')	6503	// don't propose type parameters if the completion is a constructor ('new \|')
6417	findTypeParameters(token, scope);	6504	findTypeParameters(token, scope);
6418	}	6505	}
Lines 6459-6464 Link Here
6459	if (!CharOperation.prefixEquals(token, sourceType.sourceName, false)	6546	if (!CharOperation.prefixEquals(token, sourceType.sourceName, false)
6460	&& !(this.options.camelCaseMatch && CharOperation.camelCaseMatch(token, sourceType.sourceName))) continue;	6547	&& !(this.options.camelCaseMatch && CharOperation.camelCaseMatch(token, sourceType.sourceName))) continue;
6461		6548
		6549	if (this.assistNodeIsAnnotation && !hasPossibleAnnotationTarget(sourceType, scope)) {
		6550	continue next;
		6551	}
		6552
6462	for (int j = typesFound.size; --j >= 0;) {	6553	for (int j = typesFound.size; --j >= 0;) {
6463	ReferenceBinding otherType = (ReferenceBinding) typesFound.elementAt(j);	6554	ReferenceBinding otherType = (ReferenceBinding) typesFound.elementAt(j);
6464		6555
Lines 6489-6494 Link Here
6489		6580
6490	if (sourceType.isAnnotationType()) {	6581	if (sourceType.isAnnotationType()) {
6491	relevance += computeRelevanceForAnnotation();	6582	relevance += computeRelevanceForAnnotation();
		6583	relevance += computeRelevanceForAnnotationTarget(sourceType);
6492	} else if (sourceType.isInterface()) {	6584	} else if (sourceType.isInterface()) {
6493	relevance += computeRelevanceForInterface();	6585	relevance += computeRelevanceForInterface();
6494	} else if(sourceType.isClass()){	6586	} else if(sourceType.isClass()){
Lines 6648-6654 Link Here
6648	this.options.camelCaseMatch,	6740	this.options.camelCaseMatch,
6649	searchFor,	6741	searchFor,
6650	this);	6742	this);
6651	acceptTypes();	6743	acceptTypes(scope);
6652	}	6744	}
6653	if(!isEmptyPrefix && !this.requestor.isIgnored(CompletionProposal.PACKAGE_REF)) {	6745	if(!isEmptyPrefix && !this.requestor.isIgnored(CompletionProposal.PACKAGE_REF)) {
6654	this.nameEnvironment.findPackages(token, this);	6746	this.nameEnvironment.findPackages(token, this);
Lines 6767-6773 Link Here
6767	this.options.camelCaseMatch,	6859	this.options.camelCaseMatch,
6768	searchFor,	6860	searchFor,
6769	this);	6861	this);
6770	acceptTypes();	6862	acceptTypes(scope);
6771	}	6863	}
6772	if(!this.requestor.isIgnored(CompletionProposal.PACKAGE_REF)) {	6864	if(!this.requestor.isIgnored(CompletionProposal.PACKAGE_REF)) {
6773	this.nameEnvironment.findPackages(qualifiedName, this);	6865	this.nameEnvironment.findPackages(qualifiedName, this);
Lines 7576-7581 Link Here
7576		7668
7577	return this.parser;	7669	return this.parser;
7578	}	7670	}
		7671
		7672	protected boolean hasPossibleAnnotationTarget(TypeBinding typeBinding, Scope scope) {
		7673	if (this.targetedElement == TagBits.AnnotationForPackage) {
		7674	long target = typeBinding.getAnnotationTagBits() & TagBits.AnnotationTargetMASK;
		7675	if(target != 0 && (target & TagBits.AnnotationForPackage) == 0) {
		7676	return false;
		7677	}
		7678	} else if ((this.targetedElement & TagBits.AnnotationForType) != 0) {
		7679	if (scope.parent != null &&
		7680	scope.parent.parent != null &&
		7681	scope.parent.referenceContext() instanceof CompletionOnAnnotationOfType &&
		7682	scope.parent.parent instanceof CompilationUnitScope) {
		7683	long target = typeBinding.getAnnotationTagBits() & TagBits.AnnotationTargetMASK;
		7684	if ((this.targetedElement & TagBits.AnnotationForAnnotationType) != 0) {
		7685	if(target != 0 && (target &(TagBits.AnnotationForType \| TagBits.AnnotationForAnnotationType)) == 0) {
		7686	return false;
		7687	}
		7688	} else {
		7689	if(target != 0 && (target &(TagBits.AnnotationForType)) == 0) {
		7690	return false;
		7691	}
		7692	}
		7693	}
		7694	}
		7695	return true;
		7696	}
7579		7697
7580	protected void reset() {	7698	protected void reset() {
7581		7699

Return to bug 158985