Bug 450057 - Open Element fails to find function for certain wildcard patterns

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/StringMatcher.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2014 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -26,6 +26,7 @@ public class StringMatcher {
 	/* boundary value beyond which we don't need to search in the text */
 	protected int fBound= 0;
 
+
 	protected static final char fSingleWildCard= '\u0000';
 
 	public static class Position {
@@ -42,7 +43,40 @@ public class StringMatcher {
 			return end;
 		}
 	}
+	/**
+	 * StringMatcher constructor takes in a String object that is a simple
+	 * pattern. The pattern may contain '*' for 0 and many characters and
+	 * '?' for exactly one character.
+	 *
+	 * Literal '*' and '?' characters must be escaped in the pattern
+	 * e.g., "\*" means literal "*", etc.
+	 *
+	 * Escaping any other character (including the escape character itself),
+	 * just results in that character in the pattern.
+	 * e.g., "\a" means "a" and "\\" means "\"
+	 *
+	 * If invoking the StringMatcher with string literals in Java, don't forget
+	 * escape characters are represented by "\\".
+	 *
+	 * @param pattern the pattern to match text against
+	 * @param ignoreCase if true, case is ignored
+	 * @param ignoreWildCards if true, wild cards and their escape sequences are ignored
+	 * 		  (everything is taken literally).
+	 */
+	public StringMatcher(String pattern, boolean ignoreCase, boolean ignoreWildCards) {
+		if (pattern == null)
+			throw new IllegalArgumentException();
+		fIgnoreCase= ignoreCase;
+		fIgnoreWildCards= ignoreWildCards;
+		fPattern= pattern;
+		fLength= pattern.length();
 
+		if (fIgnoreWildCards) {
+			parseNoWildCards();
+		} else {
+			parseWildCards();
+		}
+	}
 	/**
 	 * Find the first occurrence of the pattern between <code>start</code)(inclusive)
 	 * and <code>end</code>(exclusive).
@@ -56,9 +90,8 @@ public class StringMatcher {
 	 * Note that for pattern like "*abc*" with leading and trailing stars, position of "abc"
 	 * is returned. For a pattern like"*??*" in text "abcdf", (1,3) is returned
 	 */
-
 	public StringMatcher.Position find(String text, int start, int end) {
-		if (fPattern == null || text == null)
+		if (text == null)
 			throw new IllegalArgumentException();
 
 		int tlen= text.length();
@@ -83,7 +116,8 @@ public class StringMatcher {
 
 		int curPos= start;
 		int matchStart= -1;
-		for (int i= 0; i < segCount && curPos < end; ++i) {
+		int i;
+		for (i= 0; i < segCount && curPos < end; ++i) {
 			String current= fSegments[i];
 			int nextMatch= regExpPosIn(text, curPos, end, current);
 			if (nextMatch < 0 )
@@ -92,63 +126,20 @@ public class StringMatcher {
 				matchStart= nextMatch;
 			curPos= nextMatch + current.length();
 		}
+		if (i < segCount)
+			return null;
 		return new Position(matchStart, curPos);
 	}
 	/**
-	 * StringMatcher constructor takes in a String object that is a simple 
+	 * match the given <code>text</code> with the pattern
-	 * pattern which may contain  *  for 0 and many characters and
+	 * @return true if matched eitherwise false
-	 *  ?  for exactly one character. Also takes as parameter a boolean object
+	 * @param text a String object
-	 * specifying if case should be ignored
-	 * @deprecated Use StringMatcher(pattern, ignoreCase, ignoreWildCards).
 	 */
-	@Deprecated
+	public boolean match(String text) {
-	public StringMatcher(String aPattern, boolean ignoreCase) {
+		return match(text, 0, text.length());
-		this(aPattern, ignoreCase, false);
 	}
 	/**
-	 * StringMatcher constructor takes in a String object that is a simple 
+	 * Given the starting (inclusive) and the ending (exclusive) positions in the
-	 * pattern which may contain  *  for 0 and many characters and
-	 *  ?  for exactly one character.  
-	 *
-	 * Literal '*' and '?' characters must be escaped in the pattern 
-	 * e.g., "\*" means literal "*", etc.
-	 *
-	 * Escaping any other character (including the escape character itself), 
-	 * just results in that character in the pattern.
-	 * e.g., "\a" means "a" and "\\" means "\"
-	 *
-	 * If invoking the StringMatcher with string literals in Java, don't forget
-	 * escape characters are represented by "\\".
-	 *
-	 * @param aPattern the pattern to match text against
-	 * @param ignoreCase if true, case is ignored
-	 * @param ignoreWildCards if true, wild cards and their escape sequences are ignored
-	 * 		  (everything is taken literally).
-	 */
-	public StringMatcher(String aPattern, boolean ignoreCase, boolean ignoreWildCards) {
-		fIgnoreCase= ignoreCase;
-		fIgnoreWildCards= ignoreWildCards;
-		fLength= aPattern.length();
-
-		/* convert case */
-		if (fIgnoreCase) {
-			char[] chars= aPattern.toCharArray();
-			for (int i = 0; i < chars.length; i++) {
-				chars[i]= Character.toUpperCase(chars[i]);
-			}
-			fPattern= new String(chars);
-		} else {
-			fPattern= aPattern;
-		}
-
-		if (fIgnoreWildCards) {
-			parseNoWildCards();
-		} else {
-			parseWildCards();
-		}
-	}
-	/**
-	 * Given the starting (inclusive) and the ending (exclusive) poisitions in the   
 	 * <code>text</code>, determine if the given substring matches with aPattern
 	 * @return true if the specified portion of the text matches the pattern
 	 * @param text a String object that contains the substring to match
@@ -156,16 +147,16 @@ public class StringMatcher {
 	 * @param end marks the ending index (exclusive) of the substring
 	 */
 	public boolean match(String text, int start, int end) {
-		if (null == fPattern || null == text)
+		if (null == text)
 			throw new IllegalArgumentException();
 
 		if (start > end)
 			return false;
 
 		if (fIgnoreWildCards)
-			return fPattern.regionMatches(fIgnoreCase, 0, text, start, fLength);
+			return (end - start == fLength) && fPattern.regionMatches(fIgnoreCase, 0, text, start, fLength);
 		int segCount= fSegments.length;
-		if (segCount == 0) //pattern contains only '*'(s) or empty pattern
+		if (segCount == 0 && (fHasLeadingStar || fHasTrailingStar))  // pattern contains only '*'(s)
 			return true;
 		if (start == end)
 			return fLength == 0;
@@ -190,13 +181,17 @@ public class StringMatcher {
 		if (!fHasLeadingStar){
 			if(!regExpRegionMatches(text, start, current, 0, segLength)) {
 				return false;
-			}
+			} else {
 				++i;
 				tCurPos= tCurPos + segLength;
 			}
-
+		}
+		if ((fSegments.length == 1) && (!fHasLeadingStar) && (!fHasTrailingStar)) {
+			// only one segment to match, no wildcards specified
+			return tCurPos == end;
+		}
 		/* process middle segments */
-		for (; i < segCount && tCurPos <= bound; ++i) {
+		while (i < segCount) {
 			current= fSegments[i];
 			int currentMatch;
 			int k= current.indexOf(fSingleWildCard);
@@ -210,6 +205,7 @@ public class StringMatcher {
 					return false;
 			}
 			tCurPos= currentMatch + current.length();
+			i++;
 		}
 
 		/* process final segment */
@@ -219,14 +215,7 @@ public class StringMatcher {
 		}
 		return i == segCount ;
 	}
-	/**
+
-	 * match the given <code>text</code> with the pattern 
-	 * @return true if matched eitherwise false
-	 * @param text a String object 
-	 */
-	public boolean match(String text) {
-		return match(text, 0, text.length());
-	}
 	/**
 	 * This method parses the given pattern into segments seperated by wildcard '*' characters.
 	 * Since wildcards are not being used in this case, the pattern consists of a single segment.
@@ -237,7 +226,7 @@ public class StringMatcher {
 		fBound= fLength;
 	}
 	/**
-	 *  This method parses the given pattern into segments seperated by wildcard '*' characters.
+	 * Parses the given pattern into segments seperated by wildcard '*' characters.
 	 */
 	private void parseWildCards() {
 		if(fPattern.startsWith("*"))//$NON-NLS-1$
@@ -338,6 +327,7 @@ public class StringMatcher {
 		return -1;
 	}
 
+
 	protected boolean regExpRegionMatches(String text, int tStart, String p, int pStart, int plen) {
 		while (plen-- > 0) {
 			char tchar= text.charAt(tStart++);
@@ -353,8 +343,11 @@ public class StringMatcher {
 			if (pchar == tchar)
 				continue;
 			if (fIgnoreCase) {
-				char tc= Character.toUpperCase(tchar);
+				if (Character.toUpperCase(tchar) == Character.toUpperCase(pchar))
-				if (tc == pchar)
+					continue;
+				// comparing after converting to upper case doesn't handle all cases;
+				// also compare after converting to lower case
+				if (Character.toLowerCase(tchar) == Character.toLowerCase(pchar))
 					continue;
 			}
 			return false;
@@ -380,7 +373,7 @@ public class StringMatcher {
 			return i;
 		}
 
-		for (int i= 0; i <= max; ++i) {
+		for (int i= start; i <= max; ++i) {
 			if (text.regionMatches(true, i, p, 0, plen))
 				return i;
 		}