From e2dd5682dff0d5e13c19c62f811ae5b97edeee66 Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Mon, 6 Jan 2020 20:29:52 +0100 Subject: [PATCH] rename: proceed renaming when one call site throws an exception (IDEA-230192) the name of the member is already set anyway GitOrigin-RevId: c5bfc0c297dd5ecda7df128eabe93998efeb08b7 --- .../refactoring/rename/RenameJavaClassProcessor.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/java/java-impl/src/com/intellij/refactoring/rename/RenameJavaClassProcessor.java b/java/java-impl/src/com/intellij/refactoring/rename/RenameJavaClassProcessor.java index 7ba24e5c544b..2e11242d9ea9 100644 --- a/java/java-impl/src/com/intellij/refactoring/rename/RenameJavaClassProcessor.java +++ b/java/java-impl/src/com/intellij/refactoring/rename/RenameJavaClassProcessor.java @@ -3,6 +3,7 @@ package com.intellij.refactoring.rename; import com.intellij.codeInsight.ChangeContextUtil; import com.intellij.openapi.diagnostic.Logger; +import com.intellij.openapi.progress.ProcessCanceledException; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Comparing; import com.intellij.openapi.util.Pair; @@ -85,6 +86,12 @@ public class RenameJavaClassProcessor extends RenamePsiElementProcessor { catch (IncorrectOperationException e) {//fall back to old scheme ref.handleElementRename(newName); } + catch (ProcessCanceledException e) { + throw e; + } + catch (Throwable e) { + LOG.error(e); + } } }