diff options
Diffstat (limited to 'java/structuralsearch-java/src/com/intellij')
3 files changed, 6 insertions, 18 deletions
diff --git a/java/structuralsearch-java/src/com/intellij/structuralsearch/JavaStructuralSearchProfile.java b/java/structuralsearch-java/src/com/intellij/structuralsearch/JavaStructuralSearchProfile.java index 869f01cc7394..acc59abd67da 100644 --- a/java/structuralsearch-java/src/com/intellij/structuralsearch/JavaStructuralSearchProfile.java +++ b/java/structuralsearch-java/src/com/intellij/structuralsearch/JavaStructuralSearchProfile.java @@ -67,6 +67,7 @@ public class JavaStructuralSearchProfile extends StructuralSearchProfile { } } + @NotNull public String getTypedVarString(final PsiElement element) { String text; diff --git a/java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/JavaMatchingVisitor.java b/java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/JavaMatchingVisitor.java index 0ea857b16362..418bc06d3b9e 100644 --- a/java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/JavaMatchingVisitor.java +++ b/java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/JavaMatchingVisitor.java @@ -90,19 +90,6 @@ public class JavaMatchingVisitor extends JavaElementVisitor { } } - @Override - public void visitDocTagValue(final PsiDocTagValue value) { - final PsiDocTagValue value2 = (PsiDocTagValue)myMatchingVisitor.getElement(); - final boolean isTypedVar = myMatchingVisitor.getMatchContext().getPattern().isTypedVar(value); - - if (isTypedVar) { - myMatchingVisitor.setResult(myMatchingVisitor.handleTypedElement(value, value2)); - } - else { - myMatchingVisitor.setResult(value.textMatches(value2)); - } - } - private static boolean isNotInstanceModifier(final PsiModifierList list2) { return list2.hasModifierProperty(PsiModifier.STATIC) || list2.hasModifierProperty(PsiModifier.ABSTRACT); diff --git a/java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/compiler/JavaCompilingVisitor.java b/java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/compiler/JavaCompilingVisitor.java index 271f1c468b0b..18c252d28111 100644 --- a/java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/compiler/JavaCompilingVisitor.java +++ b/java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/compiler/JavaCompilingVisitor.java @@ -1,20 +1,17 @@ package com.intellij.structuralsearch.impl.matcher.compiler; +import com.intellij.dupLocator.iterators.NodeIterator; import com.intellij.psi.*; import com.intellij.psi.javadoc.PsiDocComment; import com.intellij.psi.javadoc.PsiDocTag; import com.intellij.psi.search.*; import com.intellij.psi.search.searches.ClassInheritorsSearch; -import com.intellij.structuralsearch.MatchOptions; -import com.intellij.structuralsearch.MatchVariableConstraint; -import com.intellij.structuralsearch.SSRBundle; -import com.intellij.structuralsearch.UnsupportedPatternException; +import com.intellij.structuralsearch.*; import com.intellij.structuralsearch.impl.matcher.CompiledPattern; import com.intellij.structuralsearch.impl.matcher.JavaCompiledPattern; import com.intellij.structuralsearch.impl.matcher.filters.*; import com.intellij.structuralsearch.impl.matcher.handlers.*; import com.intellij.structuralsearch.impl.matcher.iterators.DocValuesIterator; -import com.intellij.dupLocator.iterators.NodeIterator; import com.intellij.structuralsearch.impl.matcher.predicates.RegExpPredicate; import com.intellij.structuralsearch.impl.matcher.strategies.*; import org.jetbrains.annotations.NonNls; @@ -84,6 +81,9 @@ public class JavaCompilingVisitor extends JavaRecursiveElementWalkingVisitor { ); SubstitutionHandler handler = (SubstitutionHandler)myCompilingVisitor.getContext().getPattern().getHandler(str); + if (handler == null) { + throw new MalformedPatternException(); + } if (handler.getPredicate() != null) { ((RegExpPredicate)handler.getPredicate()).setMultiline(true); |