Attachment 43346 Details for Bug 144866 – Proposed patch

[patch] Proposed patch

v00.txt (text/plain), 5.11 KB, created by Frederic Fusier

on 2006-06-02 09:18:10 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Frederic Fusier

Created: 2006-06-02 09:18:10 EDT

Size: 5.11 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.core
>Index: codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionJavadocParser.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionJavadocParser.java,v
>retrieving revision 1.22
>diff -u -r1.22 CompletionJavadocParser.java
>--- codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionJavadocParser.java	28 Mar 2006 20:29:57 -0000	1.22
>+++ codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionJavadocParser.java	2 Jun 2006 11:52:08 -0000
>@@ -642,7 +642,7 @@
> 								}
> 								this.scanner.tokenizeWhiteSpace = true;
> 								if (this.completionNode != null) {
>-									int flags = CompletionOnJavadoc.TEXT|CompletionOnJavadoc.ONLY_INLINE_TAG;
>+									int flags = this.inlineTagStarted ? 0 : CompletionOnJavadoc.TEXT|CompletionOnJavadoc.ONLY_INLINE_TAG;
> 									if (member instanceof JavadocMessageSend) {
> 										JavadocMessageSend msgSend = (JavadocMessageSend) member;
> 										this.completionNode = new CompletionOnJavadocMessageSend(msgSend, this.memberStart, flags);
>@@ -763,9 +763,10 @@
> 			consumeToken();
> 
> 			if (this.completionNode != null) {
>-				this.completionNode.addCompletionFlags(CompletionOnJavadoc.TEXT);
> 				if (this.inlineTagStarted) {
> 					this.completionNode.addCompletionFlags(CompletionOnJavadoc.FORMAL_REFERENCE);
>+				} else {
>+					this.completionNode.addCompletionFlags(CompletionOnJavadoc.TEXT);
> 				}
> 			}
> 		}
>#P org.eclipse.jdt.core.tests.compiler
>Index: src/org/eclipse/jdt/core/tests/compiler/parser/JavadocCompletionParserTest.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/parser/JavadocCompletionParserTest.java,v
>retrieving revision 1.12
>diff -u -r1.12 JavadocCompletionParserTest.java
>--- src/org/eclipse/jdt/core/tests/compiler/parser/JavadocCompletionParserTest.java	29 Mar 2006 03:50:23 -0000	1.12
>+++ src/org/eclipse/jdt/core/tests/compiler/parser/JavadocCompletionParserTest.java	2 Jun 2006 11:52:09 -0000
>@@ -391,7 +391,7 @@
> 	verifyCompletionInJavadoc(source, "Obj");
> 	assertCompletionNodeResult(source,
> 		"<CompletionOnJavadocSingleTypeReference:Obj\n" + 
>-		"	infos:text,formal reference\n" + 
>+		"	infos:formal reference\n" + 
> 		">"
> 	);
> }
>#P org.eclipse.jdt.core.tests.model
>Index: src/org/eclipse/jdt/core/tests/model/JavadocBugsCompletionModelTest.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/JavadocBugsCompletionModelTest.java,v
>retrieving revision 1.13
>diff -u -r1.13 JavadocBugsCompletionModelTest.java
>--- src/org/eclipse/jdt/core/tests/model/JavadocBugsCompletionModelTest.java	29 Mar 2006 04:03:07 -0000	1.13
>+++ src/org/eclipse/jdt/core/tests/model/JavadocBugsCompletionModelTest.java	2 Jun 2006 11:52:11 -0000
>@@ -788,4 +788,27 @@
> 		"BasicTestBugs.Inner.Level2[TYPE_REF]{Level2, bugs.b118397, Lbugs.b118397.BasicTestBugs$Inner$Level2;, null, null, "+this.positions+R_DICNR+"}"
> 	);
> }
>+
>+/**
>+ * Bug 144866: [assist][javadoc] Wrong completion inside @value tag
>+ * @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=144866"
>+ */
>+public void testBug144866() throws JavaModelException {
>+	String source =
>+		"package bugs.b144866;\n" + 
>+		"public class BasicTestBugs {\n" + 
>+		"	public static int EXAMPLE = 0;\n" + 
>+		"	/**\n" + 
>+		"	 * This method returns an object\n" + 
>+		"	 * @see Object\n" + 
>+		"	 * 	This method will use {@value #EX } constant value...\n" + 
>+		"	 */\n" + 
>+		"	public void foo() {\n" + 
>+		"	}\n" + 
>+		"}\n";
>+	completeInJavadoc("/Completion/src/bugs/b144866/BasicTestBugs.java", source, true, "EX", 2); // 2nd occurence
>+	assertSortedResults(
>+		"EXAMPLE[FIELD_REF]{EXAMPLE, Lbugs.b144866.BasicTestBugs;, I, EXAMPLE, null, "+this.positions+R_DICNR+"}"
>+	);
>+}
> }
>Index: src/org/eclipse/jdt/core/tests/model/JavadocTextCompletionModelTest.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/JavadocTextCompletionModelTest.java,v
>retrieving revision 1.8
>diff -u -r1.8 JavadocTextCompletionModelTest.java
>--- src/org/eclipse/jdt/core/tests/model/JavadocTextCompletionModelTest.java	29 Mar 2006 04:03:07 -0000	1.8
>+++ src/org/eclipse/jdt/core/tests/model/JavadocTextCompletionModelTest.java	2 Jun 2006 11:52:11 -0000
>@@ -459,9 +459,9 @@
> 		"	 */\n" + 
> 		"	int foo;\n" + 
> 		"}";
>-	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "#fo");
>+	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "fo");
> 	assertSortedResults(
>-		"foo[JAVADOC_FIELD_REF]{{@link #foo}, Ljavadoc.text.BasicTestTextIns;, I, foo, null, "+this.positions+R_DICNRNSIT+"}"
>+		"foo[FIELD_REF]{foo, Ljavadoc.text.BasicTestTextIns;, I, foo, null, "+this.positions+R_DICNRNS+"}"
> 	);
> }
>

Actions: View | Diff

Attachments on bug 144866: 43346