Attachment 112436 Details for Bug 207765 – Updated patch on top of v_912

[patch] Updated patch on top of v_912

v01.txt (text/plain), 3.77 KB, created by Frederic Fusier

on 2008-09-12 11:52:15 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Frederic Fusier

Created: 2008-09-12 11:52:15 EDT

Size: 3.77 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.core
>Index: compiler/org/eclipse/jdt/internal/compiler/parser/AbstractCommentParser.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/AbstractCommentParser.java,v
>retrieving revision 1.84
>diff -u -r1.84 AbstractCommentParser.java
>--- compiler/org/eclipse/jdt/internal/compiler/parser/AbstractCommentParser.java	11 Sep 2008 15:39:21 -0000	1.84
>+++ compiler/org/eclipse/jdt/internal/compiler/parser/AbstractCommentParser.java	12 Sep 2008 13:06:02 -0000
>@@ -1149,7 +1149,25 @@
> 						}
> 						char[] currentError = this.scanner.getCurrentIdentifierSource();
> 						if (currentError.length>0 && currentError[0] == '"') {
>-							if (this.reportProblems) this.sourceParser.problemReporter().javadocInvalidReference(this.scanner.getCurrentTokenStartPosition(), getTokenEndPosition());
>+							if (this.reportProblems) {
>+								boolean isUrlRef = false;
>+								if (this.tagValue == TAG_SEE_VALUE) {
>+									int length=currentError.length, i=1 /* first char is " */;
>+									while (i<length && ScannerHelper.isLetter(currentError[i])) {
>+										i++;
>+									}
>+									if (i<(length-2) && currentError[i] == ':' && currentError[i+1] == '/' && currentError[i+2] == '/') {
>+										isUrlRef = true;
>+									}
>+								}
>+								if (isUrlRef) {
>+									// https://bugs.eclipse.org/bugs/show_bug.cgi?id=207765
>+									// handle invalid URL references in javadoc with dedicated message
>+									this.sourceParser.problemReporter().javadocInvalidSeeUrlReference(this.scanner.getCurrentTokenStartPosition(), getTokenEndPosition());
>+								} else {
>+									this.sourceParser.problemReporter().javadocInvalidReference(this.scanner.getCurrentTokenStartPosition(), getTokenEndPosition());
>+								}
>+							}
> 							return false;
> 						}
> 						break nextToken;
>#P org.eclipse.jdt.core.tests.compiler
>Index: src/org/eclipse/jdt/core/tests/compiler/regression/JavadocBugsTest.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/JavadocBugsTest.java,v
>retrieving revision 1.53
>diff -u -r1.53 JavadocBugsTest.java
>--- src/org/eclipse/jdt/core/tests/compiler/regression/JavadocBugsTest.java	11 Sep 2008 16:36:31 -0000	1.53
>+++ src/org/eclipse/jdt/core/tests/compiler/regression/JavadocBugsTest.java	12 Sep 2008 13:06:04 -0000
>@@ -7504,6 +7504,41 @@
> }
> 
> /**
>+ * @bug 207765: [javadoc] Javadoc warning on @see reference could be improved
>+ * @test Ensure we have different message depending on tag value
>+ * @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=207765"
>+ */
>+public void testBug207765() {
>+	runNegativeTest(
>+		new String[] {
>+			"pkg/X.java",
>+			"package pkg;\n" +
>+			"\n" +
>+			"public class X {\n" +
>+			"	/**\n" + 
>+			"	 * {@link \"http://www.eclipse.org/}\n" +
>+			"	 * @see \"http://www.eclipse.org/\n" +
>+			"	 */\n" +
>+			"	public void foo() { \n" +
>+			"	 \n" +
>+			"	}\n" +
>+			"}\n"
>+		},
>+		"----------\n" + 
>+		"1. ERROR in pkg\\X.java (at line 5)\n" + 
>+		"	* {@link \"http://www.eclipse.org/}\n" + 
>+		"	         ^^^^^^^^^^^^^^^^^^^^^^^^^\n" + 
>+		"Javadoc: Invalid reference\n" + 
>+		"----------\n" + 
>+		"2. ERROR in pkg\\X.java (at line 6)\n" + 
>+		"	* @see \"http://www.eclipse.org/\n" + 
>+		"	       ^^^^^^^^^^^^^^^^^^^^^^^^\n" + 
>+		"Javadoc: Invalid URL reference. Double quote the reference or use the href syntax\n" + 
>+		"----------\n"
>+	);
>+}
>+
>+/**
>  * @bug 222900: [Javadoc] Missing description is warned if valid description is on a new line
>  * @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=222900"
>  */

Actions: View | Diff

Attachments on bug 207765: 103553 | 112436