MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-02-05 08:06:56 +07:00
Code Issues Packages Projects Releases Wiki Activity

Apply 'Copy of existing static method body' fixes

Browse Source 
GitOrigin-RevId: 139c1d45abf749d40ec4e1c9004b16dea0b3a954
This commit is contained in:
Tagir Valeev
2024-07-05 15:16:10 +02:00
committed by intellij-monorepo-bot
parent e1b597714c
commit 31b989d0cd
16 changed files with 111 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
java/java-impl-refactorings/src/com/intellij/refactoring/changeClassSignature/ChangeClassSignatureProcessor.java
View File

@@ -14,6 +14,7 @@ import com.intellij.psi.search.searches.ReferencesSearch;
import com.intellij.psi.util.PsiUtil;
import com.intellij.refactoring.BaseRefactoringProcessor;
import com.intellij.refactoring.changeSignature.ChangeSignatureUtil;
import com.intellij.refactoring.extractSuperclass.ExtractSuperClassUtil;
import com.intellij.refactoring.listeners.RefactoringEventData;
import com.intellij.refactoring.util.RefactoringUIUtil;
import com.intellij.usageView.UsageInfo;
@@ -125,17 +126,13 @@ public class ChangeClassSignatureProcessor extends BaseRefactoringProcessor {
@Nullable
@Override
protected RefactoringEventData getBeforeData() {
RefactoringEventData data = new RefactoringEventData();
data.addElement(myClass);
return data;
return ExtractSuperClassUtil.createAfterData(myClass);
}
@Nullable
@Override
protected RefactoringEventData getAfterData(UsageInfo @NotNull [] usages) {
RefactoringEventData data = new RefactoringEventData();
data.addElement(myClass);
return data;
return ExtractSuperClassUtil.createAfterData(myClass);
}
private void doRefactoring(UsageInfo[] usages) throws IncorrectOperationException {

16
java/java-impl-refactorings/src/com/intellij/refactoring/move/moveMembers/MoveMembersProcessor.java
View File

@@ -10,17 +10,18 @@ import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.*;
import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.psi.search.searches.ReferencesSearch;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.psi.util.PsiUtilCore;
import com.intellij.refactoring.BaseRefactoringProcessor;
import com.intellij.refactoring.HelpID;
import com.intellij.refactoring.RefactoringBundle;
import com.intellij.refactoring.extractSuperclass.ExtractSuperClassUtil;
import com.intellij.refactoring.listeners.RefactoringEventData;
import com.intellij.refactoring.move.MoveCallback;
import com.intellij.refactoring.move.MoveMemberViewDescriptor;
import com.intellij.refactoring.util.CommonRefactoringUtil;
import com.intellij.refactoring.util.MoveRenameUsageInfo;
import com.intellij.refactoring.util.RefactoringConflictsUtil;
import com.intellij.refactoring.util.RefactoringUtil;
import com.intellij.usageView.UsageInfo;
import com.intellij.usageView.UsageViewDescriptor;
import com.intellij.usageView.UsageViewUtil;
@@ -91,9 +92,7 @@ public class MoveMembersProcessor extends BaseRefactoringProcessor {
@Override
protected @Nullable RefactoringEventData getAfterData(UsageInfo @NotNull [] usages) {
RefactoringEventData eventData = new RefactoringEventData();
eventData.addElement(myTargetClass);
return eventData;
return ExtractSuperClassUtil.createAfterData(myTargetClass);
}
private void setOptions(MoveMembersOptions dialog) {
@@ -136,7 +135,7 @@ public class MoveMembersProcessor extends BaseRefactoringProcessor {
usagesList.add(usage);
}
else {
if (!isInMovedElement(ref)) {
if (!RefactoringUtil.isInMovedElement(ref, myMembersToMove)) {
usagesList.add(new MoveMembersUsageInfo(member, ref, null, ref, psiReference));
}
}
@@ -156,13 +155,6 @@ public class MoveMembersProcessor extends BaseRefactoringProcessor {
}
}
private boolean isInMovedElement(PsiElement element) {
for (PsiMember member : myMembersToMove) {
if (PsiTreeUtil.isAncestor(member, element, false)) return true;
}
return false;
}
@Override
protected void performRefactoring(final UsageInfo @NotNull [] usages) {
PsiClass targetClass = JavaPsiFacade.getInstance(myProject).findClass(myOptions.getTargetClassName(),