Attachment #48022 for bug #151189

Lines 75-81 Link Here

(-)buildnotes_jdt-core.html (-1 / +3 lines)
75	</ul>	75	</ul>
76		76
77	<h3>Problem Reports Fixed</h3>	77	<h3>Problem Reports Fixed</h3>
78	<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=148224">148224</a>	78	<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=151189">151189</a>
		79	[search] Declaration search does not find all matches
		80	<br><a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=148224">148224</a>
79	AST API request: have binding for int, need int[], int[][] ....	81	AST API request: have binding for int, need int[], int[][] ....
80		82
81	<a name="v_709"></a>	83	<a name="v_709"></a>




	IndexManager manager = JavaModelManager.getJavaModelManager().getIndexManager();
	SimpleSet locations = new SimpleSet();
	IJavaElement focus = MatchLocator.projectOrJarFocus(this.pattern);
	if (focus == null || this.searchScope instanceof JavaWorkspaceScope) {
		for (int i = 0; i < projectsAndJars.length; i++)
			locations.add(manager.computeIndexLocation(projectsAndJars[i]));
	} else {

				IClasspathEntry[] entries = projectsCanSeeFocus[i].getResolvedClasspath();
				for (int j = entries.length; --j >= 0;) {
					IClasspathEntry entry = entries[j];
					switch (entry.getEntryKind()) {
						case IClasspathEntry.CPE_LIBRARY:
							IPath path = entry.getPath();
							if (jarsToCheck.includes(path)) {
								locations.add(manager.computeIndexLocation(entry.getPath()));
								jarsToCheck.remove(path);
							}
							break;
						case IClasspathEntry.CPE_PROJECT:
							// add required projects to index locations
							locations.add(manager.computeIndexLocation(entry.getPath()));
							break;
						}
					}
				}
			}




 * Tests the Java search engine accross multiple projects.
 */
public class JavaSearchMultipleProjectsTests extends ModifyingResourceTests implements IJavaSearchConstants {
	private final static int UI_DECLARATIONS = DECLARATIONS|IGNORE_DECLARING_TYPE|IGNORE_RETURN_TYPE;
public JavaSearchMultipleProjectsTests(String name) {
	super(name);
}

		deleteProject("P2");
	}
}

/**
 * Bug 151189: [search] Declaration search does not find all matches
 * @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=151189"
 */
public void testBug151189_Workspace() throws CoreException {
	try {
		// setup project P1
		/*IJavaProject p1 = */createJavaProject("P1");
		createFolder("/P1/pack");
		createFile(
			"/P1/pack/Declaration.java",
			"package pack;\n" + 
			"public class Declaration implements Interface {\n" + 
			"	public void doOperation(int val) {}\n" + 
			"}\n"
		);
		createFile(
			"/P1/pack/Interface.java",
			"package pack;\n" + 
			"public interface Interface {\n" + 
			"	void doOperation(int val);\n" + 
			"}\n"
		);

		// setup project P2
		createJavaProject("P2", new String[] {""}, new String[] {"JCL_LIB"}, new String[] { "/P1" }, "");
		createFolder("/P2/test");
		createFile(
			"/P2/test/Declaration_bis.java",
			"package test;\n" + 
			"import pack.Interface;\n" + 
			"public class Declaration_bis implements Interface {\n" + 
			"	public void doOperation(int val) {}\n" + 
			"}\n"
		);

		// Get method
		IMethod method = getCompilationUnit("/P2/test/Declaration_bis.java").getType("Declaration_bis").getMethod("doOperation", new String[] {"I"});

		// search method declaration in workspace scope
		IJavaSearchScope scope = SearchEngine.createWorkspaceScope(); //JavaSearchScope(new IJavaElement[] {p1, p2});
		JavaSearchResultCollector resultCollector = new JavaSearchResultCollector();
		resultCollector.showProject = true;
		search(
			method, 
			DECLARATIONS,
			scope, 
			resultCollector);
		assertSearchResults(
			"Unexpected declarations of method test.Declaration_bis.doOperation(int)",
			"test/Declaration_bis.java [in P2] void test.Declaration_bis.doOperation(int) [doOperation]",
			resultCollector);

		// search method declaration in workspace scope with JDT-UI flags
		resultCollector = new JavaSearchResultCollector();
		resultCollector.showProject = true;
		search(
			method, 
			UI_DECLARATIONS,
			scope, 
			resultCollector);
		assertSearchResults(
			"Unexpected declarations of method test.Declaration_bis.doOperation(int)",
			"pack/Declaration.java [in P1] void pack.Declaration.doOperation(int) [doOperation]\n" + 
			"pack/Interface.java [in P1] void pack.Interface.doOperation(int) [doOperation]\n" + 
			"test/Declaration_bis.java [in P2] void test.Declaration_bis.doOperation(int) [doOperation]",
			resultCollector);
	} finally {
		deleteProject("P1");
		deleteProject("P2");
	}
}
public void testBug151189_Project() throws CoreException {
	try {
		// setup project P1
		createJavaProject("P1");
		createFolder("/P1/pack");
		createFile(
			"/P1/pack/Declaration.java",
			"package pack;\n" + 
			"public class Declaration implements Interface {\n" + 
			"	public void doOperation(int val) {}\n" + 
			"}\n"
		);
		createFile(
			"/P1/pack/Interface.java",
			"package pack;\n" + 
			"public interface Interface {\n" + 
			"	void doOperation(int val);\n" + 
			"}\n"
		);

		// setup project P2
		IJavaProject p2 = createJavaProject("P2", new String[] {""}, new String[] {"JCL_LIB"}, new String[] { "/P1" }, "");
		createFolder("/P2/test");
		createFile(
			"/P2/test/Declaration_bis.java",
			"package test;\n" + 
			"import pack.Interface;\n" + 
			"public class Declaration_bis implements Interface {\n" + 
			"	public void doOperation(int val) {}\n" + 
			"}\n"
		);

		// Get method
		IMethod method = getCompilationUnit("/P2/test/Declaration_bis.java").getType("Declaration_bis").getMethod("doOperation", new String[] {"I"});

		// search method declaration in workspace scope
		IJavaSearchScope scope = SearchEngine.createJavaSearchScope(new IJavaElement[] {p2});
		JavaSearchResultCollector resultCollector = new JavaSearchResultCollector();
		resultCollector.showProject = true;
		search(
			method, 
			UI_DECLARATIONS,
			scope, 
			resultCollector);
		assertSearchResults(
			"Unexpected declarations of method test.Declaration_bis.doOperation(int)",
			"pack/Declaration.java [in P1] void pack.Declaration.doOperation(int) [doOperation]\n" + 
			"pack/Interface.java [in P1] void pack.Interface.doOperation(int) [doOperation]\n" + 
			"test/Declaration_bis.java [in P2] void test.Declaration_bis.doOperation(int) [doOperation]",
			resultCollector);
	} finally {
		deleteProject("P1");
		deleteProject("P2");
	}
}
}

Return to bug 151189

Lines 123-129 Link Here

(-)search/org/eclipse/jdt/internal/core/search/IndexSelector.java (-6 / +12 lines)
123	IndexManager manager = JavaModelManager.getJavaModelManager().getIndexManager();	123	IndexManager manager = JavaModelManager.getJavaModelManager().getIndexManager();
124	SimpleSet locations = new SimpleSet();	124	SimpleSet locations = new SimpleSet();
125	IJavaElement focus = MatchLocator.projectOrJarFocus(this.pattern);	125	IJavaElement focus = MatchLocator.projectOrJarFocus(this.pattern);
126	if (focus == null) {	126	if (focus == null \|\| this.searchScope instanceof JavaWorkspaceScope) {
127	for (int i = 0; i < projectsAndJars.length; i++)	127	for (int i = 0; i < projectsAndJars.length; i++)
128	locations.add(manager.computeIndexLocation(projectsAndJars[i]));	128	locations.add(manager.computeIndexLocation(projectsAndJars[i]));
129	} else {	129	} else {
Lines 157-168 Link Here
157	IClasspathEntry[] entries = projectsCanSeeFocus[i].getResolvedClasspath();	157	IClasspathEntry[] entries = projectsCanSeeFocus[i].getResolvedClasspath();
158	for (int j = entries.length; --j >= 0;) {	158	for (int j = entries.length; --j >= 0;) {
159	IClasspathEntry entry = entries[j];	159	IClasspathEntry entry = entries[j];
160	if (entry.getEntryKind() == IClasspathEntry.CPE_LIBRARY) {	160	switch (entry.getEntryKind()) {
161	IPath path = entry.getPath();	161	case IClasspathEntry.CPE_LIBRARY:
162	if (jarsToCheck.includes(path)) {	162	IPath path = entry.getPath();
		163	if (jarsToCheck.includes(path)) {
		164	locations.add(manager.computeIndexLocation(entry.getPath()));
		165	jarsToCheck.remove(path);
		166	}
		167	break;
		168	case IClasspathEntry.CPE_PROJECT:
		169	// add required projects to index locations
163	locations.add(manager.computeIndexLocation(entry.getPath()));	170	locations.add(manager.computeIndexLocation(entry.getPath()));
164	jarsToCheck.remove(path);	171	break;
165	}
166	}	172	}
167	}	173	}
168	}	174	}

Lines 24-29 Link Here

(-)src/org/eclipse/jdt/core/tests/model/JavaSearchMultipleProjectsTests.java (+129 lines)
24	* Tests the Java search engine accross multiple projects.	24	* Tests the Java search engine accross multiple projects.
25	*/	25	*/
26	public class JavaSearchMultipleProjectsTests extends ModifyingResourceTests implements IJavaSearchConstants {	26	public class JavaSearchMultipleProjectsTests extends ModifyingResourceTests implements IJavaSearchConstants {
		27	private final static int UI_DECLARATIONS = DECLARATIONS\|IGNORE_DECLARING_TYPE\|IGNORE_RETURN_TYPE;
27	public JavaSearchMultipleProjectsTests(String name) {	28	public JavaSearchMultipleProjectsTests(String name) {
28	super(name);	29	super(name);
29	}	30	}
Lines 664-667 Link Here
664	deleteProject("P2");	665	deleteProject("P2");
665	}	666	}
666	}	667	}
		668
		669	/**
		670	* Bug 151189: [search] Declaration search does not find all matches
		671	* @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=151189"
		672	*/
		673	public void testBug151189_Workspace() throws CoreException {
		674	try {
		675	// setup project P1
		676	/IJavaProject p1 = /createJavaProject("P1");
		677	createFolder("/P1/pack");
		678	createFile(
		679	"/P1/pack/Declaration.java",
		680	"package pack;\n" +
		681	"public class Declaration implements Interface {\n" +
		682	" public void doOperation(int val) {}\n" +
		683	"}\n"
		684	);
		685	createFile(
		686	"/P1/pack/Interface.java",
		687	"package pack;\n" +
		688	"public interface Interface {\n" +
		689	" void doOperation(int val);\n" +
		690	"}\n"
		691	);
		692
		693	// setup project P2
		694	createJavaProject("P2", new String[] {""}, new String[] {"JCL_LIB"}, new String[] { "/P1" }, "");
		695	createFolder("/P2/test");
		696	createFile(
		697	"/P2/test/Declaration_bis.java",
		698	"package test;\n" +
		699	"import pack.Interface;\n" +
		700	"public class Declaration_bis implements Interface {\n" +
		701	" public void doOperation(int val) {}\n" +
		702	"}\n"
		703	);
		704
		705	// Get method
		706	IMethod method = getCompilationUnit("/P2/test/Declaration_bis.java").getType("Declaration_bis").getMethod("doOperation", new String[] {"I"});
		707
		708	// search method declaration in workspace scope
		709	IJavaSearchScope scope = SearchEngine.createWorkspaceScope(); //JavaSearchScope(new IJavaElement[] {p1, p2});
		710	JavaSearchResultCollector resultCollector = new JavaSearchResultCollector();
		711	resultCollector.showProject = true;
		712	search(
		713	method,
		714	DECLARATIONS,
		715	scope,
		716	resultCollector);
		717	assertSearchResults(
		718	"Unexpected declarations of method test.Declaration_bis.doOperation(int)",
		719	"test/Declaration_bis.java [in P2] void test.Declaration_bis.doOperation(int) [doOperation]",
		720	resultCollector);
		721
		722	// search method declaration in workspace scope with JDT-UI flags
		723	resultCollector = new JavaSearchResultCollector();
		724	resultCollector.showProject = true;
		725	search(
		726	method,
		727	UI_DECLARATIONS,
		728	scope,
		729	resultCollector);
		730	assertSearchResults(
		731	"Unexpected declarations of method test.Declaration_bis.doOperation(int)",
732	"pack/Declaration.java [in P1] void pack.Declaration.doOperation(int) [doOperation]\n" +
733	"pack/Interface.java [in P1] void pack.Interface.doOperation(int) [doOperation]\n" +
734	"test/Declaration_bis.java [in P2] void test.Declaration_bis.doOperation(int) [doOperation]",
735	resultCollector);
736	} finally {
737	deleteProject("P1");
738	deleteProject("P2");
739	}
740	}
741	public void testBug151189_Project() throws CoreException {
742	try {
743	// setup project P1
744	createJavaProject("P1");
745	createFolder("/P1/pack");
746	createFile(
747	"/P1/pack/Declaration.java",
748	"package pack;\n" +
749	"public class Declaration implements Interface {\n" +
750	" public void doOperation(int val) {}\n" +
751	"}\n"
752	);
753	createFile(
754	"/P1/pack/Interface.java",
755	"package pack;\n" +
756	"public interface Interface {\n" +
757	" void doOperation(int val);\n" +
758	"}\n"
759	);
760
761	// setup project P2
762	IJavaProject p2 = createJavaProject("P2", new String[] {""}, new String[] {"JCL_LIB"}, new String[] { "/P1" }, "");
763	createFolder("/P2/test");
764	createFile(
765	"/P2/test/Declaration_bis.java",
766	"package test;\n" +
767	"import pack.Interface;\n" +
768	"public class Declaration_bis implements Interface {\n" +
769	" public void doOperation(int val) {}\n" +
770	"}\n"
771	);
772
773	// Get method
774	IMethod method = getCompilationUnit("/P2/test/Declaration_bis.java").getType("Declaration_bis").getMethod("doOperation", new String[] {"I"});
775
776	// search method declaration in workspace scope
777	IJavaSearchScope scope = SearchEngine.createJavaSearchScope(new IJavaElement[] {p2});
778	JavaSearchResultCollector resultCollector = new JavaSearchResultCollector();
779	resultCollector.showProject = true;
780	search(
781	method,
782	UI_DECLARATIONS,
783	scope,
784	resultCollector);
785	assertSearchResults(
786	"Unexpected declarations of method test.Declaration_bis.doOperation(int)",
787	"pack/Declaration.java [in P1] void pack.Declaration.doOperation(int) [doOperation]\n" +
788	"pack/Interface.java [in P1] void pack.Interface.doOperation(int) [doOperation]\n" +
789	"test/Declaration_bis.java [in P2] void test.Declaration_bis.doOperation(int) [doOperation]",
790	resultCollector);
791	} finally {
792	deleteProject("P1");
793	deleteProject("P2");
794	}
795	}
667	}	796	}