From 908a86fd72faf78f5e8dd395734bf7f1ff3812f8 Mon Sep 17 00:00:00 2001 From: "Anna.Kozlova" Date: Thu, 17 Nov 2016 14:40:00 +0100 Subject: [PATCH] disable inplace change signature on usage --- .../changeSignature/JavaChangeSignatureHandler.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 5737c085fe05..35a77619dbf0 100644 --- a/java/java-impl/src/com/intellij/refactoring/changeSignature/JavaChangeSignatureHandler.java +++ b/java/java-impl/src/com/intellij/refactoring/changeSignature/JavaChangeSignatureHandler.java @@ -95,7 +95,10 @@ public class JavaChangeSignatureHandler implements ChangeSignatureHandler { 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); + boolean isInplace = Registry.is("inplace.change.signature") && + editor != null && editor.getSettings().isVariableInplaceRenameEnabled() && + (initialChange == null || initialChange.getMethod() != method) && + refExpr == null; PsiIdentifier nameIdentifier = method.getNameIdentifier(); LOG.assertTrue(nameIdentifier != null); if (isInplace) {