1 files changed, 21 insertions, 0 deletions
diff --git a/java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/handlers/ExpressionHandler.java b/java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/handlers/ExpressionHandler.java
new file mode 100644
index 000000000000..6437c148dd0d
--- /dev/null
+++ b/java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/handlers/ExpressionHandler.java
@@ -0,0 +1,21 @@
+package com.intellij.structuralsearch.impl.matcher.handlers;
+
+import com.intellij.psi.PsiElement;
+import com.intellij.psi.PsiExpressionStatement;
+import com.intellij.structuralsearch.impl.matcher.MatchContext;
+
+/**
+ * Handler for substitution expression search
+ */
+public class ExpressionHandler extends MatchingHandler {
+  public boolean match(PsiElement patternNode, PsiElement matchedNode, MatchContext context) {
+    if (!super.match(patternNode,matchedNode,context)) {
+      return false;
+    }
+
+    return context.getMatcher().match(
+      ((PsiExpressionStatement)patternNode).getExpression(),
+      matchedNode
+    );
+  }
+}