MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-10 13:17:09 +07:00
Code Issues Packages Projects Releases Wiki Activity

inplace rename: static context processing (IDEA-81427)

Browse Source
This commit is contained in:
anna
2012-02-16 18:52:24 +01:00
parent 8468832660
commit edbf9c3db0
4 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/refactoring/rename/inplace/JavaResolveSnapshot.java
+7 -2
View File
@@ -20,6 +20,7 @@ import com.intellij.openapi.editor.Document;
import com.intellij.openapi.project.Project;
import com.intellij.psi.*;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.refactoring.util.RefactoringUtil;
import com.intellij.util.IncorrectOperationException;
import com.intellij.util.containers.HashMap;
import org.jetbrains.annotations.NonNls;
@@ -79,8 +80,12 @@ class JavaResolveSnapshot extends ResolveSnapshotProvider.ResolveSnapshot {
PsiTreeUtil.isAncestor(refereeClass, referentClass, false)) {
if (refereeClass == referentClass ||
refereeClass.getName() != null) { //otherwise cannot qualify anonymous referee class
@NonNls String qualifer = refereeClass == referentClass ? "this" :
refereeClass.getName() + ".this";
@NonNls String qualifer;
if (RefactoringUtil.isInStaticContext(ref, refereeClass)) {
qualifer = refereeClass.getName();
} else {
qualifer = refereeClass == referentClass ? "this" : refereeClass.getName() + ".this";
}
String qualifiedRefText = qualifer + "." + ref.getText();
PsiElementFactory elementFactory = JavaPsiFacade.getInstance(referentClass.getProject()).getElementFactory();
try {