From 3f409f1f7aff4ccfd1cb995a1bc5cb8e70fc6dce Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Fri, 24 Jan 2014 15:14:09 +0400 Subject: [PATCH] EA-53575 - CCE: InlineMethodHandler.inlineElement --- .../intellij/refactoring/inline/InlineMethodHandler.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) 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 166e6f2aa493..b84e772f145b 100644 --- a/java/java-impl/src/com/intellij/refactoring/inline/InlineMethodHandler.java +++ b/java/java-impl/src/com/intellij/refactoring/inline/InlineMethodHandler.java @@ -127,7 +127,14 @@ class InlineMethodHandler extends JavaInlineActionHandler { final VirtualFile vFile = method.getContainingFile().getVirtualFile(); ReadonlyStatusHandler.getInstance(project).ensureFilesWritable(vFile); } - PsiJavaCodeReferenceElement refElement = reference != null ? (PsiJavaCodeReferenceElement)reference.getElement() : null; + + PsiJavaCodeReferenceElement refElement = null; + if (reference != null) { + final PsiElement referenceElement = reference.getElement(); + if (referenceElement instanceof PsiJavaCodeReferenceElement) { + refElement = (PsiJavaCodeReferenceElement)referenceElement; + } + } InlineMethodDialog dialog = new InlineMethodDialog(project, method, refElement, editor, allowInlineThisOnly); dialog.show(); }