Attachment #38084 for bug #86293

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

Lines 2314-2323 Link Here

(-)search/org/eclipse/jdt/internal/core/search/matching/MatchLocator.java (-3 / +4 lines)
2314	enclosingElement = ((IType) parent).getType(new String(type.name));	2314	enclosingElement = ((IType) parent).getType(new String(type.name));
2315	} else if (enclosingElement instanceof IMember) {	2315	} else if (enclosingElement instanceof IMember) {
2316	IMember member = (IMember) parent;	2316	IMember member = (IMember) parent;
2317	if (member.isBinary())	2317	if (member.isBinary()) {
2318	enclosingElement = parent;	2318	enclosingElement = this.currentPossibleMatch.openable.getClassFile().getType();
2319	else	2319	} else {
2320	enclosingElement = member.getType(new String(type.name), occurrenceCount);	2320	enclosingElement = member.getType(new String(type.name), occurrenceCount);
		2321	}
2321	}	2322	}
2322	if (enclosingElement == null) return;	2323	if (enclosingElement == null) return;
2323	boolean enclosesElement = encloses(enclosingElement);	2324	boolean enclosesElement = encloses(enclosingElement);

Lines 52-58 Link Here

(-)buildnotes_jdt-core.html (-1 / +3 lines)
52	What's new in this drop</h2>	52	What's new in this drop</h2>
53		53
54	<h3>Problem Reports Fixed</h3>	54	<h3>Problem Reports Fixed</h3>
55	<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=135292">135292</a>	55	<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=86293">86293</a>
		56	[search] Search for method declaration with pattern "run()" reports match in binary field instead of anonymous class
		57	<br><a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=135292">135292</a>
56	[compiler] NPE in ProblemReporter.invalidField plus .log swamping	58	[compiler] NPE in ProblemReporter.invalidField plus .log swamping
57	<br><a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=135217">135217</a>	59	<br><a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=135217">135217</a>
58	Compiler class constructor change in 3.2	60	Compiler class constructor change in 3.2




		"src/b86642/B.java void b86642.B.f(A) [A] EXACT_MATCH"
	);
}
/**
 * Bug 86293: [search] Search for method declaration with pattern "run()" reports match in binary field instead of anonymous class
 * @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=86293"
 */
public void testBug86293() throws CoreException {
    IType type = getClassFile("JavaSearchBugs", "lib/b86293.jar", "", "I86293.class").getType();
	IMethod method = type.getMethod("m86293", new String[0]);
	search(method, DECLARATIONS);
	assertSearchResults(
		"lib/b86293.jar void <anonymous>.m86293() EXACT_MATCH\n" + 
		"lib/b86293.jar void I86293.m86293() EXACT_MATCH"
	);
}

/**
 * Bug 86380: [1.5][search][annot] Add support to find references inside annotations on a package declaration

Lines 1097-1103 Link Here

(-)src/org/eclipse/jdt/core/tests/model/JavaSearchTests.java (-2 / +2 lines)
1097	getJavaSearchScope(),	1097	getJavaSearchScope(),
1098	this.resultCollector);	1098	this.resultCollector);
1099	assertSearchResults(	1099	assertSearchResults(
1100	"test48725.jar void p.X.foo()",	1100	"test48725.jar int p.<anonymous>.bar()",
1101	this.resultCollector);	1101	this.resultCollector);
1102	}	1102	}
1103	/**	1103	/**
Lines 2152-2158 Link Here
2152	scope,	2152	scope,
2153	this.resultCollector);	2153	this.resultCollector);
2154	assertSearchResults(	2154	assertSearchResults(
2155	"test20631.jar void X.foo()",	2155	"test20631.jar Y",
2156	this.resultCollector);	2156	this.resultCollector);
2157	}	2157	}
2158	/**	2158	/**

Lines 4-9 Link Here

(-)workspace/JavaSearchBugs/.classpath (+1 lines)
4	<classpathentry kind="var" path="JCL_LIB" sourcepath="JCL_SRC" rootpath="JCL_SRCROOT"/>	4	<classpathentry kind="var" path="JCL_LIB" sourcepath="JCL_SRC" rootpath="JCL_SRCROOT"/>
5	<classpathentry kind="lib" path="lib/test81556.jar" sourcepath="/JavaSearchBugs/lib/test81556.jar" rootpath=""/>	5	<classpathentry kind="lib" path="lib/test81556.jar" sourcepath="/JavaSearchBugs/lib/test81556.jar" rootpath=""/>
6	<classpathentry kind="lib" path="lib/test75816.jar" sourcepath="/JavaSearchBugs/lib/test75816.jar" rootpath=""/>	6	<classpathentry kind="lib" path="lib/test75816.jar" sourcepath="/JavaSearchBugs/lib/test75816.jar" rootpath=""/>
		7	<classpathentry kind="lib" path="lib/b86293.jar"/>
7	<classpathentry kind="lib" path="lib/b87627.jar" sourcepath="/JavaSearchBugs/lib/b87627.jar" rootpath=""/>	8	<classpathentry kind="lib" path="lib/b87627.jar" sourcepath="/JavaSearchBugs/lib/b87627.jar" rootpath=""/>
8	<classpathentry kind="lib" path="lib/b110422.jar" sourcepath="" rootpath=""/>	9	<classpathentry kind="lib" path="lib/b110422.jar" sourcepath="" rootpath=""/>
9	<classpathentry kind="lib" path="lib/b124469.jar" sourcepath="/JavaSearchBugs/lib/b124469.jar" rootpath=""/>	10	<classpathentry kind="lib" path="lib/b124469.jar" sourcepath="/JavaSearchBugs/lib/b124469.jar" rootpath=""/>

Added Link Here

(-)workspace/JavaSearchBugs/lib/b86293.jar (+9 lines)
1	PKós4META-INF/MANIFEST.MFþÊóMÌËLK-.Ñ
2	K-*ÎÌÏ³R0Ô3àåâåPK²îPK.s4I86293.class;õo×>CNv&F6O3#KcvF?¬Ä²DýÄ¼t}ÿ¤¬Ôä t.X?YC3?+8¿´(9Õ-3'?¢U¤?¨?&±2°?Xì@?PKbÓdtPKûr4I86293.java+(MÊÉLVÈÌ+I-JKLNUð´03²4V¨æåâ,Èåg¦(ä54y¹jy¹PK°
3	m06PK.s4C86293$1.classM?MOÂ@ß¥B©RñûãÈ??D@Ñx!?T=h¸/eKÊ6iÿË1ñàðGg=ÌfæÙ÷?ÝïÏ/=:(0ýËó«zÏ?ÍàÏù+ïD\M;Oã¹3EâÐh(Éf2wÉ¬l×Än¤Ù-C¥±Í='¢MJ.,T=á3X
4	-¨RÇåb,>C-C?x"u?C[?dpõzä"ßÇ}I(î¥VVV3ýo¨HOSAþê?
5	£8jú ²Y<qpB}VtiMbÌ÷õ¶ô?2\¢ÊúTkâ¶ÚïðZØz3mÍÌ?vP£Ì£\Óì¾?ïÒ65Å¹hõÏÈr£}£:À¡iÇÌ-HyD§?càPK4\|ª6ËPK.s4C86293.class5OËJÃ@=Ó¤MmZßîmZ(JÅM@(](tÔ)1?$õ¿\ àøQâ?$ÎÀ½÷s?¿ß¦8²Ð`hyçó³Á]W1Eò4¹
6	×2*?JÆ+¶¿,óTq©U\1ÃQÀ`zéJÚ0àpXh[Ø¢ìªéÉÔGOó.3ô+z1
7	:`p4Ñbèù7Pf÷"%)~8Ò¸&ÍâYåzïû.Ýd¼VZvúTÀÀI"3/y.sÓ4nfôidÑ²d;<ýñìñøÝwôßl`l·n`vÉïâUv±WæíöämÒ8ôüPKBÎ·qPK)s4C86293.java+(MÊÉLVHÎI,.Vp¶03²4V¨æåâ,{BDÒ2SsRlòRË¡B`e0ueù)
8	¹pZ T5/?PKä9b×CaPKós4²îMETA-INF/MANIFEST.MFþÊPK.s4bÓdtaI86293.classPKûr4°
9	m06ÿI86293.javaPK.s44\|ª6ËhC86293$1.classPK.s4BÎ·qÚC86293.classPK)s4ä9b×Ca&C86293.javaPKh¢

Return to bug 86293

Lines 2444-2449 Link Here

(-)src/org/eclipse/jdt/core/tests/model/JavaSearchBugsTests.java (+13 lines)
2444	"src/b86642/B.java void b86642.B.f(A) [A] EXACT_MATCH"	2444	"src/b86642/B.java void b86642.B.f(A) [A] EXACT_MATCH"
2445	);	2445	);
2446	}	2446	}
		2447	/**
		2448	* Bug 86293: [search] Search for method declaration with pattern "run()" reports match in binary field instead of anonymous class
		2449	* @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=86293"
		2450	*/
		2451	public void testBug86293() throws CoreException {
		2452	IType type = getClassFile("JavaSearchBugs", "lib/b86293.jar", "", "I86293.class").getType();
		2453	IMethod method = type.getMethod("m86293", new String[0]);
		2454	search(method, DECLARATIONS);
		2455	assertSearchResults(
		2456	"lib/b86293.jar void <anonymous>.m86293() EXACT_MATCH\n" +
		2457	"lib/b86293.jar void I86293.m86293() EXACT_MATCH"
		2458	);
		2459	}
2447		2460
2448	/**	2461	/**
2449	* Bug 86380: [1.5][search][annot] Add support to find references inside annotations on a package declaration	2462	* Bug 86380: [1.5][search][annot] Add support to find references inside annotations on a package declaration