MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

EA-208931 [copy classes] fix: avoid unnecessary class copy when rename is not needed

Browse Source 
GitOrigin-RevId: 26f511ea09c2c42fe09a4981e59027da61e063e0
This commit is contained in:
Alexandr Suhinin
2021-08-03 06:43:16 +00:00
committed by intellij-monorepo-bot
parent a31df03d00
commit 9df30d7d78
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/refactoring/copy/CopyClassesHandler.java
+10 -7
View File
@@ -374,9 +374,14 @@ public class CopyClassesHandler extends CopyHandlerDelegateBase {
}
for (final Map.Entry<PsiClass, PsiClass> classEntry : sourceToDestination.entrySet()) {
final PsiClass copy = copy(classEntry.getKey(), sourceToDestination.size() > 1 ? null : copyClassName);
PsiClass newClass = WriteAction.compute(() -> (PsiClass) classEntry.getValue().replace(copy));
oldToNewMap.put(classEntry.getKey(), newClass);
if (copyClassName != null && sourceToDestination.size() == 1) {
final PsiClass copy = copy(classEntry.getKey(), copyClassName);
PsiClass newClass = WriteAction.compute(() -> (PsiClass) classEntry.getValue().replace(copy));
oldToNewMap.put(classEntry.getKey(), newClass);
}
else {
oldToNewMap.put(classEntry.getKey(), classEntry.getValue());
}
}
}
}
@@ -459,12 +464,10 @@ public class CopyClassesHandler extends CopyHandlerDelegateBase {
return current;
}
private static PsiClass copy(PsiClass aClass, String name) {
private static PsiClass copy(@NotNull PsiClass aClass, @NotNull String name) {
final PsiClass classNavigationElement = (PsiClass)aClass.getNavigationElement();
final PsiClass classCopy = (PsiClass)classNavigationElement.copy();
if (name != null) {
classCopy.setName(name);
}
classCopy.setName(name);
return classCopy;
}