From d7485f0574aeec4c955501cd8fa9e48aa19c15d1 Mon Sep 17 00:00:00 2001 From: "Anna.Kozlova" Date: Thu, 10 Nov 2016 19:39:16 +0100 Subject: [PATCH] temp reject inplace change signature for super methods --- .../refactoring/changeSignature/JavaChangeSignatureHandler.java | 2 +- .../changeSignature/inplace/InplaceChangeSignature.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java/java-impl/src/com/intellij/refactoring/changeSignature/JavaChangeSignatureHandler.java b/java/java-impl/src/com/intellij/refactoring/changeSignature/JavaChangeSignatureHandler.java index d5d47bb85093..5737c085fe05 100644 --- a/java/java-impl/src/com/intellij/refactoring/changeSignature/JavaChangeSignatureHandler.java +++ b/java/java-impl/src/com/intellij/refactoring/changeSignature/JavaChangeSignatureHandler.java @@ -92,7 +92,7 @@ public class JavaChangeSignatureHandler implements ChangeSignatureHandler { final PsiClass containingClass = method.getContainingClass(); final PsiReferenceExpression refExpr = editor != null ? JavaTargetElementEvaluator.findReferenceExpression(editor) : null; final boolean allowDelegation = containingClass != null && (!containingClass.isInterface() || PsiUtil.isLanguageLevel8OrHigher(containingClass)); - InplaceChangeSignature inplaceChangeSignature = InplaceChangeSignature.getCurrentRefactoring(editor); + InplaceChangeSignature inplaceChangeSignature = editor != null ? InplaceChangeSignature.getCurrentRefactoring(editor) : null; ChangeInfo initialChange = inplaceChangeSignature != null ? inplaceChangeSignature.getStableChange() : null; boolean isInplace = Registry.is("inplace.change.signature") && editor != null && editor.getSettings().isVariableInplaceRenameEnabled() && (initialChange == null || initialChange.getMethod() != method); diff --git a/platform/lang-impl/src/com/intellij/refactoring/changeSignature/inplace/InplaceChangeSignature.java b/platform/lang-impl/src/com/intellij/refactoring/changeSignature/inplace/InplaceChangeSignature.java index f612d07b36b3..d5c6c93f6629 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/changeSignature/inplace/InplaceChangeSignature.java +++ b/platform/lang-impl/src/com/intellij/refactoring/changeSignature/inplace/InplaceChangeSignature.java @@ -106,7 +106,7 @@ public class InplaceChangeSignature implements DocumentListener { } @Nullable - public static InplaceChangeSignature getCurrentRefactoring(Editor editor) { + public static InplaceChangeSignature getCurrentRefactoring(@NotNull Editor editor) { return editor.getUserData(INPLACE_CHANGE_SIGNATURE); }