Attachment #39189 for bug #137984

View | Details | Raw Unified | Return to bug 137984
Collapse All | Expand All

Lines 1247-1253 Link Here

(-)search/org/eclipse/jdt/core/search/SearchPattern.java (-1 / +1 lines)
1247	typeQualification = CharOperation.subarray(typeErasure, 0, lastDot);	1247	typeQualification = CharOperation.subarray(typeErasure, 0, lastDot);
1248	if (!field.isBinary()) {	1248	if (!field.isBinary()) {
1249	// prefix with a '*' as the full qualification could be bigger (because of an import)	1249	// prefix with a '*' as the full qualification could be bigger (because of an import)
1250	CharOperation.concat(IIndexConstants.ONE_STAR, typeQualification);	1250	typeQualification = CharOperation.concat(IIndexConstants.ONE_STAR, typeQualification);
1251	}	1251	}
1252	}	1252	}
1253	} catch (JavaModelException e) {	1253	} catch (JavaModelException e) {




		""+ getExternalJCLPathString("1.5") + " java.lang.CloneNotSupportedException EXACT_MATCH"
	);
}
static {
	TESTS_PREFIX = "testBug137984";
}
/**
 * Bug 137984: [search] Field references not found when type is a qualified member type [regression]
 * @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=137984"
 */
public void testBug137984_jar() throws CoreException {
	IType type = getPackageFragment("JavaSearchBugs", "lib/b137984.jar", "").getClassFile("CJ.class").getType();
	IField field = type.getField("c3");
	search(field, REFERENCES);
	assertSearchResults(
		"lib/b137984.jar CJ(int) EXACT_MATCH"
	);
}
public void testBug137984_cu() throws CoreException {
	ICompilationUnit unit = getCompilationUnit("JavaSearchBugs", "src", "b137984", "C.java");
	IField field = unit.getType("C").getField("c3");
	search(field, REFERENCES);
	assertSearchResults(
		"src/b137984/C.java b137984.C(int) [c3] EXACT_MATCH"
	);
}
public void testBug137984_wc() throws CoreException {
	workingCopies = new ICompilationUnit[1];
	workingCopies[0] = getWorkingCopy("/JavaSearchBugs/src/CW.java",
		"public class CW {\n" + 
		"	CW2 c2;\n" + 
		"	CW2.CW3 c3;\n" + 
		"	CW(int c) {\n" + 
		"		c2 = new CW2(c);\n" + 
		"		c3 = c2.new CW3(c);\n" + 
		"	}\n" + 
		"	class CW2 {\n" + 
		"		CW2(int x) {}\n" + 
		"		class CW3 {\n" + 
		"			CW3(int x) {}\n" + 
		"		}\n" + 
		"	}\n" + 
		"}\n"
	);
	IField field = workingCopies[0].getType("CW").getField("c3");
	search(field, REFERENCES);
	assertSearchResults(
		"src/CW.java CW(int) [c3] EXACT_MATCH"
	);
}
}

Lines 12-17 Link Here

(-)workspace/JavaSearchBugs/.classpath (+1 lines)
12	<classpathentry kind="lib" path="lib/b125178.jar" sourcepath="" rootpath=""/>	12	<classpathentry kind="lib" path="lib/b125178.jar" sourcepath="" rootpath=""/>
13	<classpathentry kind="lib" path="lib/b126330.jar"/>	13	<classpathentry kind="lib" path="lib/b126330.jar"/>
14	<classpathentry kind="lib" path="lib/b128877.jar" sourcepath="/JavaSearchBugs/lib/b128877.jar" rootpath=""/>	14	<classpathentry kind="lib" path="lib/b128877.jar" sourcepath="/JavaSearchBugs/lib/b128877.jar" rootpath=""/>
		15	<classpathentry kind="lib" path="lib/b137984.jar"/>
15	<classpathentry kind="lib" path="lib/JavaSearch15.jar" sourcepath="/JavaSearchBugs/lib/JavaSearch15.jar" rootpath=""/>	16	<classpathentry kind="lib" path="lib/JavaSearch15.jar" sourcepath="/JavaSearchBugs/lib/JavaSearch15.jar" rootpath=""/>
16	<classpathentry sourcepath="lib" kind="lib" path="lib"/>	17	<classpathentry sourcepath="lib" kind="lib" path="lib"/>
17	<classpathentry kind="output" path="bin"/>	18	<classpathentry kind="output" path="bin"/>

Added Link Here

(-)workspace/JavaSearchBugs/lib/b137984.jar (+10 lines)
1	PK4META-INF/MANIFEST.MFþÊóMÌËLK-.Ñ
2	K-ÎÌÏ³R0Ô3àåâåPK²îPK4CJ$CJ2$CJ3.classEPMKÃ@Mb¶M£?QkýÄCUÁR{Tz AJï¸è@Ëüþ(ñmªxxóæÍÎîöëûãÀD :§pXÞ\<Q&òÑM2iÍ`×?ªZñÒ\|AÚ¥ÊU=epbx<c°â^¶ÁÐq±Û?UkæPº±Êåõâ)å?H2ÉàÇE²(EKï¤×ãÿx´½Pú¶X©¼RÚÊèL&wç²2QU²âØ¡Ëë{FQàRôÌótTÍ¨8ZÔÛÄ¦0sçäô?àî+MºvãíÀ#ìF.¬Ã¶?MÒl5þ¶©ûÄúØÅ~³§?àPK2ùEñPK4CJ$CJ2.class-OMOÂ@}S?BR«â·ñÀ5£Ë&&4?4ÜÜhI-IÆ¿åÁxðø£o}óæíÌß¯o8táj*j«èÒEULô«î¦:{êÞ?&f<c{öísA5VÑëë$Kf}A½cÁñ?-5}4
3	},¡æ¡.V4ã$3·óÉô(50u:Ôybë²jwqr¼°ÄmòÆ¼ûé<ÄÊ\?Y£?e&W©.
4	S¸Ø8*âÒò}~[bôJ¶#º¬ðz kÕ":ßQNÙ÷NN?>á¿³rÐd®Úæ9ª°(Ñ:6È9Ø,õ-lñ
5	ÛØ%Þ#:þPK¢J~PK4CJ.classEQÙJÃ@=Ó¦¦?ÑØªu©[]ÓúXñ% 4}P*}LãP#1ý/Áü?J<Vpï?»?s2ùùýüp}9?ëéÐfîýgÿ0òãþáeï^)[Á±@±ízÛ®wÜTù9Êi'¬Mq hv«Ñap·Ò@S&JÈÛ?N÷X¨¨Þ,±m5¹WÀ¼&t,c
6	µdb5÷eêFþã£À¬Ýh?gÅ¦?VòUÚÿ²Gè&t¬vË§L®ý^$íAàG? U>*jé]HMéE]W§$?ç¡Ñ]ï@I Y+e?\ÊuræyÍ9?ê¡zA+Á`ä©Ï®Ùs>`:_°ºNíå7Ì1©v?WÌuß±xÃâÊÖ_2È:}½Æ·2 v ¿ÉJu-lg¤{Øa???'µk£Á¨è-üPKfæòßmPK
7	4CJ.java+(MÊÉLVHÎI,.VpöR¨æåâtö2RH6²°ô½?!<?Ì¼dM°*Îd#[¼Ôr 6#?dMk°1P,ÙH"l®b
8	FÍ = Ã*ÕuBå?!ò Ý(
9	j!PK,¾qm´PK4²îMETA-INF/MANIFEST.MFþÊPK42ùEñaCJ$CJ2$CJ3.classPK4¢J~¾CJ$CJ2.classPK4fæòßmCJ.classPK
10	4,¾qm´·CJ.javaPK)Y

Added Link Here

(-)workspace/JavaSearchBugs/src/b137984/C.java (+15 lines)
1	package b137984;
2	public class C {
3	C2 c2;
4	C2.C3 c3;
5	C(int c) {
6	c2 = new C2(c);
7	c3 = c2.new C3(c);
8	}
9	class C2 {
10	C2(int x) {}
11	class C3 {
12	C3(int x) {}
13	}
14	}
15	}

Return to bug 137984

Lines 6348-6351 Link Here

(-)src/org/eclipse/jdt/core/tests/model/JavaSearchBugsTests.java (+47 lines)
6348	""+ getExternalJCLPathString("1.5") + " java.lang.CloneNotSupportedException EXACT_MATCH"	6348	""+ getExternalJCLPathString("1.5") + " java.lang.CloneNotSupportedException EXACT_MATCH"
6349	);	6349	);
6350	}	6350	}
		6351	static {
		6352	TESTS_PREFIX = "testBug137984";
		6353	}
		6354	/**
		6355	* Bug 137984: [search] Field references not found when type is a qualified member type [regression]
		6356	* @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=137984"
		6357	*/
		6358	public void testBug137984_jar() throws CoreException {
		6359	IType type = getPackageFragment("JavaSearchBugs", "lib/b137984.jar", "").getClassFile("CJ.class").getType();
		6360	IField field = type.getField("c3");
		6361	search(field, REFERENCES);
		6362	assertSearchResults(
		6363	"lib/b137984.jar CJ(int) EXACT_MATCH"
		6364	);
		6365	}
		6366	public void testBug137984_cu() throws CoreException {
		6367	ICompilationUnit unit = getCompilationUnit("JavaSearchBugs", "src", "b137984", "C.java");
		6368	IField field = unit.getType("C").getField("c3");
		6369	search(field, REFERENCES);
		6370	assertSearchResults(
		6371	"src/b137984/C.java b137984.C(int) [c3] EXACT_MATCH"
		6372	);
		6373	}
		6374	public void testBug137984_wc() throws CoreException {
		6375	workingCopies = new ICompilationUnit[1];
		6376	workingCopies[0] = getWorkingCopy("/JavaSearchBugs/src/CW.java",
		6377	"public class CW {\n" +
		6378	" CW2 c2;\n" +
		6379	" CW2.CW3 c3;\n" +
		6380	" CW(int c) {\n" +
		6381	" c2 = new CW2(c);\n" +
		6382	" c3 = c2.new CW3(c);\n" +
		6383	" }\n" +
		6384	" class CW2 {\n" +
		6385	" CW2(int x) {}\n" +
		6386	" class CW3 {\n" +
		6387	" CW3(int x) {}\n" +
		6388	" }\n" +
		6389	" }\n" +
		6390	"}\n"
		6391	);
		6392	IField field = workingCopies[0].getType("CW").getField("c3");
		6393	search(field, REFERENCES);
		6394	assertSearchResults(
		6395	"src/CW.java CW(int) [c3] EXACT_MATCH"
		6396	);
		6397	}
6351	}	6398	}