Attachment #54078 for bug #153399

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

Lines 30-35 Link Here

(-)compiler/org/eclipse/jdt/internal/compiler/ast/Javadoc.java (-2 / +19 lines)
30	// bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=51600	30	// bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=51600
31	// Store param references for tag with invalid syntax	31	// Store param references for tag with invalid syntax
32	public JavadocSingleNameReference[] invalidParameters; // @param	32	public JavadocSingleNameReference[] invalidParameters; // @param
		33	// bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=153399
		34	// Store value tag positions
		35	public long valuePositions = -1;
33		36
34	public Javadoc(int sourceStart, int sourceEnd) {	37	public Javadoc(int sourceStart, int sourceEnd) {
35	this.sourceStart = sourceStart;	38	this.sourceStart = sourceStart;
Lines 219-224 Link Here
219	for (int i = 0; i < seeTagsLength; i++) {	222	for (int i = 0; i < seeTagsLength; i++) {
220	resolveReference(this.seeReferences[i], scope);	223	resolveReference(this.seeReferences[i], scope);
221	}	224	}
		225
		226	// @value tag
		227	boolean source15 = scope.compilerOptions().sourceLevel >= ClassFileConstants.JDK1_5;
		228	if (!source15 && this.valuePositions != -1) {
		229	scope.problemReporter().javadocUnexpectedTag((int)(this.valuePositions>>>32), (int) this.valuePositions);
		230	}
222	}	231	}
223		232
224	/*	233	/*
Lines 228-235 Link Here
228		237
229	// get method declaration	238	// get method declaration
230	AbstractMethodDeclaration methDecl = methScope.referenceMethod();	239	AbstractMethodDeclaration methDecl = methScope.referenceMethod();
231	boolean overriding = methDecl == null \|\| methDecl.binding == null ? false : !methDecl.binding.isStatic() && ((methDecl.binding.modifiers & (ExtraCompilerModifiers.AccImplementing \| ExtraCompilerModifiers.AccOverriding)) != 0);	240	boolean overriding = methDecl == null /* field declaration / \|\| methDecl.binding == null / compiler error */
232		241	? false :
		242	!methDecl.binding.isStatic() && ((methDecl.binding.modifiers & (ExtraCompilerModifiers.AccImplementing \| ExtraCompilerModifiers.AccOverriding)) != 0);
		243
233	// @see tags	244	// @see tags
234	int seeTagsLength = this.seeReferences == null ? 0 : this.seeReferences.length;	245	int seeTagsLength = this.seeReferences == null ? 0 : this.seeReferences.length;
235	boolean superRef = false;	246	boolean superRef = false;
Lines 317-322 Link Here
317	// @throws/@exception tags	328	// @throws/@exception tags
318	resolveThrowsTags(methScope, reportMissing);	329	resolveThrowsTags(methScope, reportMissing);
319		330
		331	// @value tag
		332	boolean source15 = methScope.compilerOptions().sourceLevel >= ClassFileConstants.JDK1_5;
		333	if (!source15 && methDecl != null && this.valuePositions != -1) {
		334	methScope.problemReporter().javadocUnexpectedTag((int)(this.valuePositions>>>32), (int) this.valuePositions);
		335	}
		336
320	// Resolve param tags with invalid syntax	337	// Resolve param tags with invalid syntax
321	int length = this.invalidParameters == null ? 0 : this.invalidParameters.length;	338	int length = this.invalidParameters == null ? 0 : this.invalidParameters.length;
322	for (int i = 0; i < length; i++) {	339	for (int i = 0; i < length; i++) {

Lines 780-785 Link Here

(-)compiler/org/eclipse/jdt/core/compiler/IProblem.java (+5 lines)
780	* Javadoc comments	780	* Javadoc comments
781	*/	781	*/
782	/**	782	/**
		783	* Problem warned on duplicated tag.
		784	* @since 3.3
		785	*/
		786	int JavadocDuplicateTag = Javadoc + Internal + 464;
		787	/**
783	* Problem signaled on an hidden reference due to a too low visibility level.	788	* Problem signaled on an hidden reference due to a too low visibility level.
784	* @since 3.3	789	* @since 3.3
785	*/	790	*/

Lines 363-368 Link Here

(-)compiler/org/eclipse/jdt/internal/compiler/problem/messages.properties (+1 lines)
363	460 = Empty block should be documented	363	460 = Empty block should be documented
364		364
365	### DOC	365	### DOC
		366	464 = Unexpected duplicated tag @{0}
366	465 = ''{0}'' visibility for malformed doc comments hides this ''{1}'' reference	367	465 = ''{0}'' visibility for malformed doc comments hides this ''{1}'' reference
367	466 = Invalid member type qualification	368	466 = Invalid member type qualification
368	467 = Missing identifier	369	467 = Missing identifier




				return CompilerOptions.UnusedLabel;
	
			case IProblem.JavadocUnexpectedTag:
			case IProblem.JavadocDuplicateTag:
			case IProblem.JavadocDuplicateReturnTag:
			case IProblem.JavadocInvalidThrowsClass:
			case IProblem.JavadocInvalidSeeReference:

public void javadocDuplicatedReturnTag(int sourceStart, int sourceEnd){
	this.handle(IProblem.JavadocDuplicateReturnTag, NoArgument, NoArgument, sourceStart, sourceEnd);
}
public void javadocDuplicatedTag(char[] tagName, int sourceStart, int sourceEnd){
	String[] arguments = new String[] { new String(tagName) };
	this.handle(
		IProblem.JavadocDuplicateTag,
		arguments,
		arguments,
		sourceStart,
		sourceEnd);
}
public void javadocDuplicatedThrowsClassName(TypeReference typeReference, int modifiers) {
	int severity = computeSeverity(IProblem.JavadocDuplicateThrowsClassName);
	if (severity == ProblemSeverities.Ignore) return;

Lines 30-35 Link Here

(-)compiler/org/eclipse/jdt/internal/compiler/parser/JavadocParser.java (-8 / +28 lines)
30	private int invalidParamReferencesPtr = -1;	30	private int invalidParamReferencesPtr = -1;
31	private ASTNode[] invalidParamReferencesStack;	31	private ASTNode[] invalidParamReferencesStack;
32		32
		33	// bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=153399
		34	// Store value tag positions
		35	private long validValuePositions, invalidValuePositions;
		36
33	public JavadocParser(Parser sourceParser) {	37	public JavadocParser(Parser sourceParser) {
34	super(sourceParser);	38	super(sourceParser);
35	this.kind = COMPIL_PARSER \| TEXT_VERIF;	39	this.kind = COMPIL_PARSER \| TEXT_VERIF;
Lines 47-52 Link Here
47	this.javadocStart = this.sourceParser.scanner.commentStarts[commentPtr];	51	this.javadocStart = this.sourceParser.scanner.commentStarts[commentPtr];
48	this.javadocEnd = this.sourceParser.scanner.commentStops[commentPtr]-1;	52	this.javadocEnd = this.sourceParser.scanner.commentStops[commentPtr]-1;
49	this.firstTagPosition = this.sourceParser.scanner.commentTagStarts[commentPtr];	53	this.firstTagPosition = this.sourceParser.scanner.commentTagStarts[commentPtr];
		54	this.validValuePositions = -1;
		55	this.invalidValuePositions = -1;
50		56
51	// Init javadoc if necessary	57	// Init javadoc if necessary
52	if (this.checkDocComment) {	58	if (this.checkDocComment) {
Lines 540-554 Link Here
540	}	546	}
541	break;	547	break;
542	case 'v':	548	case 'v':
543	if (this.sourceLevel >= ClassFileConstants.JDK1_5 && length == TAG_VALUE_LENGTH && CharOperation.equals(TAG_VALUE, tagName)) {	549	if (length == TAG_VALUE_LENGTH && CharOperation.equals(TAG_VALUE, tagName)) {
544	this.tagValue = TAG_VALUE_VALUE;	550	this.tagValue = TAG_VALUE_VALUE;
545	if (this.inlineTagStarted) {	551	if (this.sourceLevel >= ClassFileConstants.JDK1_5) {
546	valid = parseReference();	552	if (this.inlineTagStarted) {
547	} else {	553	valid = parseReference();
548	valid = false;	554	} else {
549	if (this.reportProblems) {	555	valid = false;
550	this.sourceParser.problemReporter().javadocUnexpectedTag(this.tagSourceStart, this.tagSourceEnd);	556	if (this.reportProblems) this.sourceParser.problemReporter().javadocUnexpectedTag(this.tagSourceStart, this.tagSourceEnd);
		557	}
		558	}
		559	if (this.validValuePositions == -1) {
		560	if (this.invalidValuePositions != -1) {
		561	if (this.reportProblems) this.sourceParser.problemReporter().javadocDuplicatedTag(tagName, (int) (this.invalidValuePositions>>>32), (int) this.invalidValuePositions);
551	}	562	}
		563	if (valid) {
		564	this.validValuePositions = (((long) this.tagSourceStart) << 32) + this.tagSourceEnd;
		565	this.invalidValuePositions = -1;
		566	} else {
		567	this.invalidValuePositions = (((long) this.tagSourceStart) << 32) + this.tagSourceEnd;
		568	}
		569	} else {
		570	if (this.reportProblems) this.sourceParser.problemReporter().javadocDuplicatedTag(tagName, this.tagSourceStart, this.tagSourceEnd);
552	}	571	}
553	} else {	572	} else {
554	createTag();	573	createTag();
Lines 720-727 Link Here
720	*/	739	*/
721	protected void updateDocComment() {	740	protected void updateDocComment() {
722		741
723	// Set inherited positions	742	// Set positions
724	this.docComment.inheritedPositions = this.inheritedPositions;	743	this.docComment.inheritedPositions = this.inheritedPositions;
		744	this.docComment.valuePositions = this.validValuePositions != -1 ? this.validValuePositions : this.invalidValuePositions;
725		745
726	// Set return node if present	746	// Set return node if present
727	if (this.returnStatement != null) {	747	if (this.returnStatement != null) {




	}

	/**
	 * @bug 70892: [1.5][Javadoc] Compiler should parse reference for inline tag @value
	 * @test Ensure that reference in tag {@value} is only verified when source level >= 1.5
	 * @see "http://bugs.eclipse.org/bugs/show_bug.cgi?id=70892"
	 */
	public void testBug70892a() {
		runConformTest(
			new String[] {
				"X.java",
				"/**\n" + 
					" * {@value}\n" + 
					" * {@value }\n" + 
					" * {@value #field}\n" + 
					" */\n" + 
					"public class X {\n" + 
					"	static int field;\n" + 
					"}\n"
			}
		);
	}
	public void testBug70892conform2() {
		runConformTest(
			new String[] {
				"X.java",
				"public class X {\n" + 
				"	/**\n" + 
				"	 * {@value}\n" + 
				"	 */\n" + 
				"	static int field1;\n" + 
				"	/**\n" + 
				"	 * {@value }\n" + 
				"	 */\n" + 
				"	static int field2;\n" + 
				"	/**\n" + 
				"	 * {@value #field}\n" + 
				"	 */\n" + 
				"	static int field;\n" + 
				"}\n"
			}
		);
	}
	public void testBug70892b() {
		String[] testFiles = new String[] {
			"X.java",
			"public class X {\n" + 
			"	/**\n" + 
			"	 * {@value \"invalid\"}\n" + 
			"	 */\n" + 
			"	final static int field1 = 1;\n" + 
			"	/**\n" + 
			"	 * {@value <a href=\"invalid\">invalid</a>} invalid\n" + 
			"	 */\n" + 
			"	final static int field2 = 2;\n" + 
			"	/**\n" + 
			"	 * {@value #field}\n" + 
			"	 */\n" + 
			"	final static int field3 = 3;\n" + 
			"	/**\n" + 
			"	 * {@value #foo}\n" + 
			"	 */\n" + 
			"	final static int field4 = 4;\n" + 
			"	/**\n" + 
			"	 * {@value #foo()}\n" + 
			"	 */\n" + 
			"	final static int field5 = 5;\n" + 
			"	void foo() {}\n" + 
			"}\n"
		};
		if (this.complianceLevel.equals(COMPLIANCE_1_3) || this.complianceLevel.equals(COMPLIANCE_1_4)) {
			runConformTest(testFiles);
		} else {
			runNegativeTest(testFiles,
				"----------\n" + 
				"1. ERROR in X.java (at line 3)\r\n" + 
				"	* {@value \"invalid\"}\r\n" + 
				"	          ^^^^^^^^^\n" + 
				"Javadoc: Only static field reference is allowed for @value tag\n" + 
				"----------\n" + 
				"2. ERROR in X.java (at line 7)\r\n" + 
				"	* {@value <a href=\"invalid\">invalid</a>} invalid\r\n" + 
				"	          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n" + 
				"Javadoc: Only static field reference is allowed for @value tag\n" + 
				"----------\n" + 
				"3. ERROR in X.java (at line 11)\r\n" + 
				"	* {@value #field}\r\n" + 
				"	           ^^^^^\n" + 
				"Javadoc: field cannot be resolved or is not a field\n" + 
				"----------\n" + 
				"4. ERROR in X.java (at line 15)\r\n" + 
				"	* {@value #foo}\r\n" + 
				"	           ^^^\n" + 
				"Javadoc: Only static field reference is allowed for @value tag\n" + 
				"----------\n" + 
				"5. ERROR in X.java (at line 19)\r\n" + 
				"	* {@value #foo()}\r\n" + 
				"	           ^^^^^\n" + 
				"Javadoc: Only static field reference is allowed for @value tag\n" + 
				"----------\n"
			);
		}
	}

	/**
	 * Bug 73348: [Javadoc] Missing description for return tag is not always warned

			"----------\n"
		);
	}

	/**
	 * @bug 153399: [javadoc] JDT Core should warn if the @value tag is not used correctly
	 * @test Ensure that {@value} tag is well warned when not used correctly
	 * @see "http://bugs.eclipse.org/bugs/show_bug.cgi?id=153399"
	 */
	public void testBug153399a() {
		String[] testFiles = new String[] {
			"X.java",
			"public class X { \n" + 
			"	/**\n" + 
			"	 * {@value #MY_VALUE}\n" + 
			"	 */\n" + 
			"	public final static int MY_VALUE = 0; \n" + 
			"	/**\n" + 
			"	 * {@value #MY_VALUE}\n" + 
			"	 */\n" + 
			"	public void foo() {}\n" + 
			"	/**\n" + 
			"	 * {@value #MY_VALUE}\n" + 
			"	 */\n" + 
			"	class Sub {} \n" + 
			"}\n"
		};
		if (complianceLevel.equals(COMPLIANCE_1_3) || complianceLevel.equals(COMPLIANCE_1_4)) {
			runNegativeTest(testFiles,
				"----------\n" + 
				"1. ERROR in X.java (at line 7)\n" + 
				"	* {@value #MY_VALUE}\n" + 
				"	    ^^^^^\n" + 
				"Javadoc: Unexpected tag\n" + 
				"----------\n" + 
				"2. ERROR in X.java (at line 11)\n" + 
				"	* {@value #MY_VALUE}\n" + 
				"	    ^^^^^\n" + 
				"Javadoc: Unexpected tag\n" + 
				"----------\n"
			);
		} else {
			runConformTest(testFiles);
		}
	}
	public void testBug153399b() {
		String[] testFiles = new String[] {
			"X.java",
			"public class X { \n" + 
			"	/**\n" + 
			"	 * {@value}\n" + 
			"	 */\n" + 
			"	public final static int MY_VALUE = 0; \n" + 
			"	/**\n" + 
			"	 * {@value}\n" + 
			"	 */\n" + 
			"	public void foo() {}\n" + 
			"	/**\n" + 
			"	 * {@value}\n" + 
			"	 */\n" + 
			"	class Sub {} \n" + 
			"}\n"
		};
		if (complianceLevel.equals(COMPLIANCE_1_3) || complianceLevel.equals(COMPLIANCE_1_4)) {
			runNegativeTest(testFiles,
				"----------\n" + 
				"1. ERROR in X.java (at line 7)\n" + 
				"	* {@value}\n" + 
				"	    ^^^^^\n" + 
				"Javadoc: Unexpected tag\n" + 
				"----------\n" + 
				"2. ERROR in X.java (at line 11)\n" + 
				"	* {@value}\n" + 
				"	    ^^^^^\n" + 
				"Javadoc: Unexpected tag\n" + 
				"----------\n"
			);
		} else {
			runConformTest(testFiles);
		}
	}
	public void testBug153399c() {
		String[] testFiles = new String[] {
			"p1/X.java",
			"package p1;\n" + 
			"public class X {\n" + 
			"	/**\n" + 
			"	 * @return a\n" + 
			"	 */\n" + 
			"	boolean get() {\n" + 
			"		return false;\n" + 
			"	}\n" + 
			"}\n"
		};
		runConformTest(testFiles);
	}
	public void testBug153399d() {
		String[] testFiles = new String[] {
			"X.java",
			"public class X { \n" + 
			"	/**\n" + 
			"	 * {@value #MY_VALUE}\n" + 
			"	 * {@value}\n" + 
			"	 * {@value Invalid}\n" + 
			"	 */\n" + 
			"	public final static int MY_VALUE = 0; \n" + 
			"}\n"
		};
		if (complianceLevel.equals(COMPLIANCE_1_3) || complianceLevel.equals(COMPLIANCE_1_4)) {
			runNegativeTest(testFiles,
				"----------\n" + 
				"1. ERROR in X.java (at line 3)\n" + 
				"	* {@value #MY_VALUE}\n" + 
				"	    ^^^^^\n" + 
				"Javadoc: Unexpected duplicated tag @value\n" + 
				"----------\n" + 
				"2. ERROR in X.java (at line 4)\n" + 
				"	* {@value}\n" + 
				"	    ^^^^^\n" + 
				"Javadoc: Unexpected duplicated tag @value\n" + 
				"----------\n"
			);
		} else {
			runNegativeTest(testFiles,
				"----------\n" + 
				"1. ERROR in X.java (at line 4)\n" + 
				"	* {@value}\n" + 
				"	    ^^^^^\n" + 
				"Javadoc: Unexpected duplicated tag @value\n" + 
				"----------\n" + 
				"2. ERROR in X.java (at line 5)\n" + 
				"	* {@value Invalid}\n" + 
				"	    ^^^^^\n" + 
				"Javadoc: Unexpected duplicated tag @value\n" + 
				"----------\n" + 
				"3. ERROR in X.java (at line 5)\n" + 
				"	* {@value Invalid}\n" + 
				"	          ^^^^^^^^\n" + 
				"Javadoc: Invalid reference\n" + 
				"----------\n"
			);
		}
	}
	public void testBug153399e() {
		String[] testFiles = new String[] {
			"X.java",
			"public class X { \n" + 
			"	/**\n" + 
			"	 * {@value Invalid}\n" + 
			"	 * {@value #MY_VALUE}\n" + 
			"	 */\n" + 
			"	public final static int MY_VALUE = 0; \n" + 
			"}\n"
		};
		if (complianceLevel.equals(COMPLIANCE_1_3) || complianceLevel.equals(COMPLIANCE_1_4)) {
			runNegativeTest(testFiles,
				"----------\n" + 
				"1. ERROR in X.java (at line 3)\n" + 
				"	* {@value Invalid}\n" + 
				"	    ^^^^^\n" + 
				"Javadoc: Unexpected duplicated tag @value\n" + 
				"----------\n"
			);
		} else {
			runNegativeTest(testFiles,
				"----------\n" + 
				"1. ERROR in X.java (at line 3)\n" + 
				"	* {@value Invalid}\n" + 
				"	    ^^^^^\n" + 
				"Javadoc: Unexpected duplicated tag @value\n" + 
				"----------\n" + 
				"2. ERROR in X.java (at line 3)\n" + 
				"	* {@value Invalid}\n" + 
				"	          ^^^^^^^^\n" + 
				"Javadoc: Invalid reference\n" + 
				"----------\n"
			);
		}
	}
}




		this.reportMissingJavadocComments = CompilerOptions.IGNORE;
	}

	/**
	 * Test fix for bug 70892: [1.5][Javadoc] Compiler should parse reference for inline tag @value
	 * @see <a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=70892">70892</a>
	 * These two tests pass for 1.3 or 1.4 source level but should fail for 1.5
	 * @see JavadocTest_1_5
	 */
	public void test001() {
		reportMissingJavadocTags = CompilerOptions.IGNORE;
		reportMissingJavadocComments = CompilerOptions.IGNORE;
		runNegativeTest(
			new String[] {
				"X.java",
				"/**\n" + 
					" * {@value \"invalid\"}\n" + 
					" * {@value <a href=\"invalid\">invalid</a>} invalid\n" + 
					" * {@value #field}\n" + 
					" * {@value #foo}\n" + 
					" * {@value #foo()}\n" + 
					" */\n" + 
					"public class X {\n" + 
					"	int field;\n" + 
					"	void foo() {}\n" + 
					"}\n"
			},
			""	// No failure in fact...
		);
	}
	public void test002() {
		reportMissingJavadocTags = CompilerOptions.IGNORE;
		reportMissingJavadocComments = CompilerOptions.IGNORE;
		runNegativeTest(
			new String[] {
				"X.java",
				"/**\n" + 
					" * {@value \"invalid}\n" + 
					" * {@value <a href}\n" + 
					" * {@value <a href=\"invalid\">invalid</a} invalid\n" + 
					" * {@value #fild}\n" + 
					" * {@value #fo}\n" + 
					" * {@value #f()}\n" + 
					" */\n" + 
					"public class X {\n" + 
					"	int field;\n" + 
					"	void foo() {}\n" + 
					"}\n"	
			},
			""	// No failure in fact...
		);
	}

	/**
	 * Test fix for bug 70891: [1.5][javadoc] Compiler should accept new 1.5 syntax for @param




		this.reportMissingJavadocComments = CompilerOptions.IGNORE;
	}

	/**
	 * Test fix for bug 70892: [1.5][Javadoc] Compiler should parse reference for inline tag @value
	 * @see <a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=70892">70892</a>
	 * These two tests pass for 1.3 or 1.4 source level but should fail for 1.5
	 * @see JavadocTest_1_5
	 */
	public void test001() {
		reportMissingJavadocTags = CompilerOptions.IGNORE;
		reportMissingJavadocComments = CompilerOptions.IGNORE;
		runNegativeTest(
			new String[] {
				"X.java",
				"/**\n" + 
					" * {@value \"invalid\"}\n" + 
					" * {@value <a href=\"invalid\">invalid</a>} invalid\n" + 
					" * {@value #field}\n" + 
					" * {@value #foo}\n" + 
					" * {@value #foo()}\n" + 
					" */\n" + 
					"public class X {\n" + 
					"	int field;\n" + 
					"	void foo() {}\n" + 
					"}\n"
			},
			""	// No failure in fact...
		);
	}
	public void test002() {
		reportMissingJavadocTags = CompilerOptions.IGNORE;
		reportMissingJavadocComments = CompilerOptions.IGNORE;
		runNegativeTest(
			new String[] {
				"X.java",
				"/**\n" + 
					" * {@value \"invalid}\n" + 
					" * {@value <a href}\n" + 
					" * {@value <a href=\"invalid\">invalid</a} invalid\n" + 
					" * {@value #fild}\n" + 
					" * {@value #fo}\n" + 
					" * {@value #f()}\n" + 
					" */\n" + 
					"public class X {\n" + 
					"	int field;\n" + 
					"	void foo() {}\n" + 
					"}\n"	
			},
			""	// No failure in fact...
		);
	}

	/**
	 * Test fix for bug 70891: [1.5][javadoc] Compiler should accept new 1.5 syntax for @param




	}

	/**
	 * Test fix for bug 70892: [1.5][Javadoc] Compiler should parse reference for inline tag @value
	 * @see <a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=70892">70892</a>
	 * These two tests fail for 1.5 source level but should pass for 1.3 or 1.4
	 * @see JavadocTest_1_4
	 */
	public void test001() {
		reportMissingJavadocTags = CompilerOptions.IGNORE;
		runNegativeTest(
			new String[] {
				"X.java",
				"/**\n" + 
					" * {@value \"invalid\"}\n" + 
					" * {@value <a href=\"invalid\">invalid</a>} invalid\n" + 
					" * {@value #field}\n" + 
					" * {@value #foo}\n" + 
					" * {@value #foo()}\n" + 
					" */\n" + 
					"public class X {\n" + 
					"	int field;\n" + 
					"	void foo() {}\n" + 
					"}\n"
			},
			"----------\n" + 
				"1. ERROR in X.java (at line 2)\n" + 
				"	* {@value \"invalid\"}\n" + 
				"	          ^^^^^^^^^\n" + 
				"Javadoc: Only static field reference is allowed for @value tag\n" + 
				"----------\n" + 
				"2. ERROR in X.java (at line 3)\n" + 
				"	* {@value <a href=\"invalid\">invalid</a>} invalid\n" + 
				"	          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n" + 
				"Javadoc: Only static field reference is allowed for @value tag\n" + 
				"----------\n" + 
				"3. ERROR in X.java (at line 4)\n" + 
				"	* {@value #field}\n" + 
				"	           ^^^^^\n" + 
				"Javadoc: Only static field reference is allowed for @value tag\n" + 
				"----------\n" + 
				"4. ERROR in X.java (at line 5)\n" + 
				"	* {@value #foo}\n" + 
				"	           ^^^\n" + 
				"Javadoc: Only static field reference is allowed for @value tag\n" + 
				"----------\n" + 
				"5. ERROR in X.java (at line 6)\n" + 
				"	* {@value #foo()}\n" + 
				"	           ^^^^^\n" + 
				"Javadoc: Only static field reference is allowed for @value tag\n" + 
				"----------\n"
		);
	}
	public void test002() {
		reportMissingJavadocTags = CompilerOptions.IGNORE;
		runNegativeTest(
			new String[] {
				"X.java",
				"/**\n" + 
					" * {@value \"invalid}\n" + 
					" * {@value <a href}\n" + 
					" * {@value <a href=\"invalid\">invalid</a} invalid\n" + 
					" * {@value #fild}\n" + 
					" * {@value #fo}\n" + 
					" * {@value #f()}\n" + 
					" */\n" + 
					"public class X {\n" + 
					"	int field;\n" + 
					"	void foo() {}\n" + 
					"}\n"	
			},
			"----------\n" + 
				"1. ERROR in X.java (at line 2)\n" + 
				"	* {@value \"invalid}\n" + 
				"	          ^^^^^^^^^\n" + 
				"Javadoc: Invalid reference\n" + 
				"----------\n" + 
				"2. ERROR in X.java (at line 3)\n" + 
				"	* {@value <a href}\n" + 
				"	          ^^^^^^^\n" + 
				"Javadoc: Only static field reference is allowed for @value tag\n" + 
				"----------\n" + 
				"3. ERROR in X.java (at line 4)\n" + 
				"	* {@value <a href=\"invalid\">invalid</a} invalid\n" + 
				"	          ^^^^^^^^^^^^^^^^^^^^^^^^^\n" + 
				"Javadoc: Only static field reference is allowed for @value tag\n" + 
				"----------\n" + 
				"4. ERROR in X.java (at line 5)\n" + 
				"	* {@value #fild}\n" + 
				"	           ^^^^\n" + 
				"Javadoc: fild cannot be resolved or is not a field\n" + 
				"----------\n" + 
				"5. ERROR in X.java (at line 6)\n" + 
				"	* {@value #fo}\n" + 
				"	           ^^\n" + 
				"Javadoc: fo cannot be resolved or is not a field\n" + 
				"----------\n" + 
				"6. ERROR in X.java (at line 7)\n" + 
				"	* {@value #f()}\n" + 
				"	           ^\n" + 
				"Javadoc: The method f() is undefined for the type X\n" + 
				"----------\n" + 
				"7. ERROR in X.java (at line 7)\n" + 
				"	* {@value #f()}\n" + 
				"	           ^^^\n" + 
				"Javadoc: Only static field reference is allowed for @value tag\n" + 
				"----------\n"
		);
	}

	/**
	 * Test fix for bug 70891: [1.5][javadoc] Compiler should accept new 1.5 syntax for @param
	 * @see <a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=70891">70891</a>
	 * These two tests fail for 1.5 source level but should pass for 1.3 or 1.4

Return to bug 153399

Lines 198-203 Link Here

(-)compiler/org/eclipse/jdt/internal/compiler/problem/ProblemReporter.java (+10 lines)
198	return CompilerOptions.UnusedLabel;	198	return CompilerOptions.UnusedLabel;
199		199
200	case IProblem.JavadocUnexpectedTag:	200	case IProblem.JavadocUnexpectedTag:
		201	case IProblem.JavadocDuplicateTag:
201	case IProblem.JavadocDuplicateReturnTag:	202	case IProblem.JavadocDuplicateReturnTag:
202	case IProblem.JavadocInvalidThrowsClass:	203	case IProblem.JavadocInvalidThrowsClass:
203	case IProblem.JavadocInvalidSeeReference:	204	case IProblem.JavadocInvalidSeeReference:
Lines 3589-3594 Link Here
3589	public void javadocDuplicatedReturnTag(int sourceStart, int sourceEnd){	3590	public void javadocDuplicatedReturnTag(int sourceStart, int sourceEnd){
3590	this.handle(IProblem.JavadocDuplicateReturnTag, NoArgument, NoArgument, sourceStart, sourceEnd);	3591	this.handle(IProblem.JavadocDuplicateReturnTag, NoArgument, NoArgument, sourceStart, sourceEnd);
3591	}	3592	}
		3593	public void javadocDuplicatedTag(char[] tagName, int sourceStart, int sourceEnd){
		3594	String[] arguments = new String[] { new String(tagName) };
		3595	this.handle(
		3596	IProblem.JavadocDuplicateTag,
		3597	arguments,
		3598	arguments,
		3599	sourceStart,
		3600	sourceEnd);
		3601	}
3592	public void javadocDuplicatedThrowsClassName(TypeReference typeReference, int modifiers) {	3602	public void javadocDuplicatedThrowsClassName(TypeReference typeReference, int modifiers) {
3593	int severity = computeSeverity(IProblem.JavadocDuplicateThrowsClassName);	3603	int severity = computeSeverity(IProblem.JavadocDuplicateThrowsClassName);
3594	if (severity == ProblemSeverities.Ignore) return;	3604	if (severity == ProblemSeverities.Ignore) return;

Lines 2900-2935 Link Here

(-)src/org/eclipse/jdt/core/tests/compiler/regression/JavadocBugsTest.java (-22 / +253 lines)
2900	}	2900	}
2901		2901
2902	/**	2902	/**
2903	* Bug 70892: [1.5][Javadoc] Compiler should parse reference for inline tag @value	2903	* @bug 70892: [1.5][Javadoc] Compiler should parse reference for inline tag @value
2904	* @see <a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=70892">70892</a>	2904	* @test Ensure that reference in tag {@value} is only verified when source level >= 1.5
2905	* These two tests should pass whatever the source level...	2905	* @see "http://bugs.eclipse.org/bugs/show_bug.cgi?id=70892"
2906	*/	2906	*/
2907	public void testBug70892conform1() {	2907	public void testBug70892a() {
2908	runConformTest(
2909	new String[] {
2910	"X.java",
2911	"/**\n" +
2912	" * {@value}\n" +
2913	" * {@value }\n" +
2914	" * {@value #field}\n" +
2915	" */\n" +
2916	"public class X {\n" +
2917	" static int field;\n" +
2918	"}\n"
2919	}
2920	);
2921	}
2922	public void testBug70892conform2() {
2923	runConformTest(	2908	runConformTest(
2924	new String[] {	2909	new String[] {
2925	"X.java",	2910	"X.java",
2926	"public class X {\n" +	2911	"public class X {\n" +
2927	" /*{@value #field}/\n" +	2912	" /**\n" +
2928	" static int field;\n" +	2913	" * {@value}\n" +
2929	"}\n"	2914	" */\n" +
		2915	" static int field1;\n" +
		2916	" /**\n" +
		2917	" * {@value }\n" +
		2918	" */\n" +
		2919	" static int field2;\n" +
		2920	" /**\n" +
		2921	" * {@value #field}\n" +
		2922	" */\n" +
		2923	" static int field;\n" +
		2924	"}\n"
2930	}	2925	}
2931	);	2926	);
2932	}	2927	}
		2928	public void testBug70892b() {
		2929	String[] testFiles = new String[] {
		2930	"X.java",
		2931	"public class X {\n" +
		2932	" /**\n" +
		2933	" * {@value \"invalid\"}\n" +
		2934	" */\n" +
		2935	" final static int field1 = 1;\n" +
		2936	" /**\n" +
		2937	" * {@value <a href=\"invalid\">invalid</a>} invalid\n" +
		2938	" */\n" +
		2939	" final static int field2 = 2;\n" +
		2940	" /**\n" +
		2941	" * {@value #field}\n" +
		2942	" */\n" +
		2943	" final static int field3 = 3;\n" +
		2944	" /**\n" +
		2945	" * {@value #foo}\n" +
		2946	" */\n" +
		2947	" final static int field4 = 4;\n" +
		2948	" /**\n" +
		2949	" * {@value #foo()}\n" +
		2950	" */\n" +
		2951	" final static int field5 = 5;\n" +
		2952	" void foo() {}\n" +
		2953	"}\n"
		2954	};
		2955	if (this.complianceLevel.equals(COMPLIANCE_1_3) \|\| this.complianceLevel.equals(COMPLIANCE_1_4)) {
		2956	runConformTest(testFiles);
		2957	} else {
		2958	runNegativeTest(testFiles,
		2959	"----------\n" +
		2960	"1. ERROR in X.java (at line 3)\r\n" +
		2961	" * {@value \"invalid\"}\r\n" +
		2962	" ^^^^^^^^^\n" +
		2963	"Javadoc: Only static field reference is allowed for @value tag\n" +
		2964	"----------\n" +
		2965	"2. ERROR in X.java (at line 7)\r\n" +
		2966	" * {@value <a href=\"invalid\">invalid</a>} invalid\r\n" +
		2967	" ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n" +
		2968	"Javadoc: Only static field reference is allowed for @value tag\n" +
		2969	"----------\n" +
		2970	"3. ERROR in X.java (at line 11)\r\n" +
		2971	" * {@value #field}\r\n" +
		2972	" ^^^^^\n" +
		2973	"Javadoc: field cannot be resolved or is not a field\n" +
		2974	"----------\n" +
		2975	"4. ERROR in X.java (at line 15)\r\n" +
		2976	" * {@value #foo}\r\n" +
		2977	" ^^^\n" +
		2978	"Javadoc: Only static field reference is allowed for @value tag\n" +
		2979	"----------\n" +
		2980	"5. ERROR in X.java (at line 19)\r\n" +
		2981	" * {@value #foo()}\r\n" +
		2982	" ^^^^^\n" +
		2983	"Javadoc: Only static field reference is allowed for @value tag\n" +
		2984	"----------\n"
		2985	);
		2986	}
		2987	}
2933		2988
2934	/**	2989	/**
2935	* Bug 73348: [Javadoc] Missing description for return tag is not always warned	2990	* Bug 73348: [Javadoc] Missing description for return tag is not always warned
Lines 4815-4818 Link Here
4815	"----------\n"	4870	"----------\n"
4816	);	4871	);
4817	}	4872	}
		4873
		4874	/**
		4875	* @bug 153399: [javadoc] JDT Core should warn if the @value tag is not used correctly
		4876	* @test Ensure that {@value} tag is well warned when not used correctly
		4877	* @see "http://bugs.eclipse.org/bugs/show_bug.cgi?id=153399"
		4878	*/
		4879	public void testBug153399a() {
		4880	String[] testFiles = new String[] {
		4881	"X.java",
		4882	"public class X { \n" +
		4883	" /**\n" +
		4884	" * {@value #MY_VALUE}\n" +
		4885	" */\n" +
		4886	" public final static int MY_VALUE = 0; \n" +
		4887	" /**\n" +
		4888	" * {@value #MY_VALUE}\n" +
		4889	" */\n" +
		4890	" public void foo() {}\n" +
		4891	" /**\n" +
		4892	" * {@value #MY_VALUE}\n" +
		4893	" */\n" +
		4894	" class Sub {} \n" +
		4895	"}\n"
		4896	};
		4897	if (complianceLevel.equals(COMPLIANCE_1_3) \|\| complianceLevel.equals(COMPLIANCE_1_4)) {
		4898	runNegativeTest(testFiles,
		4899	"----------\n" +
		4900	"1. ERROR in X.java (at line 7)\n" +
		4901	" * {@value #MY_VALUE}\n" +
		4902	" ^^^^^\n" +
		4903	"Javadoc: Unexpected tag\n" +
		4904	"----------\n" +
		4905	"2. ERROR in X.java (at line 11)\n" +
		4906	" * {@value #MY_VALUE}\n" +
		4907	" ^^^^^\n" +
		4908	"Javadoc: Unexpected tag\n" +
		4909	"----------\n"
		4910	);
		4911	} else {
		4912	runConformTest(testFiles);
		4913	}
		4914	}
		4915	public void testBug153399b() {
		4916	String[] testFiles = new String[] {
		4917	"X.java",
		4918	"public class X { \n" +
		4919	" /**\n" +
		4920	" * {@value}\n" +
		4921	" */\n" +
		4922	" public final static int MY_VALUE = 0; \n" +
		4923	" /**\n" +
		4924	" * {@value}\n" +
		4925	" */\n" +
		4926	" public void foo() {}\n" +
		4927	" /**\n" +
		4928	" * {@value}\n" +
		4929	" */\n" +
		4930	" class Sub {} \n" +
		4931	"}\n"
		4932	};
		4933	if (complianceLevel.equals(COMPLIANCE_1_3) \|\| complianceLevel.equals(COMPLIANCE_1_4)) {
		4934	runNegativeTest(testFiles,
		4935	"----------\n" +
		4936	"1. ERROR in X.java (at line 7)\n" +
4937	" * {@value}\n" +
4938	" ^^^^^\n" +
4939	"Javadoc: Unexpected tag\n" +
4940	"----------\n" +
4941	"2. ERROR in X.java (at line 11)\n" +
4942	" * {@value}\n" +
4943	" ^^^^^\n" +
4944	"Javadoc: Unexpected tag\n" +
4945	"----------\n"
4946	);
4947	} else {
4948	runConformTest(testFiles);
4949	}
4950	}
4951	public void testBug153399c() {
4952	String[] testFiles = new String[] {
4953	"p1/X.java",
4954	"package p1;\n" +
4955	"public class X {\n" +
4956	" /**\n" +
4957	" * @return a\n" +
4958	" */\n" +
4959	" boolean get() {\n" +
4960	" return false;\n" +
4961	" }\n" +
4962	"}\n"
4963	};
4964	runConformTest(testFiles);
4965	}
4966	public void testBug153399d() {
4967	String[] testFiles = new String[] {
4968	"X.java",
4969	"public class X { \n" +
4970	" /**\n" +
4971	" * {@value #MY_VALUE}\n" +
4972	" * {@value}\n" +
4973	" * {@value Invalid}\n" +
4974	" */\n" +
4975	" public final static int MY_VALUE = 0; \n" +
4976	"}\n"
4977	};
4978	if (complianceLevel.equals(COMPLIANCE_1_3) \|\| complianceLevel.equals(COMPLIANCE_1_4)) {
4979	runNegativeTest(testFiles,
4980	"----------\n" +
4981	"1. ERROR in X.java (at line 3)\n" +
4982	" * {@value #MY_VALUE}\n" +
4983	" ^^^^^\n" +
4984	"Javadoc: Unexpected duplicated tag @value\n" +
4985	"----------\n" +
4986	"2. ERROR in X.java (at line 4)\n" +
4987	" * {@value}\n" +
4988	" ^^^^^\n" +
4989	"Javadoc: Unexpected duplicated tag @value\n" +
4990	"----------\n"
4991	);
4992	} else {
4993	runNegativeTest(testFiles,
4994	"----------\n" +
4995	"1. ERROR in X.java (at line 4)\n" +
4996	" * {@value}\n" +
4997	" ^^^^^\n" +
4998	"Javadoc: Unexpected duplicated tag @value\n" +
4999	"----------\n" +
5000	"2. ERROR in X.java (at line 5)\n" +
5001	" * {@value Invalid}\n" +
5002	" ^^^^^\n" +
5003	"Javadoc: Unexpected duplicated tag @value\n" +
5004	"----------\n" +
5005	"3. ERROR in X.java (at line 5)\n" +
5006	" * {@value Invalid}\n" +
5007	" ^^^^^^^^\n" +
5008	"Javadoc: Invalid reference\n" +
5009	"----------\n"
5010	);
5011	}
5012	}
5013	public void testBug153399e() {
5014	String[] testFiles = new String[] {
5015	"X.java",
5016	"public class X { \n" +
5017	" /**\n" +
5018	" * {@value Invalid}\n" +
5019	" * {@value #MY_VALUE}\n" +
5020	" */\n" +
5021	" public final static int MY_VALUE = 0; \n" +
5022	"}\n"
5023	};
5024	if (complianceLevel.equals(COMPLIANCE_1_3) \|\| complianceLevel.equals(COMPLIANCE_1_4)) {
5025	runNegativeTest(testFiles,
5026	"----------\n" +
5027	"1. ERROR in X.java (at line 3)\n" +
5028	" * {@value Invalid}\n" +
5029	" ^^^^^\n" +
5030	"Javadoc: Unexpected duplicated tag @value\n" +
5031	"----------\n"
5032	);
5033	} else {
5034	runNegativeTest(testFiles,
5035	"----------\n" +
5036	"1. ERROR in X.java (at line 3)\n" +
5037	" * {@value Invalid}\n" +
5038	" ^^^^^\n" +
5039	"Javadoc: Unexpected duplicated tag @value\n" +
5040	"----------\n" +
5041	"2. ERROR in X.java (at line 3)\n" +
5042	" * {@value Invalid}\n" +
5043	" ^^^^^^^^\n" +
5044	"Javadoc: Invalid reference\n" +
5045	"----------\n"
5046	);
5047	}
5048	}
4818	}	5049	}

Lines 82-136 Link Here

(-)src/org/eclipse/jdt/core/tests/compiler/regression/JavadocTest_1_4.java (-49 lines)
82	this.reportMissingJavadocComments = CompilerOptions.IGNORE;	82	this.reportMissingJavadocComments = CompilerOptions.IGNORE;
83	}	83	}
84		84
85	/**
86	* Test fix for bug 70892: [1.5][Javadoc] Compiler should parse reference for inline tag @value
87	* @see <a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=70892">70892</a>
88	* These two tests pass for 1.3 or 1.4 source level but should fail for 1.5
89	* @see JavadocTest_1_5
90	*/
91	public void test001() {
92	reportMissingJavadocTags = CompilerOptions.IGNORE;
93	reportMissingJavadocComments = CompilerOptions.IGNORE;
94	runNegativeTest(
95	new String[] {
96	"X.java",
97	"/**\n" +
98	" * {@value \"invalid\"}\n" +
99	" * {@value <a href=\"invalid\">invalid</a>} invalid\n" +
100	" * {@value #field}\n" +
101	" * {@value #foo}\n" +
102	" * {@value #foo()}\n" +
103	" */\n" +
104	"public class X {\n" +
105	" int field;\n" +
106	" void foo() {}\n" +
107	"}\n"
108	},
109	"" // No failure in fact...
110	);
111	}
112	public void test002() {
113	reportMissingJavadocTags = CompilerOptions.IGNORE;
114	reportMissingJavadocComments = CompilerOptions.IGNORE;
115	runNegativeTest(
116	new String[] {
117	"X.java",
118	"/**\n" +
119	" * {@value \"invalid}\n" +
120	" * {@value <a href}\n" +
121	" * {@value <a href=\"invalid\">invalid</a} invalid\n" +
122	" * {@value #fild}\n" +
123	" * {@value #fo}\n" +
124	" * {@value #f()}\n" +
125	" */\n" +
126	"public class X {\n" +
127	" int field;\n" +
128	" void foo() {}\n" +
129	"}\n"
130	},
131	"" // No failure in fact...
132	);
133	}
134		85
135	/**	86	/**
136	* Test fix for bug 70891: [1.5][javadoc] Compiler should accept new 1.5 syntax for @param	87	* Test fix for bug 70891: [1.5][javadoc] Compiler should accept new 1.5 syntax for @param