From 6cc97299ca04e44a7babc1bcdafdc12d650a7de9 Mon Sep 17 00:00:00 2001
From: Dmitry Avdeev <dmitry.avdeev@jetbrains.com>
Date: Wed, 23 May 2018 18:26:19 +0300
Subject: [PATCH] failed test line highlighting: highlight method name only

---
 .../execution/testframework/TestFailedLineInspection.java    | 5 ++++-
 .../intellij/java/codeInsight/navigation/FailedLineTest.java | 5 +++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/java/execution/impl/src/com/intellij/execution/testframework/TestFailedLineInspection.java b/java/execution/impl/src/com/intellij/execution/testframework/TestFailedLineInspection.java
index 124d4450cd18..e3b5bfa648a0 100644
--- a/java/execution/impl/src/com/intellij/execution/testframework/TestFailedLineInspection.java
+++ b/java/execution/impl/src/com/intellij/execution/testframework/TestFailedLineInspection.java
@@ -30,13 +30,16 @@ public class TestFailedLineInspection extends LocalInspectionTool {
       @Override
       public void visitMethodCallExpression(PsiMethodCallExpression call) {
 
+        PsiElement nameElement = call.getMethodExpression().getReferenceNameElement();
+        if (nameElement == null) return;
+
         TestStateStorage.Record state = TestFailedLineManager.getInstance(call.getProject()).getFailedLineState(call);
         if (state == null) return;
 
         LocalQuickFix[] fixes = {new DebugFailedTestFix(call, state.topStacktraceLine),
           new RunActionFix(call, DefaultRunExecutor.EXECUTOR_ID)};
         ProblemDescriptor descriptor = InspectionManager.getInstance(call.getProject())
-                                                        .createProblemDescriptor(call, state.errorMessage, isOnTheFly, fixes,
+                                                        .createProblemDescriptor(nameElement, state.errorMessage, isOnTheFly, fixes,
                                                                                  ProblemHighlightType.GENERIC_ERROR_OR_WARNING);
         descriptor.setTextAttributes(CodeInsightColors.RUNTIME_ERROR);
         holder.registerProblem(descriptor);
diff --git a/java/java-tests/testSrc/com/intellij/java/codeInsight/navigation/FailedLineTest.java b/java/java-tests/testSrc/com/intellij/java/codeInsight/navigation/FailedLineTest.java
index 77a3b037b46f..8c85a41c81ce 100644
--- a/java/java-tests/testSrc/com/intellij/java/codeInsight/navigation/FailedLineTest.java
+++ b/java/java-tests/testSrc/com/intellij/java/codeInsight/navigation/FailedLineTest.java
@@ -37,7 +37,8 @@ public class FailedLineTest extends LightCodeInsightFixtureTestCase {
   public void testFailedLineManager() {
 
     configure();
-
+    myFixture.enableInspections(new TestFailedLineInspection());
+    myFixture.testHighlighting();
     PsiElement element = PsiUtilBase.getElementAtCaret(getEditor());
     PsiMethodCallExpression callExpression = PsiTreeUtil.getParentOfType(element, PsiMethodCallExpression.class);
     PsiMethod psiMethod = PsiTreeUtil.getParentOfType(callExpression, PsiMethod.class);
@@ -91,7 +92,7 @@ public class FailedLineTest extends LightCodeInsightFixtureTestCase {
     myFixture.addClass("package junit.framework; public class TestCase {}");
     myFixture.configureByText("MainTest.java", "  public class MainTest extends junit.framework.TestCase {\n" +
                                                "    public void testFoo() {\n" +
-                                               "       <warning descr=\"oops\">assertE<caret>quals()</warning>;\n" +
+                                               "       <warning descr=\"oops\">assertE<caret>quals</warning>();\n" +
                                                "       assertEquals();\n" +
                                                "    }\n" +
                                                "    public void assertEquals() {}\n" +