From 7202d07bb2da2a960d5784f6af76f59d8d5cdf94 Mon Sep 17 00:00:00 2001 From: Max Medvedev Date: Fri, 5 Jul 2019 16:03:57 +0300 Subject: [PATCH] EA-207513 - NPE: GrImportFilteringRule.isVisible GitOrigin-RevId: 6cbb00548c6efd22b6c4d23641442942d04d8ac3 --- .../findUsages/GrImportFilteringRule.java | 26 +++++-------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/findUsages/GrImportFilteringRule.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/findUsages/GrImportFilteringRule.java index 0d4b93c22032..4becbef4b77c 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/findUsages/GrImportFilteringRule.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/findUsages/GrImportFilteringRule.java @@ -1,18 +1,4 @@ -/* - * Copyright 2000-2012 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package org.jetbrains.plugins.groovy.findUsages; import com.intellij.psi.PsiElement; @@ -34,10 +20,12 @@ public class GrImportFilteringRule extends ImportFilteringRule { public boolean isVisible(@NotNull Usage usage, @NotNull UsageTarget[] targets) { if (usage instanceof PsiElementUsage) { final PsiElement psiElement = ((PsiElementUsage)usage).getElement(); - final PsiFile containingFile = psiElement.getContainingFile(); - if (containingFile instanceof GroovyFile) { - // check whether the element is in the import list - return PsiTreeUtil.getParentOfType(psiElement, GrImportStatement.class, true) == null; + if (psiElement != null) { + final PsiFile containingFile = psiElement.getContainingFile(); + if (containingFile instanceof GroovyFile) { + // check whether the element is in the import list + return PsiTreeUtil.getParentOfType(psiElement, GrImportStatement.class, true) == null; + } } } return true;