diff --git a/java/java-impl/src/com/intellij/refactoring/safeDelete/SafeDeleteJavaCallerChooser.java b/java/java-impl/src/com/intellij/refactoring/safeDelete/SafeDeleteJavaCallerChooser.java index 59f30fb75226..63de4092b4db 100644 --- a/java/java-impl/src/com/intellij/refactoring/safeDelete/SafeDeleteJavaCallerChooser.java +++ b/java/java-impl/src/com/intellij/refactoring/safeDelete/SafeDeleteJavaCallerChooser.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2016 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. @@ -33,11 +33,13 @@ import com.intellij.refactoring.safeDelete.usageInfo.SafeDeleteParameterCallHier import com.intellij.refactoring.safeDelete.usageInfo.SafeDeleteReferenceJavaDeleteUsageInfo; import com.intellij.usageView.UsageInfo; import com.intellij.util.Consumer; -import com.intellij.util.Function; import com.intellij.util.Processor; import com.intellij.util.containers.ContainerUtil; -import java.util.*; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; abstract class SafeDeleteJavaCallerChooser extends JavaCallerChooser { private final PsiMethod myMethod; @@ -81,8 +83,10 @@ abstract class SafeDeleteJavaCallerChooser extends JavaCallerChooser { ReferencesSearch.search(nodeMethod).forEach(reference -> { final PsiElement element = reference.getElement(); if (element != null) { - JavaSafeDeleteDelegate.EP.forLanguage(element.getLanguage()) - .createUsageInfoForParameter(reference, foreignMethodUsages, parameter, nodeMethod); + JavaSafeDeleteDelegate safeDeleteDelegate = JavaSafeDeleteDelegate.EP.forLanguage(element.getLanguage()); + if (safeDeleteDelegate != null) { + safeDeleteDelegate.createUsageInfoForParameter(reference, foreignMethodUsages, parameter, nodeMethod); + } } return true; });