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

rename: use simple rename when reference is resolved (IDEA-72876)

Browse Source
This commit is contained in:
anna
2011-08-05 12:05:05 +04:00
parent 4866e1307b
commit 1d34a95b0f
3 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateFromUsageUtils.java
View File

@@ -470,7 +470,9 @@ public class CreateFromUsageUtils {
}
};
parent.accept(visitor);
if (parent != null) {
parent.accept(visitor);
}
return result.toArray(new PsiReferenceExpression[result.size()]);
}

2
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/RenameWrongRefFix.java
View File

@@ -74,7 +74,7 @@ public class RenameWrongRefFix implements IntentionAction {
return false;
}
return !CreateFromUsageUtils.isValidReference(myRefExpr, false);
return !CreateFromUsageUtils.isValidReference(myRefExpr, false) && CreateFromUsageUtils.collectExpressions(myRefExpr, PsiMember.class, PsiFile.class).length > 0;
}
private class ReferenceNameExpression extends Expression {

9
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/renameWrongReference/beforeResolvedMethod.java Normal file
View File

@@ -0,0 +1,9 @@
// "Rename Reference" "false"
class Foo {
void bar(int x) {
}
void buzz() {
b<caret>ar(); // Try to rename bar with Shift+F6
}
}