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] do not run analysis both on an original file and virtual copy

Browse Source 
GitOrigin-RevId: fe0433dbc0673cac6554c3710b03e180046df1fc
This commit is contained in:
Alexandr Suhinin
2024-08-07 23:36:46 +03:00
committed by intellij-monorepo-bot
parent 31b5122a18
commit 1c8daa89b7
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,6 +27,7 @@ import com.intellij.refactoring.extractMethod.newImpl.ExtractMethodPipeline.find
import com.intellij.refactoring.extractMethod.newImpl.ExtractMethodPipeline.selectOptionWithTargetClass
import com.intellij.refactoring.extractMethod.newImpl.ExtractMethodPipeline.withFilteredAnnotations
import com.intellij.refactoring.extractMethod.newImpl.inplace.*
import com.intellij.refactoring.extractMethod.newImpl.inplace.InplaceExtractUtils.createGreedyRangeMarker
import com.intellij.refactoring.extractMethod.newImpl.parameterObject.ResultObjectExtractor
import com.intellij.refactoring.extractMethod.newImpl.structures.ExtractOptions
import com.intellij.refactoring.listeners.RefactoringEventData
@@ -85,7 +86,12 @@ class MethodExtractor {
}
val prepareStart = System.currentTimeMillis()
val descriptorsForAllTargetPlaces = prepareDescriptorsForAllTargetPlaces(file.project, editor, elements)
readAction { JavaDuplicatesFinder.linkCopiedClassMembersWithOrigin(file) }
val copiedFile = readAction { file.copy() as PsiFile }
val elementsInCopy = readAction { ExtractSelector().suggestElementsToExtract(copiedFile, range) }
val descriptorsForAllTargetPlaces = prepareDescriptorsForAllTargetPlaces(file.project, editor, elementsInCopy)
if (descriptorsForAllTargetPlaces.isEmpty()) return
val preparePlacesTime = System.currentTimeMillis() - prepareStart
@@ -95,7 +101,9 @@ class MethodExtractor {
val guessedNames = readAction { suggestSafeMethodNames(options) }
val methodName = guessedNames.first()
val extractor = readAction {
DuplicatesMethodExtractor.create(options.targetClass, options.elements, methodName, options.isStatic)
val targetClass = PsiTreeUtil.findSameElementInCopy(options.targetClass, file)
val range = createGreedyRangeMarker(editor.document, range)
DuplicatesMethodExtractor(options.copy(methodName = methodName), targetClass, range)
}
if (EditorSettingsExternalizable.getInstance().isVariableInplaceRenameEnabled) {
val templateStart = System.currentTimeMillis()