Attachment 39189 Details for Bug 137984 – Proposed patch

[patch] Proposed patch

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

on 2006-04-21 13:05:32 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Frederic Fusier

Created: 2006-04-21 13:05:32 EDT

Size: 6.64 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.core
>Index: search/org/eclipse/jdt/core/search/SearchPattern.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/search/org/eclipse/jdt/core/search/SearchPattern.java,v
>retrieving revision 1.59
>diff -u -r1.59 SearchPattern.java
>--- search/org/eclipse/jdt/core/search/SearchPattern.java	18 Apr 2006 16:28:18 -0000	1.59
>+++ search/org/eclipse/jdt/core/search/SearchPattern.java	21 Apr 2006 16:48:11 -0000
>@@ -1247,7 +1247,7 @@
> 						typeQualification = CharOperation.subarray(typeErasure, 0, lastDot);
> 						if (!field.isBinary()) {
> 							// prefix with a '*' as the full qualification could be bigger (because of an import)
>-							CharOperation.concat(IIndexConstants.ONE_STAR, typeQualification);
>+							typeQualification = CharOperation.concat(IIndexConstants.ONE_STAR, typeQualification);
> 						}
> 					}
> 				} catch (JavaModelException e) {
>#P org.eclipse.jdt.core.tests.model
>Index: src/org/eclipse/jdt/core/tests/model/JavaSearchBugsTests.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/JavaSearchBugsTests.java,v
>retrieving revision 1.75
>diff -u -r1.75 JavaSearchBugsTests.java
>--- src/org/eclipse/jdt/core/tests/model/JavaSearchBugsTests.java	18 Apr 2006 16:28:01 -0000	1.75
>+++ src/org/eclipse/jdt/core/tests/model/JavaSearchBugsTests.java	21 Apr 2006 16:48:19 -0000
>@@ -6348,4 +6348,51 @@
> 		""+ 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"
>+	);
>+}
> }
>Index: workspace/JavaSearchBugs/.classpath
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/JavaSearchBugs/.classpath,v
>retrieving revision 1.13
>diff -u -r1.13 .classpath
>--- workspace/JavaSearchBugs/.classpath	12 Apr 2006 08:51:37 -0000	1.13
>+++ workspace/JavaSearchBugs/.classpath	21 Apr 2006 16:48:19 -0000
>@@ -12,6 +12,7 @@
> 	<classpathentry kind="lib" path="lib/b125178.jar" sourcepath="" rootpath=""/>
> 	<classpathentry kind="lib" path="lib/b126330.jar"/>
> 	<classpathentry kind="lib" path="lib/b128877.jar" sourcepath="/JavaSearchBugs/lib/b128877.jar" rootpath=""/>
>+	<classpathentry kind="lib" path="lib/b137984.jar"/>
> 	<classpathentry kind="lib" path="lib/JavaSearch15.jar" sourcepath="/JavaSearchBugs/lib/JavaSearch15.jar" rootpath=""/>
> 	<classpathentry sourcepath="lib" kind="lib" path="lib"/>
>     <classpathentry kind="output" path="bin"/>
>Index: workspace/JavaSearchBugs/lib/b137984.jar
>===================================================================
>RCS file: workspace/JavaSearchBugs/lib/b137984.jar
>diff -N workspace/JavaSearchBugs/lib/b137984.jar
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ workspace/JavaSearchBugs/lib/b137984.jar	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,10 @@
>+PK4META-INF/MANIFEST.MFþÊóMÌËLK-.Ñ
>+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
>+},¡æ¡.V4ã$3·óÉô(50u:Ôybë²jwqr¼°ÄmòÆ¼ûé<ÄÊ\?Y£?e&W©.
>+S¸Ø8*âÒò}~[bôJ¶#º¬ðz	kÕ":ßQNÙ÷NN?>á¿³rÐd®Úæ9ª°(Ñ:6È9Ø,õ-lñ
>+ÛØ%Þ#:þ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
>+µ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
>+4CJ.java+(MÊÉLVHÎI,.VpöR¨æåâtö2RH6²°ô½?!<?Ì¼dM°*Îd#[¼Ôr 6#?dMk°1P,ÙH"l®b
>+FÍ = Ã*ÕuBå?!ò Ý(
>+j!PK,¾qm´PK4²îMETA-INF/MANIFEST.MFþÊPK42ùEñaCJ$CJ2$CJ3.classPK4¢J~¾CJ$CJ2.classPK4fæòßmCJ.classPK
>+4,¾qm´·CJ.javaPK)Y
>Index: workspace/JavaSearchBugs/src/b137984/C.java
>===================================================================
>RCS file: workspace/JavaSearchBugs/src/b137984/C.java
>diff -N workspace/JavaSearchBugs/src/b137984/C.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ workspace/JavaSearchBugs/src/b137984/C.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,15 @@
>+package b137984;
>+public class C {
>+	C2 c2;
>+	C2.C3 c3;
>+	C(int c) {
>+		c2 = new C2(c);
>+		c3 = c2.new C3(c);
>+	}
>+	class C2 {
>+		C2(int x) {}
>+		class C3 {
>+			C3(int x) {}
>+		}
>+	}
>+}

Actions: View | Diff

Attachments on bug 137984: 39189