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

SSR: use utility method

Browse Source
This commit is contained in:
Bas Leijdekkers
2015-11-04 21:16:34 +01:00
parent ed104f40d2
commit 27ae0c3ece
3 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/predicates/ReferencePredicate.java
+1 -4
View File
@@ -15,10 +15,7 @@ public final class ReferencePredicate extends SubstitutionHandler {
}
public boolean match(PsiElement node, PsiElement match, MatchContext context) {
if (StructuralSearchUtil.isIdentifier(match)) {
// since we pickup tokens
match = match.getParent();
}
match = StructuralSearchUtil.getParentIfIdentifier(match);
PsiElement result = MatchUtils.getReferencedElement(match);
if (result == null) {
platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/predicates/RegExpPredicate.java
+1 -3
View File
@@ -102,9 +102,7 @@ public final class RegExpPredicate extends MatchPredicate {
if (!result) {
if(StructuralSearchUtil.isIdentifier(matchedNode)) {
matchedNode = matchedNode.getParent();
}
matchedNode = StructuralSearchUtil.getParentIfIdentifier(matchedNode);
String alternativeText = context.getPattern().getAlternativeTextToMatch(matchedNode, text);
if (alternativeText != null) {
platform/structuralsearch/source/com/intellij/structuralsearch/plugin/replace/impl/ReplacementContext.java
+1 -1
View File
@@ -43,7 +43,7 @@ public class ReplacementContext {
for (String s : variableMap.keySet()) {
final MatchResult matchResult = replacementInfo.getVariableMap().get(s);
PsiElement match = matchResult.getMatchRef() != null ? matchResult.getMatch() : null;
if (StructuralSearchUtil.isIdentifier(match)) match = match.getParent();
match = StructuralSearchUtil.getParentIfIdentifier(match);
if (match instanceof PsiNamedElement) {
final String name = ((PsiNamedElement)match).getName();