Attachment 128168 Details for Bug 267773 – Proposed patch

[patch] Proposed patch

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

on 2009-03-10 06:41:27 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Frederic Fusier

Created: 2009-03-10 06:41:27 EDT

Size: 2.00 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.core
>Index: search/org/eclipse/jdt/internal/core/search/StringOperation.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/StringOperation.java,v
>retrieving revision 1.3
>diff -u -r1.3 StringOperation.java
>--- search/org/eclipse/jdt/internal/core/search/StringOperation.java	13 Feb 2009 14:08:28 -0000	1.3
>+++ search/org/eclipse/jdt/internal/core/search/StringOperation.java	10 Mar 2009 10:10:15 -0000
>@@ -382,7 +382,7 @@
> 	/* check sequence of star+segment */
> 	int segmentStart;
> 	if (patternChar == '*') {
>-		if (iPattern > 0) {
>+		if (iPattern > 0 && previous != '?') {
> 			segments[count++] = start;
> 			segments[count++] = iName-start;
> 			start = iName;
>@@ -404,6 +404,7 @@
> 		return null;
> 	}
> 	int prefixStart = iName;
>+	int previousCount = count;
> 	previous = patternChar;
> 	char previousSegment = patternChar;
> 	checkSegment : while (iName < nameEnd) {
>@@ -414,6 +415,7 @@
> 			continue checkSegment;
> 		}
> 		/* segment is ending */
>+		previousCount = count;
> 		if ((patternChar = pattern.charAt(iPattern)) == '*') {
> 			segmentStart = ++iPattern; // skip star
> 			if (segmentStart == patternEnd) {
>@@ -460,8 +462,8 @@
> 				iPattern = segmentStart; // mismatch - restart current segment
> 				iName = ++prefixStart;
> 				start = prefixStart;
>-				if (previous == '?') count -= 2;
> 				previous = previousSegment;
>+				count = previousCount;
> 				continue checkSegment;
> 			}
> 			switch (previous) {
>#P org.eclipse.jdt.core.tests.model
>Index: src/org/eclipse/jdt/core/tests/model/MatchingRegionsTest.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/MatchingRegionsTest.java,v
>retrieving revision 1.4
>diff -u -r1.4 MatchingRegionsTest.java
>Binary files /tmp/cvsuZCyxS and MatchingRegionsTest.java differ

Actions: View | Diff

Attachments on bug 267773: 128144 | 128168