From 89e8f7a2ae8b959e5f79d1d026eecbd3b4e8ee3f Mon Sep 17 00:00:00 2001
From: Bas Leijdekkers <basleijdekkers@gmail.com>
Date: Thu, 12 Feb 2015 12:39:25 +0100
Subject: [PATCH] SSR: fix method javadoc matching (second part of IDEA-126909)

---
 .../structuralsearch/impl/matcher/JavaMatchingVisitor.java   | 5 +++++
 .../com/intellij/structuralsearch/StructuralSearchTest.java  | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

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 2cc96e2a7de6..c8dca645f698 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
@@ -1673,6 +1673,11 @@ public class JavaMatchingVisitor extends JavaElementVisitor {
     myMatchingVisitor.getMatchContext().pushResult();
 
     try {
+      final PsiDocComment docComment = method.getDocComment();
+      if (docComment != null) {
+        myMatchingVisitor.setResult(myMatchingVisitor.match(docComment, method2));
+        if (!myMatchingVisitor.getResult()) return;
+      }
       if (method.hasTypeParameters()) {
         myMatchingVisitor.setResult(
           myMatchingVisitor.match(method.getTypeParameterList(), ((PsiMethod)myMatchingVisitor.getElement()).getTypeParameterList()));
diff --git a/platform/structuralsearch/testSource/com/intellij/structuralsearch/StructuralSearchTest.java b/platform/structuralsearch/testSource/com/intellij/structuralsearch/StructuralSearchTest.java
index 1ce2df4d2d6b..a545d094abcb 100644
--- a/platform/structuralsearch/testSource/com/intellij/structuralsearch/StructuralSearchTest.java
+++ b/platform/structuralsearch/testSource/com/intellij/structuralsearch/StructuralSearchTest.java
@@ -1676,7 +1676,7 @@ public class StructuralSearchTest extends StructuralSearchTestCase {
     // javadoc comment for method
     assertEquals(
       "javadoc comment for method",
-      3,
+      2,
       findMatchesCount(s57, s58_3)
     );