Attachment #134738 for bug #255752




		"field[FIELD_REF]{field, Lbugs.b171016.BasicTestBugs;, I, field, null, "+this.positions+R_DRICNRNS+"}"
	);
}
/**
 * @bug 255752 [javadoc][assist] Inappropriate completion proposals for javadoc at compilation unit level
 * @test that there are no tag completions offered at the compilation unit level for a non package-info.java
 * @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=255752"
 */
public void testBug255752() throws JavaModelException {
	String source =
		"/**\n" +
		" *\n" +
		" * @\n" +
		" */" +
		"package javadoc.bugs;\n" +
		"public class BasicTestBugs {}\n";
	completeInJavadoc("/Completion/src/javadoc/bugs/BasicTestBugs.java", source, true, "@", -1);
	assertSortedResults("");
}
/**
 * Additional tests for bug 255752
 * @test whether an orphan Javadoc comment gets all the possible tags applicable to the class level.
 */
public void testBug255752a() throws JavaModelException {
	String source =
		"/**\n" +
		" *\n" +
		" * @\n" +
		" */" +
		"\n";
	completeInJavadoc("/Completion/src/javadoc/bugs/BasicTestBugs.java", source, true, "@", -1);
	assertResults(
			"author[JAVADOC_BLOCK_TAG]{@author, null, null, author, null, "+this.positions+JAVADOC_RELEVANCE+"}\n" +
			"deprecated[JAVADOC_BLOCK_TAG]{@deprecated, null, null, deprecated, null, "+this.positions+JAVADOC_RELEVANCE+"}\n" +
			"see[JAVADOC_BLOCK_TAG]{@see, null, null, see, null, "+this.positions+JAVADOC_RELEVANCE+"}\n" +
			"version[JAVADOC_BLOCK_TAG]{@version, null, null, version, null, "+this.positions+JAVADOC_RELEVANCE+"}\n" +
			"category[JAVADOC_BLOCK_TAG]{@category, null, null, category, null, "+this.positions+JAVADOC_RELEVANCE+"}\n" +
			"since[JAVADOC_BLOCK_TAG]{@since, null, null, since, null, "+this.positions+JAVADOC_RELEVANCE+"}\n" +
			"serial[JAVADOC_BLOCK_TAG]{@serial, null, null, serial, null, "+this.positions+JAVADOC_RELEVANCE+"}\n" +
			"link[JAVADOC_INLINE_TAG]{{@link}, null, null, link, null, "+this.positions+JAVADOC_RELEVANCE+"}\n" +
			"docRoot[JAVADOC_INLINE_TAG]{{@docRoot}, null, null, docRoot, null, "+this.positions+JAVADOC_RELEVANCE+"}\n" +
			"linkplain[JAVADOC_INLINE_TAG]{{@linkplain}, null, null, linkplain, null, "+this.positions+JAVADOC_RELEVANCE+"}\n" +
			"value[JAVADOC_INLINE_TAG]{{@value}, null, null, value, null, "+this.positions+JAVADOC_RELEVANCE+"}"
		);
}
}




			Javadoc docComment = (Javadoc) compilUnit.getCommentList().get(0); // Do not need to verify following statement as we know it's ok as verifyComments did not fail

			// Verify package declaration javadoc
//			assertTrue("Javadoc should be set on package declaration", docComment == packDecl.getJavadoc());

			// Verify package declaration declaration source start
//			assertEquals("Source range of PackageDeclaration should include Javadoc child", docComment.getStartPosition(), packDecl.getStartPosition());
		}
	}
	public void testBug93880_15b() throws JavaModelException {

			Javadoc docComment = (Javadoc) compilUnit.getCommentList().get(0); // Do not need to verify following statement as we know it's ok as verifyComments did not fail

			// Verify package declaration declaration source start
//			assertEquals("Source range of PackageDeclaration should include Javadoc child", docComment.getStartPosition(), packDecl.getStartPosition());
		}
	}
	public void testBug93880_14b() throws JavaModelException {

			Javadoc docComment = (Javadoc) compilUnit.getCommentList().get(0); // Do not need to verify following statement as we know it's ok as verifyComments did not fail

			// Verify package declaration declaration source start
//			assertEquals("Source range of PackageDeclaration should include Javadoc child", docComment.getStartPosition(), packDecl.getStartPosition());
		}
	}
	public void testBug93880_14c() throws JavaModelException {

Lines 4806-4812 Link Here

(-)compiler/org/eclipse/jdt/internal/compiler/parser/Parser.java (-1 / +2 lines)
4806	}	4806	}
4807	protected void consumePackageComment() {	4807	protected void consumePackageComment() {
4808	// get possible comment for syntax since 1.5	4808	// get possible comment for syntax since 1.5
4809	if(this.options.sourceLevel >= ClassFileConstants.JDK1_5) {	4809	// Consider comments only for the package-info.java (https://bugs.eclipse.org/bugs/show_bug.cgi?id=255752)
		4810	if(this.options.sourceLevel >= ClassFileConstants.JDK1_5 && this.compilationUnit.isPackageInfo()) {
4810	checkComment();	4811	checkComment();
4811	resetModifiers();	4812	resetModifiers();
4812	}	4813	}

Return to bug 255752

Lines 1129-1132 Link Here

(-)src/org/eclipse/jdt/core/tests/model/JavadocBugsCompletionModelTest.java (+42 lines)
1129	"field[FIELD_REF]{field, Lbugs.b171016.BasicTestBugs;, I, field, null, "+this.positions+R_DRICNRNS+"}"	1129	"field[FIELD_REF]{field, Lbugs.b171016.BasicTestBugs;, I, field, null, "+this.positions+R_DRICNRNS+"}"
1130	);	1130	);
1131	}	1131	}
		1132	/**
		1133	* @bug 255752 [javadoc][assist] Inappropriate completion proposals for javadoc at compilation unit level
		1134	* @test that there are no tag completions offered at the compilation unit level for a non package-info.java
		1135	* @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=255752"
		1136	*/
		1137	public void testBug255752() throws JavaModelException {
		1138	String source =
		1139	"/**\n" +
		1140	" *\n" +
		1141	" * @\n" +
		1142	" */" +
		1143	"package javadoc.bugs;\n" +
		1144	"public class BasicTestBugs {}\n";
		1145	completeInJavadoc("/Completion/src/javadoc/bugs/BasicTestBugs.java", source, true, "@", -1);
		1146	assertSortedResults("");
		1147	}
		1148	/**
		1149	* Additional tests for bug 255752
		1150	* @test whether an orphan Javadoc comment gets all the possible tags applicable to the class level.
		1151	*/
		1152	public void testBug255752a() throws JavaModelException {
		1153	String source =
		1154	"/**\n" +
		1155	" *\n" +
		1156	" * @\n" +
		1157	" */" +
		1158	"\n";
		1159	completeInJavadoc("/Completion/src/javadoc/bugs/BasicTestBugs.java", source, true, "@", -1);
		1160	assertResults(
		1161	"author[JAVADOC_BLOCK_TAG]{@author, null, null, author, null, "+this.positions+JAVADOC_RELEVANCE+"}\n" +
		1162	"deprecated[JAVADOC_BLOCK_TAG]{@deprecated, null, null, deprecated, null, "+this.positions+JAVADOC_RELEVANCE+"}\n" +
		1163	"see[JAVADOC_BLOCK_TAG]{@see, null, null, see, null, "+this.positions+JAVADOC_RELEVANCE+"}\n" +
		1164	"version[JAVADOC_BLOCK_TAG]{@version, null, null, version, null, "+this.positions+JAVADOC_RELEVANCE+"}\n" +
		1165	"category[JAVADOC_BLOCK_TAG]{@category, null, null, category, null, "+this.positions+JAVADOC_RELEVANCE+"}\n" +
		1166	"since[JAVADOC_BLOCK_TAG]{@since, null, null, since, null, "+this.positions+JAVADOC_RELEVANCE+"}\n" +
		1167	"serial[JAVADOC_BLOCK_TAG]{@serial, null, null, serial, null, "+this.positions+JAVADOC_RELEVANCE+"}\n" +
		1168	"link[JAVADOC_INLINE_TAG]{{@link}, null, null, link, null, "+this.positions+JAVADOC_RELEVANCE+"}\n" +
		1169	"docRoot[JAVADOC_INLINE_TAG]{{@docRoot}, null, null, docRoot, null, "+this.positions+JAVADOC_RELEVANCE+"}\n" +
		1170	"linkplain[JAVADOC_INLINE_TAG]{{@linkplain}, null, null, linkplain, null, "+this.positions+JAVADOC_RELEVANCE+"}\n" +
		1171	"value[JAVADOC_INLINE_TAG]{{@value}, null, null, value, null, "+this.positions+JAVADOC_RELEVANCE+"}"
		1172	);
		1173	}
1132	}	1174	}

Lines 2401-2410 Link Here

(-)src/org/eclipse/jdt/core/tests/dom/ASTConverterJavadocTest.java (-4 / +4 lines)
2401	Javadoc docComment = (Javadoc) compilUnit.getCommentList().get(0); // Do not need to verify following statement as we know it's ok as verifyComments did not fail	2401	Javadoc docComment = (Javadoc) compilUnit.getCommentList().get(0); // Do not need to verify following statement as we know it's ok as verifyComments did not fail
2402		2402
2403	// Verify package declaration javadoc	2403	// Verify package declaration javadoc
2404	assertTrue("Javadoc should be set on package declaration", docComment == packDecl.getJavadoc());	2404	// assertTrue("Javadoc should be set on package declaration", docComment == packDecl.getJavadoc());
2405		2405
2406	// Verify package declaration declaration source start	2406	// Verify package declaration declaration source start
2407	assertEquals("Source range of PackageDeclaration should include Javadoc child", docComment.getStartPosition(), packDecl.getStartPosition());	2407	// assertEquals("Source range of PackageDeclaration should include Javadoc child", docComment.getStartPosition(), packDecl.getStartPosition());
2408	}	2408	}
2409	}	2409	}
2410	public void testBug93880_15b() throws JavaModelException {	2410	public void testBug93880_15b() throws JavaModelException {
Lines 2517-2523 Link Here
2517	Javadoc docComment = (Javadoc) compilUnit.getCommentList().get(0); // Do not need to verify following statement as we know it's ok as verifyComments did not fail	2517	Javadoc docComment = (Javadoc) compilUnit.getCommentList().get(0); // Do not need to verify following statement as we know it's ok as verifyComments did not fail
2518		2518
2519	// Verify package declaration declaration source start	2519	// Verify package declaration declaration source start
2520	assertEquals("Source range of PackageDeclaration should include Javadoc child", docComment.getStartPosition(), packDecl.getStartPosition());	2520	// assertEquals("Source range of PackageDeclaration should include Javadoc child", docComment.getStartPosition(), packDecl.getStartPosition());
2521	}	2521	}
2522	}	2522	}
2523	public void testBug93880_14b() throws JavaModelException {	2523	public void testBug93880_14b() throws JavaModelException {
Lines 2536-2542 Link Here
2536	Javadoc docComment = (Javadoc) compilUnit.getCommentList().get(0); // Do not need to verify following statement as we know it's ok as verifyComments did not fail	2536	Javadoc docComment = (Javadoc) compilUnit.getCommentList().get(0); // Do not need to verify following statement as we know it's ok as verifyComments did not fail
2537		2537
2538	// Verify package declaration declaration source start	2538	// Verify package declaration declaration source start
2539	assertEquals("Source range of PackageDeclaration should include Javadoc child", docComment.getStartPosition(), packDecl.getStartPosition());	2539	// assertEquals("Source range of PackageDeclaration should include Javadoc child", docComment.getStartPosition(), packDecl.getStartPosition());
2540	}	2540	}
2541	}	2541	}
2542	public void testBug93880_14c() throws JavaModelException {	2542	public void testBug93880_14c() throws JavaModelException {