MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

restore old module patterns (IDEA-130308)

Browse Source
This commit is contained in:
Anna Kozlova
2014-09-29 16:09:17 +02:00
parent 2a6eafd217
commit 3723032df7
1 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/analysis-api/src/com/intellij/psi/search/scope/packageSet/FilePatternPackageSet.java
+21 -5
View File
@@ -33,6 +33,7 @@ import com.intellij.openapi.vfs.VirtualFile;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.TestOnly;
import java.util.regex.Pattern;
@@ -56,12 +57,12 @@ public class FilePatternPackageSet extends PatternBasedPackageSet {
if (modulePattern.startsWith("group:")) {
int idx = modulePattern.indexOf(':', 6);
if (idx == -1) idx = modulePattern.length();
myModuleGroupPattern = Pattern.compile(StringUtil.escapeToRegexp(modulePattern.substring(6, idx)));
myModuleGroupPattern = Pattern.compile(StringUtil.replace(escapeToRegexp(modulePattern.substring(6, idx)), "*", ".*"));
if (idx < modulePattern.length() - 1) {
myModulePattern = Pattern.compile(StringUtil.escapeToRegexp(modulePattern.substring(idx + 1)));
myModulePattern = Pattern.compile(StringUtil.replace(escapeToRegexp(modulePattern.substring(idx + 1)), "*", ".*"));
}
} else {
myModulePattern = Pattern.compile(StringUtil.escapeToRegexp(modulePattern));
myModulePattern = Pattern.compile(StringUtil.replace(escapeToRegexp(modulePattern), "*", ".*"));
}
}
myFilePattern = filePattern != null ? Pattern.compile(convertToRegexp(filePattern, '/')) : null;
@@ -109,10 +110,25 @@ public class FilePatternPackageSet extends PatternBasedPackageSet {
return modulePattern == null && moduleGroupPattern == null;
}
@NotNull
private static String escapeToRegexp(@NotNull CharSequence text) {
StringBuilder builder = new StringBuilder(text.length());
for (int i = 0; i < text.length(); i++) {
final char c = text.charAt(i);
if (c == ' ' || Character.isLetter(c) || Character.isDigit(c) || c == '_' || c == '*') {
builder.append(c);
}
else {
builder.append('\\').append(c);
}
}
//public for tests only
return builder.toString();
}
@TestOnly
public static String convertToRegexp(String aspectsntx, char separator) {
StringBuffer buf = new StringBuffer(aspectsntx.length());
StringBuilder buf = new StringBuilder(aspectsntx.length());
int cur = 0;
boolean isAfterSeparator = false;
boolean isAfterAsterix = false;