IDEA-CR-40095 RUBY-22288 IDEA-197952 Change regex to capture non-word character. Delete unnecessary non-capturing group.

This commit is contained in:
Nikolay Korolev
2018-12-05 17:47:05 +03:00
parent da321037e0
commit 33c0300ace
3 changed files with 13 additions and 2 deletions
@@ -502,6 +502,17 @@ class Intf {
assert gotoSymbol('start') == [m1] // works as usual for non-qualified patterns
}
void "test colon in search end"() {
def foo = myFixture.addClass('class Foo { }')
assert gotoClass('Foo:') == [foo]
}
void "test multi-word class name with only first letter of second word"() {
myFixture.addClass('class Foo { }')
def fooBar = myFixture.addClass('class FooBar { }')
assert gotoClass('Foo B') == [fooBar]
}
private List<Object> gotoClass(String text, boolean checkboxState = false) {
return getPopupElements(new GotoClassModel2(project), text, checkboxState)
}
@@ -37,7 +37,7 @@ public abstract class AbstractGotoSEContributor<F> implements SearchEverywhereCo
protected static final Pattern patternToDetectLinesAndColumns = Pattern.compile("(.+?)" + // name, non-greedy matching
"(?::|@|,| |#|#L|\\?l=| on line | at line |:?\\(|:?\\[)" + // separator
"(\\d+)?(?:(?:\\D)(\\d+)?)?" + // line + column
"(\\d+)?(?:\\W(\\d+)?)?" + // line + column
"[)\\]]?" // possible closing paren/brace
);
protected static final Pattern patternToDetectAnonymousClasses = Pattern.compile("([\\.\\w]+)((\\$[\\d]+)*(\\$)?)");
@@ -317,7 +317,7 @@ public class ChooseByNamePopup extends ChooseByNameBase implements ChooseByNameP
private static final Pattern patternToDetectLinesAndColumns = Pattern.compile("(.+?)" + // name, non-greedy matching
"(?::|@|,| |#|#L|\\?l=| on line | at line |:?\\(|:?\\[)" + // separator
"(\\d+)?(?:(?:\\D)(\\d+)?)?" + // line + column
"(\\d+)?(?:\\W(\\d+)?)?" + // line + column
"[)\\]]?" // possible closing paren/brace
);
public static final Pattern patternToDetectAnonymousClasses = Pattern.compile("([\\.\\w]+)((\\$[\\d]+)*(\\$)?)");