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

Merge branch 'additional-patterns-for-lines' of https://github.com/jwren/intellij-community into jwren-additional-patterns-for-lines

Browse Source
This commit is contained in:
peter
2017-05-03 20:12:09 +02:00
parent 8d57cb8412 cf945a6568
commit 024a359510
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-tests/testSrc/com/intellij/navigation/ChooseByNameTest.groovy
+1
View File
@@ -251,6 +251,7 @@ class Intf {
assert getPopupElements(model, 'Bar at line 2') == [file]
assert getPopupElements(model, 'Bar 2:39') == [file]
assert getPopupElements(model, 'Bar#L2') == [file]
assert getPopupElements(model, 'Bar?l=2') == [file]
}
void "test dollar"() {
platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNamePopup.java
+2 -2
View File
@@ -340,7 +340,7 @@ public class ChooseByNamePopup extends ChooseByNameBase implements ChooseByNameP
}
private static final Pattern patternToDetectLinesAndColumns = Pattern.compile("(.+?)" + // name, non-greedy matching
"(?::|@|,| |#L| on line | at line |:?\\(|:?\\[)" + // separator
"(?::|@|,| |#|#L|\\?l=| on line | at line |:?\\(|:?\\[)" + // separator
"(\\d+)(?:(?:\\D)(\\d+)?)?" + // line + column
"[)\\]]?" // possible closing paren/brace
);
@@ -355,7 +355,7 @@ public class ChooseByNamePopup extends ChooseByNameBase implements ChooseByNameP
public static String getTransformedPattern(String pattern, ChooseByNameModel model) {
Pattern regex = null;
if (StringUtil.containsAnyChar(pattern, ":,;@[( #") || pattern.contains(" line ")) { // quick test if reg exp should be used
if (StringUtil.containsAnyChar(pattern, ":,;@[( #") || pattern.contains(" line ") || pattern.contains("?l=")) { // quick test if reg exp should be used
regex = patternToDetectLinesAndColumns;
}