From 6bb2f1f81939b6ab9aa6beb27837d03bee321dc1 Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Wed, 17 Sep 2014 21:08:52 +0400 Subject: [PATCH] disable inline reference for static import EA-60471 - CCE: InlineMethodProcessor.doRefactoring --- .../com/intellij/refactoring/inline/InlineMethodHandler.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/java/java-impl/src/com/intellij/refactoring/inline/InlineMethodHandler.java b/java/java-impl/src/com/intellij/refactoring/inline/InlineMethodHandler.java index b84e772f145b..ab6f667bca38 100644 --- a/java/java-impl/src/com/intellij/refactoring/inline/InlineMethodHandler.java +++ b/java/java-impl/src/com/intellij/refactoring/inline/InlineMethodHandler.java @@ -23,6 +23,7 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.vfs.ReadonlyStatusHandler; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.*; +import com.intellij.psi.util.PsiTreeUtil; import com.intellij.refactoring.HelpID; import com.intellij.refactoring.RefactoringBundle; import com.intellij.refactoring.util.CommonRefactoringUtil; @@ -122,6 +123,10 @@ class InlineMethodHandler extends JavaInlineActionHandler { } } + if (reference != null && PsiTreeUtil.getParentOfType(reference.getElement(), PsiImportStaticStatement.class) != null) { + reference = null; + } + final boolean invokedOnReference = reference != null; if (!invokedOnReference) { final VirtualFile vFile = method.getContainingFile().getVirtualFile();