Attachment #54137 for bug #139621




}

/**
 * @bug 139621: [javadoc][assist] No Javadoc completions if there's no member below
 * @test Ensure that completion happens in an orphan javadoc (ie. a javadoc comment not attached to a declaration
 * @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=139621"
 */
public void testBug139621a() throws JavaModelException {
	String source =
		"package bugs.b139621;\n" + 
		"public class BasicTestBugs {\n" + 
		"	/**\n" + 
		"	 * This method returns an object\n" + 
		"	 * @see Obj\n" + 
		"	 */\n" + 
		"}\n";
	completeInJavadoc("/Completion/src/bugs/b139621/BasicTestBugs.java", source, true, "Obj");
	assertSortedResults(
		"Object[TYPE_REF]{Object, java.lang, Ljava.lang.Object;, null, null, "+this.positions+R_DICUNR+"}"
	);
}
public void testBug139621b() throws JavaModelException {
	String source =
		"package bugs.b139621;\n" + 
		"/**\n" + 
		" * This method returns an object\n" + 
		" * @see Test\n" + 
		" */\n" + 
		"public class BasicTestBugs {\n" + 
		"	/**\n" + 
		"	 * This method returns an object\n" + 
		"	 * @see Obj\n" + 
		"	 */\n" + 
		"}\n";
	completeInJavadoc("/Completion/src/bugs/b139621/BasicTestBugs.java", source, true, "Obj");
	assertSortedResults(
		"Object[TYPE_REF]{Object, java.lang, Ljava.lang.Object;, null, null, "+this.positions+R_DICUNR+"}"
	);
}

/**
 * Bug 144866: [assist][javadoc] Wrong completion inside @value tag
 * @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=144866"
 */




	popElement(K_SELECTOR_INVOCATION_TYPE);
	super.consumeClassBodyopt();
}
/* (non-Javadoc)
 * @see org.eclipse.jdt.internal.compiler.parser.Parser#consumeClassDeclaration()
 */
protected void consumeClassDeclaration() {
	if (this.astPtr >= 0 && this.astStack[this.astPtr] instanceof TypeDeclaration) {
		TypeDeclaration typeDeclaration = (TypeDeclaration) this.astStack[this.astPtr];
		this.javadoc = null;
		checkComment();
		if (this.javadoc != null && this.cursorLocation > this.javadoc.sourceStart && this.cursorLocation < this.javadoc.sourceEnd) {
			// completion is in an orphan javadoc comment => replace type declaration one with it to allow completion resolution
			typeDeclaration.javadoc = this.javadoc;
		}
	}
	super.consumeClassDeclaration();
}
protected void consumeClassHeaderName1() {
	super.consumeClassHeaderName1();


Lines 53-59 Link Here

(-)buildnotes_jdt-core.html (-1 / +3 lines)
53	<h2>What's new in this drop</h2>	53	<h2>What's new in this drop</h2>
54		54
55	<h3>Problem Reports Fixed</h3>	55	<h3>Problem Reports Fixed</h3>
56	<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=164946">164946</a>	56	<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=139621">139621</a>
		57	[javadoc][assist] No Javadoc completions if there's no member below
		58	<br><a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=164946">164946</a>
57	Spaces in control statements	59	Spaces in control statements
58	<br><a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=163807">163807</a>	60	<br><a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=163807">163807</a>
59	JDT fails to compile legal Java source files	61	JDT fails to compile legal Java source files

Return to bug 139621

Lines 798-803 Link Here

(-)src/org/eclipse/jdt/core/tests/model/JavadocBugsCompletionModelTest.java (+38 lines)
798	}	798	}
799		799
800	/**	800	/**
		801	* @bug 139621: [javadoc][assist] No Javadoc completions if there's no member below
		802	* @test Ensure that completion happens in an orphan javadoc (ie. a javadoc comment not attached to a declaration
		803	* @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=139621"
		804	*/
		805	public void testBug139621a() throws JavaModelException {
		806	String source =
		807	"package bugs.b139621;\n" +
		808	"public class BasicTestBugs {\n" +
		809	" /**\n" +
		810	" * This method returns an object\n" +
		811	" * @see Obj\n" +
		812	" */\n" +
		813	"}\n";
		814	completeInJavadoc("/Completion/src/bugs/b139621/BasicTestBugs.java", source, true, "Obj");
		815	assertSortedResults(
		816	"Object[TYPE_REF]{Object, java.lang, Ljava.lang.Object;, null, null, "+this.positions+R_DICUNR+"}"
		817	);
		818	}
		819	public void testBug139621b() throws JavaModelException {
		820	String source =
		821	"package bugs.b139621;\n" +
		822	"/**\n" +
		823	" * This method returns an object\n" +
		824	" * @see Test\n" +
		825	" */\n" +
		826	"public class BasicTestBugs {\n" +
		827	" /**\n" +
		828	" * This method returns an object\n" +
		829	" * @see Obj\n" +
		830	" */\n" +
		831	"}\n";
		832	completeInJavadoc("/Completion/src/bugs/b139621/BasicTestBugs.java", source, true, "Obj");
		833	assertSortedResults(
		834	"Object[TYPE_REF]{Object, java.lang, Ljava.lang.Object;, null, null, "+this.positions+R_DICUNR+"}"
		835	);
		836	}
		837
		838	/**
801	* Bug 144866: [assist][javadoc] Wrong completion inside @value tag	839	* Bug 144866: [assist][javadoc] Wrong completion inside @value tag
802	* @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=144866"	840	* @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=144866"
803	*/	841	*/

Lines 1770-1775 Link Here

(-)codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionParser.java (+15 lines)
1770	popElement(K_SELECTOR_INVOCATION_TYPE);	1770	popElement(K_SELECTOR_INVOCATION_TYPE);
1771	super.consumeClassBodyopt();	1771	super.consumeClassBodyopt();
1772	}	1772	}
		1773	/* (non-Javadoc)
		1774	* @see org.eclipse.jdt.internal.compiler.parser.Parser#consumeClassDeclaration()
		1775	*/
		1776	protected void consumeClassDeclaration() {
		1777	if (this.astPtr >= 0 && this.astStack[this.astPtr] instanceof TypeDeclaration) {
		1778	TypeDeclaration typeDeclaration = (TypeDeclaration) this.astStack[this.astPtr];
		1779	this.javadoc = null;
		1780	checkComment();
		1781	if (this.javadoc != null && this.cursorLocation > this.javadoc.sourceStart && this.cursorLocation < this.javadoc.sourceEnd) {
		1782	// completion is in an orphan javadoc comment => replace type declaration one with it to allow completion resolution
		1783	typeDeclaration.javadoc = this.javadoc;
		1784	}
		1785	}
		1786	super.consumeClassDeclaration();
		1787	}
1773	protected void consumeClassHeaderName1() {	1788	protected void consumeClassHeaderName1() {
1774	super.consumeClassHeaderName1();	1789	super.consumeClassHeaderName1();
1775		1790