From ab8c561e5cf6abc783bb26e447ac7397ccbf9a9d Mon Sep 17 00:00:00 2001 From: anna Date: Wed, 2 Feb 2011 13:43:10 +0100 Subject: [PATCH] replace ref quickfix checks scope (IDEA-64946) --- .../daemon/impl/quickfix/CreateFromUsageUtils.java | 2 +- .../quickFix/renameWrongReference/before2.java | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/renameWrongReference/before2.java diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateFromUsageUtils.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateFromUsageUtils.java index bb0741ccfe2d..896f642fca4e 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateFromUsageUtils.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateFromUsageUtils.java @@ -433,7 +433,7 @@ public class CreateFromUsageUtils { @Override public void visitReferenceExpression(PsiReferenceExpression expr) { if (expression instanceof PsiReferenceExpression) { - if (expr.textMatches(expression)) { + if (expr.textMatches(expression) && expr.resolve() == null) { result.add(expr); } } diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/renameWrongReference/before2.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/renameWrongReference/before2.java new file mode 100644 index 000000000000..478c0299f91d --- /dev/null +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/renameWrongReference/before2.java @@ -0,0 +1,11 @@ +// "Rename Reference" "true" +class c { + void foo(boolean b) { + if (b) { + int i = 0; + i++; + } else { + i++; + } + } +} \ No newline at end of file