Attachment #45462 for bug #148243

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




	private IFile file;
	protected byte[] byteContents;
	protected char[] charContents;
	private boolean firstLevel = false;
	
	public JavaSearchDocument(String documentPath, SearchParticipant participant) {
		super(documentPath, participant);
	}
	public JavaSearchDocument(java.util.zip.ZipEntry zipEntry, IPath zipFilePath, byte[] contents, SearchParticipant participant, boolean firstLevel) {
		super(zipFilePath + IJavaSearchScope.JAR_FILE_ENTRY_SEPARATOR + zipEntry.getName(), participant);
		this.byteContents = contents;
		this.firstLevel = firstLevel;
	}

	public byte[] getByteContents() {

			this.file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(getPath()));
		return this.file;
	}

	/**
	 * @return the nestedLevel
	 */
	public boolean getFirstLevel() {
		return this.firstLevel;
	}
	public String toString() {
		return "SearchDocument for " + getPath(); //$NON-NLS-1$
	}




import java.io.File;
import java.io.IOException;
import java.net.URI;
import java.util.*;
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;


					return false;
				}

				ArrayList entries = new ArrayList(zip.size());
				for (Enumeration e = zip.entries(); e.hasMoreElements();) {
					ZipEntry ze = (ZipEntry) e.nextElement();
					if (Util.isClassFileName(ze.getName())) {
						entries.add(ze);
					}
				}
				Collections.sort(entries, new Comparator() {
					public int compare(Object o1, Object o2) {
						String n1 = ((ZipEntry)o1).getName();
						String n2 = ((ZipEntry)o2).getName();
						return n2.compareTo(n1);
					}
				});
				for (int i=0, size=entries.size(); i<size; i++) {
					if (this.isCancelled) {
						if (JobManager.VERBOSE)
							org.eclipse.jdt.internal.core.util.Util.verbose("-> indexing of " + zip.getName() + " has been cancelled"); //$NON-NLS-1$ //$NON-NLS-2$
						return false;
					}
					
					// Compute entry nested level
					ZipEntry ze = (ZipEntry) entries.get(i);
					String entryClassName = ze.getName();
					String entryName = entryClassName.substring(0, entryClassName.length()-6); // remove extension '.class'
					boolean firstLevel = true;
					int idx = entryClassName.lastIndexOf('$');
					if (idx > 0 && i >= 2) {
						// try to find enclosing type in previous Zip entries
						String previousName = ((ZipEntry) entries.get(i-1)).getName();
						if (entryName.regionMatches(0, previousName, 0, previousName.length()-6)) {
							idx = entryName.lastIndexOf('$', idx-1);
							if (idx > 0) {
								previousName = ((ZipEntry) entries.get(i-2)).getName();
								firstLevel = !entryName.regionMatches(0, previousName, 0, previousName.length()-6);
							}
						}
					}

					// Index entry
					final byte[] classFileBytes = org.eclipse.jdt.internal.compiler.util.Util.getZipEntryByteContent(ze, zip);
					JavaSearchDocument entryDocument = new JavaSearchDocument(ze, zipFilePath, classFileBytes, participant, firstLevel);
					this.manager.indexDocument(entryDocument, participant, index, this.containerPath);
				}
				this.manager.saveIndex(index);
				if (JobManager.VERBOSE)




import org.eclipse.jdt.internal.compiler.lookup.TagBits;
import org.eclipse.jdt.internal.compiler.lookup.TypeConstants;
import org.eclipse.jdt.internal.compiler.util.SuffixConstants;
import org.eclipse.jdt.internal.core.search.JavaSearchDocument;

public class BinaryIndexer extends AbstractIndexer implements SuffixConstants {
	private static final char[] BYTE = "byte".toCharArray(); //$NON-NLS-1$

				packageName = CharOperation.NO_CHAR;
				name = className;
			}
//			char[][] enclosingTypeName = null;
			char[][] enclosingTypeNames = null;
			boolean isNestedType = reader.isNestedType();
			if (isNestedType) {
				if (reader.isAnonymous()) {

					name = reader.getInnerSourceName();
				}
				if (reader.isLocal() || reader.isAnonymous()) {
//					enclosingTypeName = ONE_ZERO;
					enclosingTypeNames = ONE_ZERO_CHAR;
				} else {
					char[] fullEnclosingName = reader.getEnclosingTypeName();
					int nameLength = fullEnclosingName.length - packageNameIndex - 1;

						// See PR 1GIR345: ITPJCORE:ALL - Indexer: NegativeArraySizeException
						return;
					}
					if (((JavaSearchDocument)this.document).getFirstLevel()) {
						enclosingTypeNames = new char[1][nameLength]; 
						System.arraycopy(fullEnclosingName, packageNameIndex + 1, enclosingTypeNames[0], 0, nameLength);
					} else {
						enclosingTypeNames = CharOperation.splitOn('$', fullEnclosingName, packageNameIndex+1, fullEnclosingName.length);
					}
				}
			}
			// type parameters

			if (name == null) return;
			
			char[][] superinterfaces = replace('/', '.', reader.getInterfaceNames());
//			char[][] enclosingTypeNames = enclosingTypeName == null ? null : new char[][] {enclosingTypeName};
			int modifiers = reader.getModifiers();
			switch (TypeDeclaration.kind(modifiers)) {
				case TypeDeclaration.CLASS_DECL :




		}
	}
	public static class SearchTypeNameRequestor extends TypeNameRequestor {
		public SearchTypeNameRequestor() {
		}
		public SearchTypeNameRequestor(char enclosingSeparator) {
			this.enclosingSeparator = enclosingSeparator;
		}
		Vector results = new Vector();
		private char enclosingSeparator = '$';
		public void acceptType(int modifiers, char[] packageName, char[] simpleTypeName, char[][] enclosingTypeNames, String path) {
			char[] typeName = 
				CharOperation.concat(
					CharOperation.concatWith(enclosingTypeNames, this.enclosingSeparator), 
					simpleTypeName,
					this.enclosingSeparator);
			results.addElement(new String(CharOperation.concat(packageName, typeName, '.')));
		}
		public String toString(){




		removeLibraryEntry(JAVA_PROJECT, new Path("/JavaSearchBugs/lib/b148215.jar"));
	}
}

/**
 * Bug 148243: [search] correct results are missing in java search
 * @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=148243"
 */
public void testBug148243_Valid() throws CoreException {
	addLibraryEntry(JAVA_PROJECT, "/JavaSearchBugs/lib/b148243.jar", false);
	try {
		TypeNameRequestor requestor =  new SearchTests.SearchTypeNameRequestor('#'/*specific enclosing type names separator*/);
		new SearchEngine().searchAllTypeNames(
			null,
			SearchPattern.R_PATTERN_MATCH, // case insensitive
			"Inner3".toCharArray(),
			SearchPattern.R_PATTERN_MATCH, // case insensitive
			TYPE,
			getJavaSearchScopeBugs(),
			requestor,
			IJavaSearchConstants.WAIT_UNTIL_READY_TO_SEARCH,
			null
		);
		new SearchEngine().searchAllTypeNames(
			null,
			SearchPattern.R_PATTERN_MATCH, // case insensitive
			"LI*".toCharArray(),
			SearchPattern.R_PATTERN_MATCH+SearchPattern.R_CASE_SENSITIVE,
			TYPE,
			getJavaSearchScopeBugs(),
			requestor,
			IJavaSearchConstants.WAIT_UNTIL_READY_TO_SEARCH,
			null
		);
		assertSearchResults(
			"Unexpected all type names",
			"pack.A#Inner1#Inner2#Inner3\n" +
			"test4.I#LI\n" +
			"test4.I$J#LIJ\n" +
			"test4.I$J$K#LIJK",
			requestor);
	}
	finally {
		removeLibraryEntry(JAVA_PROJECT, new Path("/JavaSearchBugs/lib/b148243.jar"));
	}
}
public void testBug148243_Invalid() throws CoreException {
	addLibraryEntry(JAVA_PROJECT, "/JavaSearchBugs/lib/b148243.jar", false);
	try {
		TypeNameRequestor requestor =  new SearchTests.SearchTypeNameRequestor('#'/*specific enclosing type names separator*/);
		new SearchEngine().searchAllTypeNames(
			null,
			SearchPattern.R_PATTERN_MATCH, // case insensitive
			"Member3".toCharArray(),
			SearchPattern.R_PATTERN_MATCH, // case insensitive
			TYPE,
			getJavaSearchScopeBugs(),
			requestor,
			IJavaSearchConstants.WAIT_UNTIL_READY_TO_SEARCH,
			null
		);
		new SearchEngine().searchAllTypeNames(
			null,
			SearchPattern.R_PATTERN_MATCH, // case insensitive
			"D3".toCharArray(),
			SearchPattern.R_PATTERN_MATCH, // case insensitive
			TYPE,
			getJavaSearchScopeBugs(),
			requestor,
			IJavaSearchConstants.WAIT_UNTIL_READY_TO_SEARCH,
			null
		);
		new SearchEngine().searchAllTypeNames(
			null,
			SearchPattern.R_PATTERN_MATCH, // case insensitive
			"H3".toCharArray(),
			SearchPattern.R_PATTERN_MATCH, // case insensitive
			TYPE,
			getJavaSearchScopeBugs(),
			requestor,
			IJavaSearchConstants.WAIT_UNTIL_READY_TO_SEARCH,
			null
		);
		assertSearchResults(
			"Unexpected all type names",
			"test1.X#Y#Z#Member1#Member2#Member3\n" +
			"test2.B#C#D1#D2#D3\n" + 
			"test3.E#F#G#H1#H2#H3",
			requestor);
		// correct result should be:
		//	"test1.X$Y$Z#Member1#Member2#Member3\n" +
		//	"test2.B$C#D1#D2#D3\n" + 
		//	"test3.E#F$G#H1#H2#H3",
	}
	finally {
		removeLibraryEntry(JAVA_PROJECT, new Path("/JavaSearchBugs/lib/b148243.jar"));
	}
}
}

Added Link Here

(-)workspace/JavaSearchBugs/lib/b148243.jar (+50 lines)
1	PK4Û4META-INF/MANIFEST.MFþÊóMÌËLK-.Ñ
2	K-ÎÌÏ³R0Ô3àåâåPK²îPKSÚ4!pack/A$Inner1$Inner2$Inner3.class}OMKÃ@}Ó¦YS[kýªx<¨Ú£" =(½oâ¢[Ó?$©ÿ«'Á?À%N+â.¼÷æÍììÌÇçÛ;>z5ÂÞ³üÑá1TtZÑPÀ"´§òEú±4þM8UQN°ÏµÑù¡~t<!Xãä^¹¨ÃñÐMhÚ¨ëù,Té?cEèI$ãLuVþ¨3Â~ðÏg÷6§ºÔÅ{Ô/æ!xe~Ë,S@ÐüÕF ËÕÅbinº}·,ùCDq//Æ(8òËh¼beÁ¢Ñ.M?UF¯`nùµ[h3÷¸é:6° [¬vÕ./PKn²ÏPKSÚ4pack/A$Inner1$Inner2.classmOMKÃ@×¦YSûaZOë¡Áö¨¥ AJï¸èÖ¸$õy<ôø£ÄÄîÂÌ¼y³ïûçk`?@?Ð{Ñ?=¹1F¥ç?,B{!ß¥KóäßåûR?_ê§Ã9Á%?ÊElB+ÐFÝ._C>È0Vn?D2ËTõiåÏ:#ôMo_ÜûdFêZa{:>BðÊþ,Y¦2?.¡ùï¼@?ÓÅ¢2×G: mz°¢É:9Á1x@xó`+¿¬?ÆÙ'¶>XÔà2Ú¥icÑ«ÌÍ²¿Sbmæ_ÚÁ.öàpª>ó>«C8¿PKyoPKSÚ4pack/A$Inner1.classUNMOÂ@¥¥µ\|UÔ³ñ@W !!1!zÐpßÖ?.Ô-iÿË?Êø¶»É¼yoæíÎþïçÀWjÖVÄpvó µÌF,Bw->Eý>Ek{¢´¦úí`E°æé«ôPë£ÐY-wÌ^DHB°Lc¬D¦LZÅ»Ê?ûäÓ{÷î²X.qÙ³¡I@ðK}<¹¥jÉ1ï¡òZUÆGË×àØ0ør\F»°ì?ÆÝ7_Ljðíj3FÿÀ}´J½]b]®3BçpÑgv ÷PKÊ½+ó[PKSÚ4pack/A.class-ÁjÂ@ÿÑhÆj_ Ðz0ô\D %÷MºÔÕ¸$ö½zzèô¡J'î²ÿÌ?ß,3?¿_ßfxtÐ ØW¥08¤B¿»ø$ñ\iU.Íñ$"X«ìMºh¢ã¡àJËííËü âTa4¹ªüÑ*?ª ´ÃzÚ+ÁÝg·<kUa{9«F¼?Ö2_¥¢(dá`HèÕ?
3	xáÖ:Áx'Tøò.¬»Àx 5½£ýÉI.«mº¬^ÝÀ±gxß¨?GÙ¿:PK#+5wâ)PK-?Ú4pack/A.java+HLÎNLOU(ÒÖ¼\ XP¬?X\¬à¨PÍËÅ .I,?Ëxæå¥¥qËAäq+0¨ ?PK¹ï¥¬EPK¢Û4)test1/X$Y$Z$Member1$Member2$Member3.class?PMKÃ@}Ó¦YF[[?ëI ±GÅKA¢¢Þ6qÑ-1?$õy<øüQâ$êAÄ]xïÍ¼avß?^ßø4[Êß»voÜ[÷L=ók>¨y(`ºù$½X&÷ÞE8QQA0?t¢cBsgwL0Fé?²Ñå Ð t¢Î§å+ÆÐÒHÆcé2®Fñ sÂvð?U öe:Í"u¢Ë^»ªÞ/w#8§I¢²Q,ó\å=BÿKö fÖaã?5f¥ßjMð <Ä_Î(8òªhí½`îE6£Y%ÚÎWó\|å/TØAyÀCÑÇ2,¬°Zc&Vë°>PK?GÜÄPK¢Û4!test1/X$Y$Z$Member1$Member2.class}PMKÃ@}Ó¦YFûågÅz0Ä/AzPzÛÄE·ÄÔÿåIðàðGé¼73ofÙ¯ï?O>
4	Âv¡òÂ÷îÜ{÷Á½T/¡Êü?Bw_¥ËäÉ»§æ©NtqFhîLÆ8}T6°´`:?NÔÕ¬q+ÃXúAÉx"3]ÆuÒ(uNØ ¬pB°oÒY©s]öØUÕQ¹Á¹H?cçèÿX%´ÿQKs?OÝ$ì-X¤æÑ¼e]ð \|ÄÆ3
5	¼*ZïXzc§Ñ¬&ÚÎoór¥¯TØAyÈC{`
6	Wõ°Î¼ÁÞ¬PKRIt¼PK¢Û4test1/X$Y$Z$Member1.classmOÁJÃ@}Ó¦YFÛ¦VÔ!½*^
7	õ õ¶n dSÿËàÁð£ÄIîÂ÷f73?¿_ß"ìtãJ*
8	Çà)¸Vo*#0\Èwf2 oJ+}®s]]ºGÇs5+.=ØA¬su³¬=îe)©Ìæ²ÔµnVõª
9	ao}FpïeªK]÷ºMõ´Þà]å¹*g4FÐÿgAëý'
10	îm®[§8ú>Q°
11
12	ôN>±õÁ¤Ñ^%ÑgôZîa»©ï48À?£Ï0ÂvíÁùPKxÜ?ÿyPK¢Û4test1/X$Y$Z.classMNÁJÃ@}Ó¦Y»Mmmý!õ`ÈYé¥ QJQo¸è¸?lêy<ø~8»öÐöÍ¼73Ìûùýú?ãP GuÚuyö?>¦OaºVï«}ÉnËµ®:B\|a¬éþñÉ-g-ÑÇ0Á1aR«o6o¥nïUYkÂ¬h*U¯Tk<ßQ÷ja\ì<'È»fÓVúÒøÔ3ï??\Y«ÛeÓN`Fï¬¦×Ú_Ì b[áìþ{cÌ²À?Áé'ö>¸èA2ÆA0bLþ8?C?àSÎ{üçþPKªH9+ì>PK=Û4test1/X$Y$Z.java+HLÎNLOU(I-.1´æåÁÒ¤ÌdäÄâbH(j^.N¨pqIb \Ö757)µÈ,?G?DÆPµ D1PK-j¬MPK¢Û4
13	test2/B.class-MËÁP=S}P??°ÃBÃX?X5,ýmÝp¥Ú¤nýÄÂø(1Î$gæ3óù¾Þ&è:07=õLB÷"îÂ?Erò·áEF`ÏU¢ôPs¥-X° ^ ¹É¯¡Ìö"%¡¤"S¯DSÕ?Ðª¸ÁÝ¥yÉµ*\|{9.²Ñ'¡(âæF_rÀ=QðbÀe´KÑ@±õ?àÙ.ß;¥ãýPK
14	¨ÿ¼ðPKdÛ4test2/B.java+HLÎNLOU(I-.1²æå(MÊÉLVHÎI,.VpR¨®ååPK?Úº&%#PK¢Û4test2/B$C$D1$D2$D3.classeOMKÃ@}¦Ù&F[kýêMÈA{0´=L ¥÷M\tKL Iý_þ8EDwáÍÌ{óùþñú`±E6ªnfáyñ4gA<° ¥\|a.ûð:]ª¬!8§ºÐÍ¡sx´ ØQy§<tàúèÂ!ô]¨«Õcªª[æ'e&ó¬´¿I»yÐ5aü\|BðnÊU©mR{,EþeQ¨*Êe]«Z`ÈÌïz?Áýaávy©?SÒÂàS`ñçGaÝÉzÏìXð?Xcô¿Ø®·úF}Ø¹é&¶°
15	;ìí±%ööá~PK?Þ^\|PK¢Û4test2/B$C$D1$D2.class]OMO@}C)D[êwo&´ íQãA Ñ¦÷7º
16	BÔÿåÉÄ?ÀeEcLw73ïÍçç×ûaØÊ¦?A$Q?ÌlÑR¼°åcx-eÞ¬sUªöÐ;>YÌ¸z?.zp<ôaqTòfõÉú^d$Ó*ÅBÔJÇ¿¤Ù>©à§kcÏî]µªsy¥tÞS½Á».KYÇhÙØ3ó¿ØÆÁùcFiàKxµ9A2×âGàS ñçmÂ.úÓ7^Ù1à2ZiaÑûI`»Ùé[1b;á¦>¶±³\|ì±ÝgïÎ7PKs\tyPK¢Û4test2/B$C$D1.classMNMKÃ@¦Ic[ã×YÈA=«âÁAzPzßÄE·Ä²Ûþ/O?J\|tfgæí{o¾>¿ÌpìÃ!DFj¥7IÌg>\Ât)Ö"Eó>KYw¥e® Ó³ÁÍÛgb ÂaR¨FÞ¯ÞJÙ=²¸h+Q/D§¬Þ®yU0.¶w^ÂÇvÕUòVÙO#¶/lÎv×4²Ëk¡µÔ>bBðßIplÞC^¾=-g¶áö_NÉè³J{
17	Ï?0zgâ dôþLì0Fa·¯?{`ÊoÌ°}8`vàPK0Ç8õQPK¢Û4test2/B$C.class=NANÃ@§iÒ¤?Â?zDáJÅ¡©??"8zß¶
18	)»å_?8ðpRT[{Æ¶ìß¯oNBxÈ±uWérð Ó?zWiÌKúPn¸r`¡?v7ÁÙùàçÍ3Ç J0D@ÚðýöäöI5fES©zZÝñÑw¯ÚÆÅþà5!~l¶mÅ·ºvÙÝ'$wÆp×ÊZ¶!f¢ì×æ«à2B~Bg$.¿ÂÒÃO>¤ð½èc,ì$ôýÃ'J¥w$qèPK-}Çå,PK\Û4test2/B$C.java+HLÎNLOU(I-.1²æåÁÒ¤ÌdäÄâb'gj^.N¨`qIb \ÎÅ,]Î"]ÒY"APKAÐE/EPK¢Û4test3/E$F$G$H1$H2$H3.classmOMO@}ÓRV(öËZ¿êA5^VL4½/¸Q¨ÿË?Ê8`ÝMÞ{óffgöãóí=?aXª¢ô=µ/mßµýSÛ÷4Bo.¥ÈôÁ¹ ç* úyÆå¡yx4#hãì^hÂ°ÐNèqª®O¡Êïd(Â È"ÌdWñÒÔÊÇ¸ ÿfÌÛlGjWÅúä¤Z`]¥©ÊÇ,
19	UíýCX¼`mm:¿g¾+°Mèÿ^åjð°~Õ!¾ü7FÁSÇ@ëø+/,0õÚÔÑf´¾Wë\|§Æ.zÌÐÐÇÖa`ÄjyÕ3±ÚñPKëPK¢Û4test3/E$F$G$H1$H2.classeOMO@}C)Å~ûêAR9j¼4=hz_p£4 Pÿ'þq 4ÝMÞ¼÷fvgæûçóÀG:B¯?yá:S{fßØÞØö.t¨îB¼ 'É³s,dX´«(kBãätNP'é4Ña¡ ?Ðñ£DÞ-_= ¾",*umªÅKþZãKù?.³PÎ¢²RS¬Û$Ù$y.s}BëÏcC^<]eíÚÿðáZ{ÛsË´cð/(ñåÝuVN¥?æÙ6Þ(0µ£UsU¾]a]#¨èa-Øf¶ËíqÜgvãPKc¾íPK¢Û4test3/E$F$G$H1.classUO»NÃ@uvLw:$@?Ph¢ YPÒÍ .2¶d;üÀG!öL
20	r'ÍìÎÎÞî}ÿ\|~a(`ºµªêhÎÂp>° ý¥\|Q&óçè>Yª´&8W:×õ5¡urº ØâIyhÁõÑCèÅ:Ww«×D?2Éa©Ì²Ô&_vý¢+oN½$xÅªLÕL3=7+üÛ<Wå$U¥*?¡ó¯S` Ö¯ÆÁ28$#ÂùØÔÆ8;añåågQí³l½s`ÁctÑFÑÿ30o7õn=ôühìÁeW}æàþPKËgrPK¢Û4test3/E$F$G.classMN»NÃ@µvæU#¹
21	,(M$
22	Pú³9ÁEÆlÿJDÁðQõ"wÒìÌîÜíüü~}Hp&`újÚx-¢;0^Ë²\|?³µÊ[;Ñ¥n§ûârEpfÕòaÃÐK¥ºT÷LÕÏ2+!L«\+YëNïNû¦Â Ý[yKðªM?«î<îüºÛOîËRÕ³B6?jBØ=ã&ë a¸÷S´LÖ2Á9Ø?î_È(XÅF½«OlXð]Ó´Ñgþ
23	\f>48ÂkÈp#x8fv
24	ïPKÅ öKPK¢Û4
25	test3/E.class-ÁJÃ@ÿIÓ¬I£ÕzPñhñRÚ"=(½oâ [â²[ßËàÁð¡ÄI]öùÿeæ÷ïûÀ5NòìüM¶T þÐY¥íköXl¹ôhn¬ñwÁùÅ.êN0@b0Î?åÝ{ÁÍ³.*&LóºÔÕF7¦Õ½ú7ãqÞ?»%$Oõ®)yeÚz´¼jgÒ{k¹YTÚ9v
26	SÂ¨ÿ2[ÍÖ²g?í!¹²PÊ:
27	/¿pð)IDuf0Ý7H<ì¼£cL$&R;wøPK© _ã&PKÛ4test3/E.java+HLÎNLOU(I-.1¶æå*(MÊÉLVHÎI,.VpU¨æåâ
28	$ÀeÜTÜÁrX%=!rØ%? Øe?a²µ`
29	L "PKfsJ®PK3Û4test4/I$J$LIJ.classUNÍJÃ@¯I&¦öG_@èA=oJ/!%ÔÒû&.º%n »õ½< \|Júí*îÂ\|ßÌÎ°óóûõ
30	à§1z¡ÆÞäÅl9+e?0Þw7B¿äÕFÖÝ)ì_¬ á¢})$ú£Ri¹Ú¾U²{U# Ó²E³?rü_í«2Î}ðé-!}l·]-ïs
31	X¿rY¡µì?0FSB²?rã¼ÀâËmcf¹ç@ÿò^zH#/8bÌþ<þýØãc©?OpdPKDæ2PK3Û4test4/I$J.class=ÁJÃ@ÿIÓ¤IS[k_ Ðz0Þ,^
32	BJÐÒû&tKÜ@vë{y<ø}(q¥»ì7óÿ3ËÌáçëÀ5f!<BäØº4[¬CøÉN½«´Ræ%},v\:B°ÔF»;BïübCðWõcô%è# smøaÿVpó¬ Ó¼.UµQ?nõ¿é»Wm Ãü8ð?Õû¦ä{ÝvÄ»jçÌnV²m)atü¶È³µ,#Ä =$W¶¢ÒNýËO>$ñÎô0&
33	G?wÒqÄXj§òÎýPK2ïºóç.PK-Û4test4/I$J.java+HLÎNLOU(I-.1±æå*(MÊÉLVHÎI,.VðTñR¨æåâ
34	$Àå\|<?rµ¼\@PKÃ`"27DPK3Û4test4/I$J$K$LIJK.class]NANÃ0mÒº?Â?rDHÜ¨¸TBJÁÔ»,p)vù'$<G!ÖÂf=3»ëùüzÿpÃÂÔ)ë.2_æ«¼«1«ù"VÇâ¶Þ¨Æ¹6Ú]¢ã5!^tJ Â(Ã aRi£n¶ÏµêïeÝÂ¬êÙ®e¯=ÿc÷¤÷þÿ{IwÝ¶oÔµö?"Xg>!+?Qý¢Ö*bFÿç~ÀéàñåT)³"p`xú?W~ F3f?
35	\w¿p)WÆ÷qÑ7PK«ÙºÞé=PK3Û4test4/I$J$K.classMNANÃ0MÓº)- å?¸?¸TBJÁÔ»,p)vù'$<G!ÖC½òg¼^Ï÷Ïç¥c§¬»,Ê\|¯RÄÙF¾É¢æ¹¸¯7ªqäZínÓ5!^tOJ`Q!Â´ÒFÝm_kÕ?ÊºUyÕ5²]Ë^{ýoÆîE[Â¤Úùò ºmß¨[í{DpÏ}BV£úE+U6ÅÃí<Í«r¹â©pN¿S1¦¬ ?áÙöÞùA0&Á0fÌþ'ÁÛ8ÅYðÝïC~PK©ê8PKÛ4test4/I$J$K.java+HLÎNLOU(I-.1±æå(MÊÉLVHÎI,.VðTñRñV¨æåâ
36	$Àe}<½µ¼\@PK'´Øî:GPK3Û4test4/I$LI.classENËJÄ@¬N²7F÷¡? xPÁa`Ð²÷It8?Ì¬ÿåIðàøQbg\Øn¨îê®¦úç÷ëÀB×<UR #L×ú]Wv/ÕC½6M äël¸%¤gç+B¶ìM?ã#ä²ÎÜoÞjÓ?éº5¹êÝ®to¾fáÕzB©v7ìÿØmúÆÜÙAËËÁEÒ9Ó/[í½ñsØ^%qþC'Á(U£Oì}p `Ìã0Å>cù/àz÷'r-âùGÿPKb¥ôâ'PK3Û4
37	test4/I.class-NÁJÃ@}¦Y£? xPÁÒKAXXÚ¥÷M\tKÜ@vëy<ø~8I3Ã¼÷fß¿ïw8"î)¦;ý¡Z»×b]îLÉ£u6,£«ë-!^6/&Ãi1ÂDYgVû÷Ò´]Ö0SM¥ënmÇ1oÖR5{ dÏÍ¾Ìíú¼ínréiµöÞx?Ï
38	+J"%qþ?;Á(=Æ7_8úä"BÆôbcÆü0Àù¤×N{`Ê9ãÞÇé?PK/
39	Má$PK/Û4test4/I.java+HLÎNLOU(I-.1±æå*(MÊÉLVHÎI,.VðT¨æåâ
40	$Àe\|Rµ¼\@PK¬`=4APK-?Ú4
41	.classpath³±¯ÈÍQ(K-*ÎÌÏ³U2Ô3PRHÍKÎOÉÌK·U
42
43	qÓµP²·ãå²IÎI,..H,Ér8¼Ô¼¢JìÌ¼[¥â¢d%? >neÉùy0eùEéz©É9Å©zY)%z9¥yÉ@«õ¼\ã?ýýB=ý\ð_ZRPZb¯?>²cPK¡Ô#XâPK-?Ú4.projectuPAÂ <kâLïÕ<`=hüz66
44	MÍB?Ï(jjâmgvfg]»\|Zeô>ËÉ:[F]ï³Ûõ¼Úer1g=;?¨zçÕ?1Í;(«¼ØmíÝ¢`42a%L×?v%£ï)°é?NP5¨V^z%xôV®edRÁhUo?4ÒaÐüÁ£ð[Á;8ÖCÈ¶ Ó)ÁèoJbÞ5\|¤zÿûP êâ¹ï?Ïs§øPK¥?GÃPK4Û4²îMETA-INF/MANIFEST.MFþÊPKSÚ4n²Ï!apack/A$Inner1$Inner2$Inner3.classPKSÚ4yo¸pack/A$Inner1$Inner2.classPKSÚ4Ê½+ó[pack/A$Inner1.classPKSÚ4#+5wâ)<pack/A.classPK-?Ú4¹ï¥¬EXpack/A.javaPK¢Û4?GÜÄ)Ötest1/X$Y$Z$Member1$Member2$Member3.classPK¢Û4RIt¼!?test1/X$Y$Z$Member1$Member2.classPK¢Û4xÜ?ÿy¡test1/X$Y$Z$Member1.classPK¢Û4ªH9+ì>ç test1/X$Y$Z.classPK=Û4-j¬Mtest1/X$Y$Z.javaPK¢Û4
45	¨ÿ¼ð
46	?test2/B.classPKdÛ4?Úº&%#test2/B.javaPK¢Û4?Þ^\|ótest2/B$C$D1$D2$D3.classPK¢Û4s\ty?test2/B$C$D1$D2.classPK¢Û40Ç8õQtest2/B$C$D1.classPK¢Û4-}Çå,¾test2/B$C.classPK\Û4AÐE/Eàtest2/B$C.javaPK¢Û4ëatest3/E$F$G$H1$H2$H3.classPK¢Û4c¾íÀtest3/E$F$G$H1$H2.classPK¢Û4Ëgrtest3/E$F$G$H1.classPK¢Û4Å öKctest3/E$F$G.classPK¢Û4© _ã&
47	test3/E.classPKÛ4fsJ®¶test3/E.javaPK3Û4Dæ2:test4/I$J$LIJ.classPK3Û42ïºóç.atest4/I$J.classPK-Û4Ã`"27Dtest4/I$J.javaPK3Û4«ÙºÞé=øtest4/I$J$K$LIJK.classPK3Û4©ê8%test4/I$J$K.classPK*Û4'´Øî:GNtest4/I$J$K.javaPK3Û4b¥ôâ'Ætest4/I$LI.classPK3Û4/
48	Má$
49	ætest4/I.classPK/Û4¬`=4A!test4/I.javaPK-?Ú4¡Ô#Xâ
50	p!.classpathPK-?Ú4¥?GÃ3".projectPK##Ñ,#

Return to bug 148243

Lines 26-31 Link Here

(-)search/org/eclipse/jdt/internal/core/search/indexing/BinaryIndexer.java (-5 / +12 lines)
26	import org.eclipse.jdt.internal.compiler.lookup.TagBits;	26	import org.eclipse.jdt.internal.compiler.lookup.TagBits;
27	import org.eclipse.jdt.internal.compiler.lookup.TypeConstants;	27	import org.eclipse.jdt.internal.compiler.lookup.TypeConstants;
28	import org.eclipse.jdt.internal.compiler.util.SuffixConstants;	28	import org.eclipse.jdt.internal.compiler.util.SuffixConstants;
		29	import org.eclipse.jdt.internal.core.search.JavaSearchDocument;
29		30
30	public class BinaryIndexer extends AbstractIndexer implements SuffixConstants {	31	public class BinaryIndexer extends AbstractIndexer implements SuffixConstants {
31	private static final char[] BYTE = "byte".toCharArray(); //$NON-NLS-1$	32	private static final char[] BYTE = "byte".toCharArray(); //$NON-NLS-1$
Lines 633-639 Link Here
633	packageName = CharOperation.NO_CHAR;	634	packageName = CharOperation.NO_CHAR;
634	name = className;	635	name = className;
635	}	636	}
636	char[] enclosingTypeName = null;	637	// char[][] enclosingTypeName = null;
		638	char[][] enclosingTypeNames = null;
637	boolean isNestedType = reader.isNestedType();	639	boolean isNestedType = reader.isNestedType();
638	if (isNestedType) {	640	if (isNestedType) {
639	if (reader.isAnonymous()) {	641	if (reader.isAnonymous()) {
Lines 642-648 Link Here
642	name = reader.getInnerSourceName();	644	name = reader.getInnerSourceName();
643	}	645	}
644	if (reader.isLocal() \|\| reader.isAnonymous()) {	646	if (reader.isLocal() \|\| reader.isAnonymous()) {
645	enclosingTypeName = ONE_ZERO;	647	// enclosingTypeName = ONE_ZERO;
		648	enclosingTypeNames = ONE_ZERO_CHAR;
646	} else {	649	} else {
647	char[] fullEnclosingName = reader.getEnclosingTypeName();	650	char[] fullEnclosingName = reader.getEnclosingTypeName();
648	int nameLength = fullEnclosingName.length - packageNameIndex - 1;	651	int nameLength = fullEnclosingName.length - packageNameIndex - 1;
Lines 650-657 Link Here
650	// See PR 1GIR345: ITPJCORE:ALL - Indexer: NegativeArraySizeException	653	// See PR 1GIR345: ITPJCORE:ALL - Indexer: NegativeArraySizeException
651	return;	654	return;
652	}	655	}
653	enclosingTypeName = new char[nameLength];	656	if (((JavaSearchDocument)this.document).getFirstLevel()) {
654	System.arraycopy(fullEnclosingName, packageNameIndex + 1, enclosingTypeName, 0, nameLength);	657	enclosingTypeNames = new char[1][nameLength];
		658	System.arraycopy(fullEnclosingName, packageNameIndex + 1, enclosingTypeNames[0], 0, nameLength);
		659	} else {
		660	enclosingTypeNames = CharOperation.splitOn('$', fullEnclosingName, packageNameIndex+1, fullEnclosingName.length);
		661	}
655	}	662	}
656	}	663	}
657	// type parameters	664	// type parameters
Lines 666-672 Link Here
666	if (name == null) return;	673	if (name == null) return;
667		674
668	char[][] superinterfaces = replace('/', '.', reader.getInterfaceNames());	675	char[][] superinterfaces = replace('/', '.', reader.getInterfaceNames());
669	char[][] enclosingTypeNames = enclosingTypeName == null ? null : new char[][] {enclosingTypeName};	676	// char[][] enclosingTypeNames = enclosingTypeName == null ? null : new char[][] {enclosingTypeName};
670	int modifiers = reader.getModifiers();	677	int modifiers = reader.getModifiers();
671	switch (TypeDeclaration.kind(modifiers)) {	678	switch (TypeDeclaration.kind(modifiers)) {
672	case TypeDeclaration.CLASS_DECL :	679	case TypeDeclaration.CLASS_DECL :

Lines 74-86 Link Here

(-)src/org/eclipse/jdt/core/tests/model/SearchTests.java (-2 / +8 lines)
74	}	74	}
75	}	75	}
76	public static class SearchTypeNameRequestor extends TypeNameRequestor {	76	public static class SearchTypeNameRequestor extends TypeNameRequestor {
		77	public SearchTypeNameRequestor() {
		78	}
		79	public SearchTypeNameRequestor(char enclosingSeparator) {
		80	this.enclosingSeparator = enclosingSeparator;
		81	}
77	Vector results = new Vector();	82	Vector results = new Vector();
		83	private char enclosingSeparator = '$';
78	public void acceptType(int modifiers, char[] packageName, char[] simpleTypeName, char[][] enclosingTypeNames, String path) {	84	public void acceptType(int modifiers, char[] packageName, char[] simpleTypeName, char[][] enclosingTypeNames, String path) {
79	char[] typeName =	85	char[] typeName =
80	CharOperation.concat(	86	CharOperation.concat(
81	CharOperation.concatWith(enclosingTypeNames, '$'),	87	CharOperation.concatWith(enclosingTypeNames, this.enclosingSeparator),
82	simpleTypeName,	88	simpleTypeName,
83	'$');	89	this.enclosingSeparator);
84	results.addElement(new String(CharOperation.concat(packageName, typeName, '.')));	90	results.addElement(new String(CharOperation.concat(packageName, typeName, '.')));
85	}	91	}
86	public String toString(){	92	public String toString(){

Lines 6794-6797 Link Here

(-)src/org/eclipse/jdt/core/tests/model/JavaSearchBugsTests.java (+95 lines)
6794	removeLibraryEntry(JAVA_PROJECT, new Path("/JavaSearchBugs/lib/b148215.jar"));	6794	removeLibraryEntry(JAVA_PROJECT, new Path("/JavaSearchBugs/lib/b148215.jar"));
6795	}	6795	}
6796	}	6796	}
		6797
		6798	/**
		6799	* Bug 148243: [search] correct results are missing in java search
		6800	* @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=148243"
		6801	*/
		6802	public void testBug148243_Valid() throws CoreException {
		6803	addLibraryEntry(JAVA_PROJECT, "/JavaSearchBugs/lib/b148243.jar", false);
		6804	try {
		6805	TypeNameRequestor requestor = new SearchTests.SearchTypeNameRequestor('#'/specific enclosing type names separator/);
		6806	new SearchEngine().searchAllTypeNames(
		6807	null,
		6808	SearchPattern.R_PATTERN_MATCH, // case insensitive
		6809	"Inner3".toCharArray(),
		6810	SearchPattern.R_PATTERN_MATCH, // case insensitive
		6811	TYPE,
		6812	getJavaSearchScopeBugs(),
		6813	requestor,
		6814	IJavaSearchConstants.WAIT_UNTIL_READY_TO_SEARCH,
		6815	null
		6816	);
		6817	new SearchEngine().searchAllTypeNames(
		6818	null,
		6819	SearchPattern.R_PATTERN_MATCH, // case insensitive
		6820	"LI*".toCharArray(),
		6821	SearchPattern.R_PATTERN_MATCH+SearchPattern.R_CASE_SENSITIVE,
		6822	TYPE,
		6823	getJavaSearchScopeBugs(),
		6824	requestor,
		6825	IJavaSearchConstants.WAIT_UNTIL_READY_TO_SEARCH,
		6826	null
		6827	);
		6828	assertSearchResults(
		6829	"Unexpected all type names",
		6830	"pack.A#Inner1#Inner2#Inner3\n" +
		6831	"test4.I#LI\n" +
		6832	"test4.I$J#LIJ\n" +
		6833	"test4.I$J$K#LIJK",
		6834	requestor);
		6835	}
		6836	finally {
		6837	removeLibraryEntry(JAVA_PROJECT, new Path("/JavaSearchBugs/lib/b148243.jar"));
		6838	}
		6839	}
		6840	public void testBug148243_Invalid() throws CoreException {
		6841	addLibraryEntry(JAVA_PROJECT, "/JavaSearchBugs/lib/b148243.jar", false);
		6842	try {
		6843	TypeNameRequestor requestor = new SearchTests.SearchTypeNameRequestor('#'/specific enclosing type names separator/);
		6844	new SearchEngine().searchAllTypeNames(
		6845	null,
		6846	SearchPattern.R_PATTERN_MATCH, // case insensitive
		6847	"Member3".toCharArray(),
		6848	SearchPattern.R_PATTERN_MATCH, // case insensitive
		6849	TYPE,
		6850	getJavaSearchScopeBugs(),
		6851	requestor,
		6852	IJavaSearchConstants.WAIT_UNTIL_READY_TO_SEARCH,
		6853	null
		6854	);
		6855	new SearchEngine().searchAllTypeNames(
		6856	null,
		6857	SearchPattern.R_PATTERN_MATCH, // case insensitive
		6858	"D3".toCharArray(),
		6859	SearchPattern.R_PATTERN_MATCH, // case insensitive
		6860	TYPE,
6861	getJavaSearchScopeBugs(),
6862	requestor,
6863	IJavaSearchConstants.WAIT_UNTIL_READY_TO_SEARCH,
6864	null
6865	);
6866	new SearchEngine().searchAllTypeNames(
6867	null,
6868	SearchPattern.R_PATTERN_MATCH, // case insensitive
6869	"H3".toCharArray(),
6870	SearchPattern.R_PATTERN_MATCH, // case insensitive
6871	TYPE,
6872	getJavaSearchScopeBugs(),
6873	requestor,
6874	IJavaSearchConstants.WAIT_UNTIL_READY_TO_SEARCH,
6875	null
6876	);
6877	assertSearchResults(
6878	"Unexpected all type names",
6879	"test1.X#Y#Z#Member1#Member2#Member3\n" +
6880	"test2.B#C#D1#D2#D3\n" +
6881	"test3.E#F#G#H1#H2#H3",
6882	requestor);
6883	// correct result should be:
6884	// "test1.X$Y$Z#Member1#Member2#Member3\n" +
6885	// "test2.B$C#D1#D2#D3\n" +
6886	// "test3.E#F$G#H1#H2#H3",
6887	}
6888	finally {
6889	removeLibraryEntry(JAVA_PROJECT, new Path("/JavaSearchBugs/lib/b148243.jar"));
6890	}
6891	}
6797	}	6892	}

Lines 27-39 Link Here

(-)search/org/eclipse/jdt/internal/core/search/JavaSearchDocument.java (-1 / +10 lines)
27	private IFile file;	27	private IFile file;
28	protected byte[] byteContents;	28	protected byte[] byteContents;
29	protected char[] charContents;	29	protected char[] charContents;
		30	private boolean firstLevel = false;
30		31
31	public JavaSearchDocument(String documentPath, SearchParticipant participant) {	32	public JavaSearchDocument(String documentPath, SearchParticipant participant) {
32	super(documentPath, participant);	33	super(documentPath, participant);
33	}	34	}
34	public JavaSearchDocument(java.util.zip.ZipEntry zipEntry, IPath zipFilePath, byte[] contents, SearchParticipant participant) {	35	public JavaSearchDocument(java.util.zip.ZipEntry zipEntry, IPath zipFilePath, byte[] contents, SearchParticipant participant, boolean firstLevel) {
35	super(zipFilePath + IJavaSearchScope.JAR_FILE_ENTRY_SEPARATOR + zipEntry.getName(), participant);	36	super(zipFilePath + IJavaSearchScope.JAR_FILE_ENTRY_SEPARATOR + zipEntry.getName(), participant);
36	this.byteContents = contents;	37	this.byteContents = contents;
		38	this.firstLevel = firstLevel;
37	}	39	}
38		40
39	public byte[] getByteContents() {	41	public byte[] getByteContents() {
Lines 80-85 Link Here
80	this.file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(getPath()));	82	this.file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(getPath()));
81	return this.file;	83	return this.file;
82	}	84	}
		85
		86	/**
		87	* @return the nestedLevel
		88	*/
		89	public boolean getFirstLevel() {
		90	return this.firstLevel;
		91	}
83	public String toString() {	92	public String toString() {
84	return "SearchDocument for " + getPath(); //$NON-NLS-1$	93	return "SearchDocument for " + getPath(); //$NON-NLS-1$
85	}	94	}

Lines 13-19 Link Here

(-)search/org/eclipse/jdt/internal/core/search/indexing/AddJarFileToIndex.java (-8 / +37 lines)
13	import java.io.File;	13	import java.io.File;
14	import java.io.IOException;	14	import java.io.IOException;
15	import java.net.URI;	15	import java.net.URI;
16	import java.util.Enumeration;	16	import java.util.*;
17	import java.util.zip.ZipEntry;	17	import java.util.zip.ZipEntry;
18	import java.util.zip.ZipFile;	18	import java.util.zip.ZipFile;
19		19
Lines 182-201 Link Here
182	return false;	182	return false;
183	}	183	}
184		184
		185	ArrayList entries = new ArrayList(zip.size());
185	for (Enumeration e = zip.entries(); e.hasMoreElements();) {	186	for (Enumeration e = zip.entries(); e.hasMoreElements();) {
		187	ZipEntry ze = (ZipEntry) e.nextElement();
		188	if (Util.isClassFileName(ze.getName())) {
		189	entries.add(ze);
		190	}
		191	}
		192	Collections.sort(entries, new Comparator() {
		193	public int compare(Object o1, Object o2) {
		194	String n1 = ((ZipEntry)o1).getName();
		195	String n2 = ((ZipEntry)o2).getName();
		196	return n2.compareTo(n1);
		197	}
		198	});
		199	for (int i=0, size=entries.size(); i<size; i++) {
186	if (this.isCancelled) {	200	if (this.isCancelled) {
187	if (JobManager.VERBOSE)	201	if (JobManager.VERBOSE)
188	org.eclipse.jdt.internal.core.util.Util.verbose("-> indexing of " + zip.getName() + " has been cancelled"); //$NON-NLS-1$ //$NON-NLS-2$	202	org.eclipse.jdt.internal.core.util.Util.verbose("-> indexing of " + zip.getName() + " has been cancelled"); //$NON-NLS-1$ //$NON-NLS-2$
189	return false;	203	return false;
190	}	204	}
191		205
192	// iterate each entry to index it	206	// Compute entry nested level
193	ZipEntry ze = (ZipEntry) e.nextElement();	207	ZipEntry ze = (ZipEntry) entries.get(i);
194	if (Util.isClassFileName(ze.getName())) {	208	String entryClassName = ze.getName();
195	final byte[] classFileBytes = org.eclipse.jdt.internal.compiler.util.Util.getZipEntryByteContent(ze, zip);	209	String entryName = entryClassName.substring(0, entryClassName.length()-6); // remove extension '.class'
196	JavaSearchDocument entryDocument = new JavaSearchDocument(ze, zipFilePath, classFileBytes, participant);	210	boolean firstLevel = true;
197	this.manager.indexDocument(entryDocument, participant, index, this.containerPath);	211	int idx = entryClassName.lastIndexOf('$');
		212	if (idx > 0 && i >= 2) {
		213	// try to find enclosing type in previous Zip entries
		214	String previousName = ((ZipEntry) entries.get(i-1)).getName();
		215	if (entryName.regionMatches(0, previousName, 0, previousName.length()-6)) {
		216	idx = entryName.lastIndexOf('$', idx-1);
		217	if (idx > 0) {
		218	previousName = ((ZipEntry) entries.get(i-2)).getName();
		219	firstLevel = !entryName.regionMatches(0, previousName, 0, previousName.length()-6);
		220	}
		221	}
198	}	222	}
		223
		224	// Index entry
		225	final byte[] classFileBytes = org.eclipse.jdt.internal.compiler.util.Util.getZipEntryByteContent(ze, zip);
		226	JavaSearchDocument entryDocument = new JavaSearchDocument(ze, zipFilePath, classFileBytes, participant, firstLevel);
		227	this.manager.indexDocument(entryDocument, participant, index, this.containerPath);
199	}	228	}
200	this.manager.saveIndex(index);	229	this.manager.saveIndex(index);
201	if (JobManager.VERBOSE)	230	if (JobManager.VERBOSE)