Follow up commit for bug 530016I20180122-0800

[9][search] provide a trapdoor for regex usage in jdt.ui for module
declaration

2 files changed, 8 insertions, 8 deletions

diff --git a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/JavaSearchBugs9Tests.java b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/JavaSearchBugs9Tests.java
index 85ea71300b..7841dbca9c 100644
--- a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/JavaSearchBugs9Tests.java
+++ b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/JavaSearchBugs9Tests.java
@@ -4134,7 +4134,7 @@ public void testBug530016_001() throws Exception {
 		project2.open(null);
 		project1.open(null);
 		
-		String needle = "\\r mod.*"; // Pattern
+		String needle = "/r mod.*"; // Pattern
 		SearchPattern pattern = SearchPattern.createPattern(needle, IJavaSearchConstants.MODULE, DECLARATIONS, SearchPattern.R_EXACT_MATCH);
 		IJavaSearchScope scope = SearchEngine.createJavaSearchScope(new IJavaProject[]
 				{getJavaProject("JavaSearchBugs9")});
@@ -4184,7 +4184,7 @@ public void testBug530016_002() throws Exception {
 		project2.open(null);
 		project1.open(null);
 		
-		String needle = "\\r mod.*"; // Pattern
+		String needle = "/r mod.*"; // Pattern
 		SearchPattern pattern = SearchPattern.createPattern(needle, IJavaSearchConstants.MODULE, DECLARATIONS, SearchPattern.R_EXACT_MATCH);
 		IJavaSearchScope scope = SearchEngine.createJavaSearchScope(new IJavaProject[]
 				{getJavaProject("JavaSearchBugs9")});
@@ -4233,7 +4233,7 @@ public void testBug530016_003() throws Exception {
 		project2.open(null);
 		project1.open(null);
 		
-		String needle = "\\r mod\\.f.*"; // Pattern
+		String needle = "/r mod\\.f.*"; // Pattern
 		SearchPattern pattern = SearchPattern.createPattern(needle, IJavaSearchConstants.MODULE, DECLARATIONS, SearchPattern.R_EXACT_MATCH);
 		IJavaSearchScope scope = SearchEngine.createJavaSearchScope(new IJavaProject[]
 				{getJavaProject("JavaSearchBugs9")});
@@ -4282,7 +4282,7 @@ public void testBug530016_004() throws Exception {
 		project2.open(null);
 		project1.open(null);
 		
-		String needle = "\\r mod.f.+"; // Pattern
+		String needle = "/r mod.f.+"; // Pattern
 		SearchPattern pattern = SearchPattern.createPattern(needle, IJavaSearchConstants.MODULE, DECLARATIONS, SearchPattern.R_EXACT_MATCH);
 		IJavaSearchScope scope = SearchEngine.createJavaSearchScope(new IJavaProject[]
 				{getJavaProject("JavaSearchBugs9")});
@@ -4331,7 +4331,7 @@ public void testBug530016_005() throws Exception {
 		project2.open(null);
 		project1.open(null);
 		
-		String needle = "\\r .*f.+"; // Pattern
+		String needle = "/r .*f.+"; // Pattern
 		SearchPattern pattern = SearchPattern.createPattern(needle, IJavaSearchConstants.MODULE, DECLARATIONS, SearchPattern.R_EXACT_MATCH);
 		IJavaSearchScope scope = SearchEngine.createJavaSearchScope(new IJavaProject[]
 				{getJavaProject("JavaSearchBugs9")});
@@ -4380,7 +4380,7 @@ public void testBug530016_006() throws Exception {
 		project2.open(null);
 		project1.open(null);
 		
-		String needle = "\\r .*m+.*"; // Pattern
+		String needle = "/r .*m+.*"; // Pattern
 		SearchPattern pattern = SearchPattern.createPattern(needle, IJavaSearchConstants.MODULE, DECLARATIONS, SearchPattern.R_EXACT_MATCH);
 		IJavaSearchScope scope = SearchEngine.createJavaSearchScope(new IJavaProject[]
 				{getJavaProject("JavaSearchBugs9")});
@@ -4446,7 +4446,7 @@ public void testBug530016_007() throws Exception {
 		project2.open(null);
 		project1.open(null);
 		
-		String needle = "\\r mod\\.[fs]+.*"; // Pattern
+		String needle = "/r mod\\.[fs]+.*"; // Pattern
 		SearchPattern pattern = SearchPattern.createPattern(needle, IJavaSearchConstants.MODULE, DECLARATIONS, SearchPattern.R_EXACT_MATCH);
 		IJavaSearchScope scope = SearchEngine.createJavaSearchScope(new IJavaProject[]
 				{getJavaProject("JavaSearchBugs9")});
diff --git a/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/ModulePattern.java b/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/ModulePattern.java
index f25ddc4e64..1d5af27f01 100644
--- a/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/ModulePattern.java
+++ b/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/ModulePattern.java
@@ -27,7 +27,7 @@ public class ModulePattern extends JavaSearchPattern {
 	protected static char[][] REF_CATEGORIES = { MODULE_REF };
 	protected static char[][] REF_AND_DECL_CATEGORIES = { MODULE_REF, MODULE_DECL };
 	protected static char[][] DECL_CATEGORIES = { MODULE_DECL };
-	private static char[] regexPrefix = {'\\','r',' '};
+	private static char[] regexPrefix = {'/','r',' '};
 
 	public static char[] createIndexKey(char[] name) {
 		return name; // until a need arises, let the name itself be the index key.