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-83039 - NPE: RenameProcessor.doRun

Browse Source
This commit is contained in:
Anna Kozlova
2016-06-01 21:19:15 +03:00
parent 35ac4650c8
commit e08ec42d4b
1 changed files with 3 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/refactoring/rename/RenameProcessor.java
+3 -16
View File
@@ -49,7 +49,6 @@ import com.intellij.refactoring.util.RelatedUsageInfo;
import com.intellij.usageView.UsageInfo;
import com.intellij.usageView.UsageViewDescriptor;
import com.intellij.usageView.UsageViewUtil;
import com.intellij.util.Function;
import com.intellij.util.IncorrectOperationException;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.containers.MultiMap;
@@ -66,7 +65,7 @@ public class RenameProcessor extends BaseRefactoringProcessor {
protected final LinkedHashMap<PsiElement, String> myAllRenames = new LinkedHashMap<PsiElement, String>();
private PsiElement myPrimaryElement;
private @NotNull PsiElement myPrimaryElement;
private String myNewName = null;
private boolean mySearchInComments;
@@ -81,7 +80,7 @@ public class RenameProcessor extends BaseRefactoringProcessor {
private final List<UnresolvableCollisionUsageInfo> mySkippedUsages = new ArrayList<UnresolvableCollisionUsageInfo>();
public RenameProcessor(Project project,
PsiElement element,
@NotNull PsiElement element,
@NotNull @NonNls String newName,
boolean isSearchInComments,
boolean isSearchTextOccurrences) {
@@ -97,11 +96,6 @@ public class RenameProcessor extends BaseRefactoringProcessor {
setNewName(newName);
}
@Deprecated
public RenameProcessor(Project project) {
this(project, null, "", false, false);
}
public Set<PsiElement> getElements() {
return Collections.unmodifiableSet(myAllRenames.keySet());
}
@@ -262,11 +256,6 @@ public class RenameProcessor extends BaseRefactoringProcessor {
}
private void setNewName(@NotNull String newName) {
if (myPrimaryElement == null) {
myCommandName = RefactoringBundle.message("renaming.something");
return;
}
myNewName = newName;
myAllRenames.put(myPrimaryElement, newName);
myCommandName = RefactoringBundle
@@ -318,9 +307,7 @@ public class RenameProcessor extends BaseRefactoringProcessor {
@Override
protected void refreshElements(@NotNull PsiElement[] elements) {
LOG.assertTrue(elements.length > 0);
if (myPrimaryElement != null) {
myPrimaryElement = elements[0];
}
myPrimaryElement = elements[0];
final Iterator<String> newNames = myAllRenames.values().iterator();
LinkedHashMap<PsiElement, String> newAllRenames = new LinkedHashMap<PsiElement, String>();