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

OC-15517 PsiInvalidElementAccessException on extracting method to category, create from usage and other actions

Browse Source
This commit is contained in:
Vyacheslav Karpukhin
2017-11-05 22:24:38 +01:00
parent 445bc6b16b
commit fba1cddfd8
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/refactoring/safeDelete/SafeDeleteProcessor.java
+9 -2
View File
@@ -36,6 +36,7 @@ import com.intellij.usageView.UsageViewUtil;
import com.intellij.usages.*;
import com.intellij.util.ArrayUtil;
import com.intellij.util.IncorrectOperationException;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.containers.HashMap;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -382,8 +383,14 @@ public class SafeDeleteProcessor extends BaseRefactoringProcessor {
delegate.prepareForDeletion(element);
}
}
element.delete();
}
SmartPointerManager pointerManager = SmartPointerManager.getInstance(myProject);
List<SmartPsiElementPointer<PsiElement>> pointers = ContainerUtil.map(myElements, pointerManager::createSmartPsiElementPointer);
for (SmartPsiElementPointer<PsiElement> pointer : pointers) {
PsiElement element = pointer.getElement();
if (element != null) {
element.delete();
}
}
if (myAfterRefactoringCallback != null) myAfterRefactoringCallback.run();
} catch (IncorrectOperationException e) {