1 files changed, 15 insertions, 0 deletions
diff --git a/java/java-impl/src/com/intellij/refactoring/makeStatic/MakeMethodStaticProcessor.java b/java/java-impl/src/com/intellij/refactoring/makeStatic/MakeMethodStaticProcessor.java
index de5efa573d8a..64afbfa17e84 100644
--- a/java/java-impl/src/com/intellij/refactoring/makeStatic/MakeMethodStaticProcessor.java
+++ b/java/java-impl/src/com/intellij/refactoring/makeStatic/MakeMethodStaticProcessor.java
@@ -27,6 +27,7 @@ import com.intellij.refactoring.util.RefactoringUtil;
 import com.intellij.refactoring.util.javadoc.MethodJavaDocHelper;
 import com.intellij.usageView.UsageInfo;
 import com.intellij.util.IncorrectOperationException;
+import com.intellij.util.containers.MultiMap;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -41,6 +42,20 @@ public class MakeMethodStaticProcessor extends MakeMethodOrClassStaticProcessor<
     super(project, method, settings);
   }
 
+  @Override
+  protected MultiMap<PsiElement, String> getConflictDescriptions(UsageInfo[] usages) {
+    MultiMap<PsiElement, String> descriptions = super.getConflictDescriptions(usages);
+    if (mySettings.isMakeClassParameter()) {
+      for (UsageInfo usage : usages) {
+        PsiElement element = usage.getElement();
+        if (element instanceof PsiMethodReferenceExpression) {
+          descriptions.putValue(element, "Method reference will be corrupted");
+        }
+      }
+    }
+    return descriptions;
+  }
+
   protected void changeSelfUsage(SelfUsageInfo usageInfo) throws IncorrectOperationException {
     PsiElement parent = usageInfo.getElement().getParent();
     LOG.assertTrue(parent instanceof PsiMethodCallExpression);