diff options
| author | Mickael Istria | 2018-05-24 08:57:56 +0000 |
|---|---|---|
| committer | Alexander Kurtakov | 2018-05-24 11:56:30 +0000 |
| commit | db3a91066472921526c2935d96a6d040048f39a7 (patch) | |
| tree | ef162cedbd98ebf9e0a4c8176137aaacb1556a93 | |
| parent | 5cf0a32c90a08693b04d68d87bd59f2f923b4a0e (diff) | |
| download | eclipse.platform.ui-db3a91066472921526c2935d96a6d040048f39a7.tar.gz eclipse.platform.ui-db3a91066472921526c2935d96a6d040048f39a7.tar.xz eclipse.platform.ui-db3a91066472921526c2935d96a6d040048f39a7.zip | |
Bug 535047 - Text filter not working in Preferences
Change-Id: Iac2269430a0ea9786b0d8da6671e6568b186c6f0
Signed-off-by: Mickael Istria <mistria@redhat.com>
2 files changed, 15 insertions, 1 deletions
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/misc/StringMatcher.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/misc/StringMatcher.java index 2c730c06f34..3ce9236fe2c 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/misc/StringMatcher.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/misc/StringMatcher.java @@ -314,7 +314,8 @@ public class StringMatcher { start = Math.max(0, start); end = Math.min(end, tlen); - if (wholePatternWord != null && wholePatternWord.match(text, start, end)) { + if (wholePatternWord != null + && (wholePatternWord.match(text, start, end) || wholePatternWord.matchTextWord(text, start, end))) { return true; } if (splittedPatternWords != null && splittedPatternWords.length > 0) { diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/filteredtree/PatternFilterTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/filteredtree/PatternFilterTest.java index 132b20ca2ff..672cdc26022 100644 --- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/filteredtree/PatternFilterTest.java +++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/filteredtree/PatternFilterTest.java @@ -77,6 +77,19 @@ public class PatternFilterTest { } @Test + public void testBasicFilter() { + viewer.setContentProvider(new ArrayContentProvider()); + viewer.setInput(new String[] {}); + PatternFilter filter = new PatternFilter(); + + filter.setPattern("b"); + assertTrue(filter.select(viewer, null, "a b c")); + + filter.setPattern("jre"); + assertTrue(filter.select(viewer, null, "Java build path buildpath problem exclusion inclusion pattern folder outputfolder filtered resource output compiler 1.5 5.0 J2SE5 project specific projectspecific strictly compatible JRE execution environment")); + } + + @Test public void testPatternFilterOrder() { viewer.setContentProvider(new ArrayContentProvider()); viewer.setInput(new String[] {}); |