From 57bf5947098ddc0769d5e249b4de64576aec6e8f Mon Sep 17 00:00:00 2001 From: Alexandr Suhinin Date: Thu, 22 Jul 2021 10:20:17 +0300 Subject: [PATCH] IDEA-274197: don't suggest change signature if there are no duplicates GitOrigin-RevId: 86eb8ec79349076bd63c1d7d2f4b97e25377f8fd --- .../newImpl/inplace/DuplicatesMethodExtractor.kt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/java/java-impl/src/com/intellij/refactoring/extractMethod/newImpl/inplace/DuplicatesMethodExtractor.kt b/java/java-impl/src/com/intellij/refactoring/extractMethod/newImpl/inplace/DuplicatesMethodExtractor.kt index 063e8bff4e29..f6599dee8a19 100644 --- a/java/java-impl/src/com/intellij/refactoring/extractMethod/newImpl/inplace/DuplicatesMethodExtractor.kt +++ b/java/java-impl/src/com/intellij/refactoring/extractMethod/newImpl/inplace/DuplicatesMethodExtractor.kt @@ -88,9 +88,11 @@ class DuplicatesMethodExtractor: InplaceExtractMethodProvider { val oldMethodCall = PsiTreeUtil.findChildOfType(calls.first(), PsiMethodCallExpression::class.java) val newMethodCall = PsiTreeUtil.findChildOfType(elementsToReplace.callElements.first(), PsiMethodCallExpression::class.java) val parametrizedDuplicatesNumber = duplicates.size - exactDuplicates.size - val changeSignature = SignatureSuggesterPreviewDialog(method, elementsToReplace.method, oldMethodCall, newMethodCall, parametrizedDuplicatesNumber).showAndGet() - if (!changeSignature) { - duplicates = exactDuplicates + if (parametrizedDuplicatesNumber > 0){ + val changeSignature = SignatureSuggesterPreviewDialog(method, elementsToReplace.method, oldMethodCall, newMethodCall, parametrizedDuplicatesNumber).showAndGet() + if (!changeSignature) { + duplicates = exactDuplicates + } } duplicates = confirmDuplicates(project, editor, duplicates)