From f4dd99201c3472931d41b9ee0b820c852785f4dd Mon Sep 17 00:00:00 2001 From: Dmitry Batkovich Date: Fri, 18 Dec 2020 09:47:34 +0300 Subject: [PATCH] fix NPE when accessing invalid element EA-228686 GitOrigin-RevId: 4b3def56cb0652396b1d33f5ff3db33c6a010af2 --- .../testDiscovery/actions/TestMethodUsage.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/java/execution/impl/src/com/intellij/execution/testDiscovery/actions/TestMethodUsage.java b/java/execution/impl/src/com/intellij/execution/testDiscovery/actions/TestMethodUsage.java index 3626c483a46c..af8b76418555 100644 --- a/java/execution/impl/src/com/intellij/execution/testDiscovery/actions/TestMethodUsage.java +++ b/java/execution/impl/src/com/intellij/execution/testDiscovery/actions/TestMethodUsage.java @@ -77,12 +77,16 @@ class TestMethodUsage implements Usage, UsageInFile, UsageInModule, PsiElementUs @NotNull @Override public @NlsSafe String getPlainText() { - return StringUtil.notNullize(Objects.requireNonNull(getElement()).getName()); + PsiMember element = getElement(); + if (element == null) return ""; + return StringUtil.notNullize(element.getName()); } @Override public Icon getIcon() { - return Objects.requireNonNull(getElement()).getIcon(0); + PsiMember element = getElement(); + if (element == null) return null; + return element.getIcon(0); } @Override @@ -94,7 +98,7 @@ class TestMethodUsage implements Usage, UsageInFile, UsageInModule, PsiElementUs @Override public boolean isValid() { - return getPointer().getElement() != null; + return getElement() != null; } @Override