EA-207513 - NPE: GrImportFilteringRule.isVisible

GitOrigin-RevId: 6cbb00548c6efd22b6c4d23641442942d04d8ac3
This commit is contained in:
Max Medvedev
2019-07-05 16:07:22 +03:00
committed by intellij-monorepo-bot
parent f0929301c5
commit 7202d07bb2
@@ -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;