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

ignore completely automatic renamer if conllision was found (IDEA-13684)

Browse Source
This commit is contained in:
anna
2010-01-21 18:06:05 +03:00
parent d6d72f4eeb
commit 2b5f3391b7
10 changed files with 112 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-tests/testData/refactoring/renameClass/automaticRenameVars/after/X.java
+6
View File
@@ -0,0 +1,6 @@
class Y { // rename me to Y and let the refactoring rename the variables too.
void foo(Y y) {
String yz = "asdf";
System.out.println("x: " + y + yz);
}
}
java/java-tests/testData/refactoring/renameClass/automaticRenameVars/before/X.java
+6
View File
@@ -0,0 +1,6 @@
class XX { // rename me to Y and let the refactoring rename the variables too.
void foo(XX xx) {
String yz = "asdf";
System.out.println("x: " + xx + yz);
}
}
java/java-tests/testData/refactoring/renameClass/automaticRenameVarsCollision/after/X.java
+6
View File
@@ -0,0 +1,6 @@
class Y { // rename me to Y and let the refactoring rename the variables too.
void foo(Y x) {
String y = "asdf";
System.out.println("x: " + x + y);
}
}
java/java-tests/testData/refactoring/renameClass/automaticRenameVarsCollision/before/X.java
+6
View File
@@ -0,0 +1,6 @@
class XX { // rename me to Y and let the refactoring rename the variables too.
void foo(XX x) {
String y = "asdf";
System.out.println("x: " + x + y);
}
}
java/java-tests/testData/refactoring/renameLocal/RenameInPlaceParamInOverriderAutomaticRenamerConflict.java
+14
View File
@@ -0,0 +1,14 @@
public class Test {
int myI;
void foo(int <caret>i){
myI = i;
}
}
class TestImpl extends Test {
void foo(int i){
super.foo(i);
int pp = 0;
System.out.println(pp);
}
}
java/java-tests/testData/refactoring/renameLocal/RenameInPlaceParamInOverriderAutomaticRenamerConflict_after.java
+14
View File
@@ -0,0 +1,14 @@
public class Test {
int myI;
void foo(int i){
myI = i;
}
}
class TestImpl extends Test {
void foo(int i){
super.foo(i);
int pp = 0;
System.out.println(pp);
}
}
java/java-tests/testSrc/com/intellij/refactoring/RenameClassTest.java
+35 -2
View File
@@ -1,14 +1,18 @@
package com.intellij.refactoring;
import com.intellij.JavaTestUtil;
import com.intellij.openapi.extensions.Extensions;
import com.intellij.openapi.fileEditor.FileDocumentManager;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.openapi.projectRoots.Sdk;
import com.intellij.openapi.projectRoots.impl.JavaSdkImpl;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.PsiClass;
import com.intellij.psi.PsiDocumentManager;
import com.intellij.psi.PsiNamedElement;
import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.refactoring.rename.RenameProcessor;
import com.intellij.JavaTestUtil;
import com.intellij.refactoring.rename.naming.AutomaticRenamer;
import com.intellij.refactoring.rename.naming.AutomaticRenamerFactory;
import org.jetbrains.annotations.NonNls;
public class RenameClassTest extends MultiFileTestCase {
@@ -49,6 +53,35 @@ public class RenameClassTest extends MultiFileTestCase {
doTest("pack1.A", "Object");
}
public void testAutomaticRenameVars() throws Exception {
doTest(new PerformAction() {
public void performAction(VirtualFile rootDir, VirtualFile rootAfter) throws Exception {
PsiClass aClass = myJavaFacade.findClass("XX", GlobalSearchScope.allScope(getProject()));
assertNotNull("Class XX not found", aClass);
final RenameProcessor processor = new RenameProcessor(myProject, aClass, "Y", true, true) {
@Override
protected boolean showAutomaticRenamingDialog(AutomaticRenamer automaticVariableRenamer) {
for (PsiNamedElement element : automaticVariableRenamer.getElements()) {
automaticVariableRenamer.setRename(element, automaticVariableRenamer.getNewName(element));
}
return true;
}
};
for (AutomaticRenamerFactory factory : Extensions.getExtensions(AutomaticRenamerFactory.EP_NAME)) {
processor.addRenamerFactory(factory);
}
processor.run();
PsiDocumentManager.getInstance(myProject).commitAllDocuments();
FileDocumentManager.getInstance().saveAllDocuments();
}
});
}
public void testAutomaticRenameVarsCollision() throws Exception {
doTest("XX", "Y");
}
private void doTest(@NonNls final String qClassName, @NonNls final String newName) throws Exception {
doTest(new PerformAction() {
public void performAction(VirtualFile rootDir, VirtualFile rootAfter) throws Exception {
java/java-tests/testSrc/com/intellij/refactoring/RenameLocalTest.java
+7 -3
View File
@@ -48,15 +48,19 @@ public class RenameLocalTest extends LightCodeInsightTestCase {
}
public void testRenameInPlaceQualifyFieldReference() throws Exception {
doTestInplaceRenameCollisionsResolved("myI");
doTestInplaceRename("myI");
}
public void testRenameInPlaceParamInOverriderAutomaticRenamer() throws Exception {
doTestInplaceRenameCollisionsResolved("pp");
doTestInplaceRename("pp");
}
public void testRenameInPlaceParamInOverriderAutomaticRenamerConflict() throws Exception {
doTestInplaceRename("pp");
}
//reference itself won't be renamed
private void doTestInplaceRenameCollisionsResolved(String newName) throws Exception {
private void doTestInplaceRename(String newName) throws Exception {
configureByFile(BASE_PATH + "/" + getTestName(false) + ".java");
PsiElement element = TargetElementUtilBase.findTargetElement(myEditor, TargetElementUtilBase.ELEMENT_NAME_ACCEPTED);
assertNotNull(element);
platform/lang-impl/src/com/intellij/refactoring/rename/RenameProcessor.java
+17 -14
View File
@@ -134,6 +134,15 @@ public class RenameProcessor extends BaseRefactoringProcessor {
final List<UsageInfo> variableUsages = new ArrayList<UsageInfo>();
if (!myRenamers.isEmpty()) {
if (!findRenamedVariables(variableUsages)) return false;
for (final AutomaticRenamer renamer : myRenamers) {
final List<? extends PsiNamedElement> variables = renamer.getElements();
for (final PsiNamedElement variable : variables) {
final String newName = renamer.getNewName(variable);
if (newName != null) {
addElement(variable, newName);
}
}
}
}
if (!variableUsages.isEmpty()) {
@@ -148,22 +157,10 @@ public class RenameProcessor extends BaseRefactoringProcessor {
private boolean findRenamedVariables(final List<UsageInfo> variableUsages) {
for (final AutomaticRenamer automaticVariableRenamer : myRenamers) {
if (!automaticVariableRenamer.hasAnythingToRename()) continue;
final AutomaticRenamingDialog dialog = new AutomaticRenamingDialog(myProject, automaticVariableRenamer);
dialog.show();
if (!dialog.isOK()) return false;
if (!showAutomaticRenamingDialog(automaticVariableRenamer)) return false;
}
for (final AutomaticRenamer renamer : myRenamers) {
final List<? extends PsiNamedElement> variables = renamer.getElements();
for (final PsiNamedElement variable : variables) {
final String newName = renamer.getNewName(variable);
if (newName != null) {
addElement(variable, newName);
}
}
}
Runnable runnable = new Runnable() {
final Runnable runnable = new Runnable() {
public void run() {
for (final AutomaticRenamer renamer : myRenamers) {
renamer.findUsages(variableUsages, mySearchInComments, mySearchTextOccurrences);
@@ -175,6 +172,12 @@ public class RenameProcessor extends BaseRefactoringProcessor {
.runProcessWithProgressSynchronously(runnable, RefactoringBundle.message("searching.for.variables"), true, myProject);
}
protected boolean showAutomaticRenamingDialog(AutomaticRenamer automaticVariableRenamer) {
final AutomaticRenamingDialog dialog = new AutomaticRenamingDialog(myProject, automaticVariableRenamer);
dialog.show();
return dialog.isOK();
}
public void addElement(@NotNull PsiElement element, @NotNull String newName) {
myAllRenames.put(element, newName);
}
platform/lang-impl/src/com/intellij/refactoring/rename/inplace/VariableInplaceRenamer.java
+1 -1
View File
@@ -260,7 +260,7 @@ public class VariableInplaceRenamer {
}
final UsageInfo[] usageInfos = usages.toArray(new UsageInfo[usages.size()]);
for (final PsiNamedElement element : renamer.getRenames().keySet()) {
for (final PsiNamedElement element : renamer.getElements()) {
ApplicationManager.getApplication().runWriteAction(new Runnable() {
public void run() {
RenameUtil.doRenameGenericNamedElement(element, renamer.getRenames().get(element), RenameProcessor.extractUsagesForElement(element, usageInfos), null);