MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-04-19 04:51:24 +07:00
Code Issues Packages Projects Releases Wiki Activity

[extract method] cleanup: simplify method

Browse Source 
GitOrigin-RevId: 2f1ba5c83e40feee21bbf41492bc7d22775340bd
This commit is contained in:
Alexandr Suhinin
2024-08-05 17:37:51 +03:00
committed by intellij-monorepo-bot
parent a649539e66
commit b314b99f88
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
java/java-impl-refactorings/src/com/intellij/refactoring/extractMethod/newImpl/inplace/DuplicatesMethodExtractor.kt
View File

@@ -21,6 +21,7 @@ import com.intellij.psi.codeStyle.CodeStyleManager
import com.intellij.psi.search.LocalSearchScope
import com.intellij.psi.util.PsiEditorUtil
import com.intellij.psi.util.PsiTreeUtil
import com.intellij.psi.util.childLeafs
import com.intellij.refactoring.JavaRefactoringSettings
import com.intellij.refactoring.extractMethod.ExtractMethodHandler
import com.intellij.refactoring.extractMethod.SignatureSuggesterPreviewDialog
@@ -190,8 +191,8 @@ class DuplicatesMethodExtractor(val extractOptions: ExtractOptions, val targetCl
private fun isGoodSignatureChange(exactExtractElements: ExtractedElements, parametrizedExtractElements: ExtractedElements): Boolean {
val parametersSizeBefore = exactExtractElements.method.parameterList.parameters.size
val parametersSizeAfter = parametrizedExtractElements.method.parameterList.parameters.size
val codeSizeBefore = extractOptions.elements.sumOf(::calculateCodeLeafs)
val callSizeAfter = parametrizedExtractElements.callElements.sumOf(::calculateCodeLeafs)
val codeSizeBefore = extractOptions.elements.sumOf(::countNonEmptyLeafs)
val callSizeAfter = parametrizedExtractElements.callElements.sumOf(::countNonEmptyLeafs)
val addedParameters = parametersSizeAfter - parametersSizeBefore
if (addedParameters <= 0) {
// do not require reduce in call size if we just replace parameter
@@ -206,11 +207,8 @@ class DuplicatesMethodExtractor(val extractOptions: ExtractOptions, val targetCl
}
}
private fun calculateCodeLeafs(element: PsiElement): Int {
return SyntaxTraverser.psiTraverser(element)
.filter { psiElement -> psiElement.firstChild == null && psiElement.text.isNotBlank() }
.traverse()
.count()
private fun countNonEmptyLeafs(element: PsiElement): Int {
return element.childLeafs().filter { leaf -> leaf.text.isNotBlank() }.count()
}
private fun findMethodCallInside(element: PsiElement?): PsiMethodCallExpression? {