Attachment #67072 for bug #185576

Lines 6499-6505 Link Here

(-)codeassist/org/eclipse/jdt/internal/codeassist/CompletionEngine.java (-1 / +1 lines)
6499		6499
6500	if (!skip && proposeType && scope.enclosingSourceType() != null) {	6500	if (!skip && proposeType && scope.enclosingSourceType() != null) {
6501	findNestedTypes(token, scope.enclosingSourceType(), scope, proposeAllMemberTypes, typesFound);	6501	findNestedTypes(token, scope.enclosingSourceType(), scope, proposeAllMemberTypes, typesFound);
6502	if(!assistNodeIsConstructor && !assistNodeIsAnnotation) {	6502	if((!assistNodeIsConstructor && !assistNodeIsAnnotation) && this.assistNodeInJavadoc == 0) {
6503	// don't propose type parameters if the completion is a constructor ('new \|')	6503	// don't propose type parameters if the completion is a constructor ('new \|')
6504	findTypeParameters(token, scope);	6504	findTypeParameters(token, scope);
6505	}	6505	}




	completeInJavadoc("/Completion/src/bugs/b171031/BasicTestBugs.java", source, true, "@In", 1);
	assertSortedResults(""); // should not have any proposal as 
}

/**
 * @bug 185576: [javadoc][assist] Type parameters should not be proposed while completing in @link or @see reference
 * @test Do not include type params in Javadoc content assist proposals 
 * @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=185576"
 */
public void testBug185576a() throws JavaModelException {
	String source =
		"package bugs.b185576;\n" + 
		"public class BasicTestBugs {\n" + 
		"/**\n" + 
		"   * The return type {@link } and that is all.\n" + 
		"   * @param <X>\n" + 
		"   * @param t\n" + 
		"   * @return something.\n" + 
		"   */\n" + 
		"  public <X> X foooo(X t)\n" + 
		"  {\n" + 
		"    return null;\n" + 
		"  }\n" + 
		"}\n";
	completeInJavadoc("/Completion/src/bugs/b185576/BasicTestBugs.java", source, true, "@link ", 1);
	assertSortedResults(""); // should not have any proposal as 
}

public void testBug185576b() throws JavaModelException {
	String source =
		"package bugs.b185576;\n" + 
		"public class BasicTestBugs {\n" + 
		"/**\n" + 
		"   * The return type {@link } and that is all.\n" + 
		"   * @param <X>\n" + 
		"   * @param t\n" + 
		"   * @return something.\n" + 
		"   */\n" + 
		"  public <X> X foooo(X t)\n" + 
		"  {\n" + 
		"    return null;\n" + 
		"  }\n" + 
		"  public class X {}\n" +
		"}\n";
	completeInJavadoc("/Completion/src/bugs/b185576/BasicTestBugs.java", source, true, "@link ", 1);
	assertSortedResults(
			"BasicTestBugs[TYPE_REF]{BasicTestBugs, bugs.b185576, Lbugs.b185576.BasicTestBugs;, null, null, [83, 83], 22}\n" +
			"BasicTestBugs.X[TYPE_REF]{X, bugs.b185576, Lbugs.b185576.BasicTestBugs$X;, null, null, [83, 83], 22}");
}
}

Return to bug 185576

Lines 1058-1061 Link Here

(-)src/org/eclipse/jdt/core/tests/model/JavadocBugsCompletionModelTest.java (+46 lines)
1058	completeInJavadoc("/Completion/src/bugs/b171031/BasicTestBugs.java", source, true, "@In", 1);	1058	completeInJavadoc("/Completion/src/bugs/b171031/BasicTestBugs.java", source, true, "@In", 1);
1059	assertSortedResults(""); // should not have any proposal as	1059	assertSortedResults(""); // should not have any proposal as
1060	}	1060	}
		1061
		1062	/**
		1063	* @bug 185576: [javadoc][assist] Type parameters should not be proposed while completing in @link or @see reference
		1064	* @test Do not include type params in Javadoc content assist proposals
		1065	* @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=185576"
		1066	*/
		1067	public void testBug185576a() throws JavaModelException {
		1068	String source =
		1069	"package bugs.b185576;\n" +
		1070	"public class BasicTestBugs {\n" +
		1071	"/**\n" +
		1072	" * The return type {@link } and that is all.\n" +
		1073	" * @param <X>\n" +
		1074	" * @param t\n" +
		1075	" * @return something.\n" +
		1076	" */\n" +
		1077	" public <X> X foooo(X t)\n" +
		1078	" {\n" +
		1079	" return null;\n" +
		1080	" }\n" +
		1081	"}\n";
		1082	completeInJavadoc("/Completion/src/bugs/b185576/BasicTestBugs.java", source, true, "@link ", 1);
		1083	assertSortedResults(""); // should not have any proposal as
		1084	}
		1085
		1086	public void testBug185576b() throws JavaModelException {
		1087	String source =
		1088	"package bugs.b185576;\n" +
		1089	"public class BasicTestBugs {\n" +
		1090	"/**\n" +
		1091	" * The return type {@link } and that is all.\n" +
		1092	" * @param <X>\n" +
		1093	" * @param t\n" +
		1094	" * @return something.\n" +
		1095	" */\n" +
		1096	" public <X> X foooo(X t)\n" +
		1097	" {\n" +
		1098	" return null;\n" +
		1099	" }\n" +
		1100	" public class X {}\n" +
		1101	"}\n";
		1102	completeInJavadoc("/Completion/src/bugs/b185576/BasicTestBugs.java", source, true, "@link ", 1);
		1103	assertSortedResults(
		1104	"BasicTestBugs[TYPE_REF]{BasicTestBugs, bugs.b185576, Lbugs.b185576.BasicTestBugs;, null, null, [83, 83], 22}\n" +
		1105	"BasicTestBugs.X[TYPE_REF]{X, bugs.b185576, Lbugs.b185576.BasicTestBugs$X;, null, null, [83, 83], 22}");
		1106	}
1061	}	1107	}