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

typo (IDEADEV-41471)

Browse Source
This commit is contained in:
anna
2009-11-26 21:16:22 +03:00
parent 97d29be17f
commit c51ac96762
5 changed files with 60 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-tests/testData/refactoring/renameLocal/RenameInPlaceQualifyFieldReference.java
+6
View File
@@ -0,0 +1,6 @@
class Test {
int myI;
void foo(int <caret>i){
myI = i;
}
}
java/java-tests/testData/refactoring/renameLocal/RenameInPlaceQualifyFieldReference_after.java
+6
View File
@@ -0,0 +1,6 @@
class Test {
int myI;
void foo(int i){
this.myI = i;
}
}
java/java-tests/testSrc/com/intellij/refactoring/RenameLocalTest.java
+46 -4
View File
@@ -1,10 +1,19 @@
package com.intellij.refactoring;
import com.intellij.codeInsight.TargetElementUtilBase;
import com.intellij.psi.PsiElement;
import com.intellij.refactoring.rename.RenameProcessor;
import com.intellij.testFramework.LightCodeInsightTestCase;
import com.intellij.JavaTestUtil;
import com.intellij.codeInsight.TargetElementUtilBase;
import com.intellij.codeInsight.lookup.LookupManager;
import com.intellij.codeInsight.lookup.impl.TestLookupManager;
import com.intellij.codeInsight.template.TemplateManager;
import com.intellij.codeInsight.template.impl.TemplateManagerImpl;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiMethod;
import com.intellij.psi.PsiNameIdentifierOwner;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.refactoring.rename.RenameProcessor;
import com.intellij.refactoring.rename.inplace.ResolveSnapshotProvider;
import com.intellij.refactoring.rename.inplace.VariableInplaceRenamer;
import com.intellij.testFramework.LightCodeInsightTestCase;
/**
* @author ven
@@ -37,4 +46,37 @@ public class RenameLocalTest extends LightCodeInsightTestCase {
new RenameProcessor(getProject(), element, newName, true, true).run();
checkResultByFile(BASE_PATH + getTestName(false) + "_after.java");
}
public void testRenameInPlaceQualifyFieldReference() throws Exception {
doTestInplaceRenameCollisionsResolved("myI");
}
//reference itself won't be renamed
private void doTestInplaceRenameCollisionsResolved(String newName) throws Exception {
configureByFile(BASE_PATH + "/" + getTestName(false) + ".java");
PsiElement element = TargetElementUtilBase.findTargetElement(myEditor, TargetElementUtilBase.ELEMENT_NAME_ACCEPTED);
assertNotNull(element);
final PsiMethod methodScope = PsiTreeUtil.getParentOfType(element, PsiMethod.class);
assertNotNull(methodScope);
ResolveSnapshotProvider resolveSnapshotProvider = VariableInplaceRenamer.INSTANCE.forLanguage(getFile().getLanguage());
assertNotNull(resolveSnapshotProvider);
final ResolveSnapshotProvider.ResolveSnapshot snapshot = resolveSnapshotProvider.createSnapshot(methodScope);
assertNotNull(snapshot);
VariableInplaceRenamer renamer = new VariableInplaceRenamer((PsiNameIdentifierOwner)element, getEditor());
((TemplateManagerImpl)TemplateManager.getInstance(getProject())).setTemplateTesting(true);
try {
renamer.performInplaceRename();
}
finally {
renamer.finish();
snapshot.apply(newName);
TemplateManagerImpl.getTemplateState(myEditor).gotoEnd();
((TestLookupManager)LookupManager.getInstance(getProject())).clearLookup();
((TemplateManagerImpl)TemplateManager.getInstance(getProject())).setTemplateTesting(false);
}
checkResultByFile(BASE_PATH + getTestName(false) + "_after.java");
}
}
platform/lang-impl/src/com/intellij/refactoring/rename/inplace/VariableInplaceRenamer.java
+1 -1
View File
@@ -66,7 +66,7 @@ import java.util.Map;
*/
public class VariableInplaceRenamer {
private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.rename.inplace.VariableInplaceRenamer");
private static final LanguageExtension<ResolveSnapshotProvider> INSTANCE = new LanguageExtension<ResolveSnapshotProvider>(
public static final LanguageExtension<ResolveSnapshotProvider> INSTANCE = new LanguageExtension<ResolveSnapshotProvider>(
"com.intellij.rename.inplace.resolveSnapshotProvider"
);
resources/src/META-INF/IdeaPlugin.xml
+1 -1
View File
@@ -987,7 +987,7 @@
<renameHandler implementation="com.intellij.refactoring.rename.DirectoryAsPackageRenameHandler"/>
<rename.inplace.resolveSnapshotProvider
language="Java"
language="JAVA"
implementationClass="com.intellij.refactoring.rename.inplace.JavaResolveSnapshotProvider"
/>
<updateAddedFileProcessor implementation="com.intellij.psi.impl.file.JavaUpdateAddedFileProcessor"/>