From 444bd57c0440ee43ce99e7d3bdb9539c8242aa71 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Sat, 2 Aug 2008 19:05:24 +0400 Subject: [PATCH] fix test: correct condition for qualifying call to outer class method --- .../codeInsight/daemon/impl/quickfix/CreateMethodFromUsageFix.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/CreateMethodFromUsageFix.java b/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/CreateMethodFromUsageFix.java index 5a1aa73243..499d9246eb 100644 --- a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/CreateMethodFromUsageFix.java +++ b/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/CreateMethodFromUsageFix.java @@ -1,7 +1,7 @@ package com.intellij.codeInsight.daemon.impl.quickfix; -import com.intellij.codeInsight.ExpectedTypeInfo; import com.intellij.codeInsight.CodeInsightUtilBase; +import com.intellij.codeInsight.ExpectedTypeInfo; import com.intellij.codeInsight.daemon.QuickFixBundle; import com.intellij.codeInsight.daemon.impl.DaemonCodeAnalyzerImpl; import com.intellij.codeInsight.daemon.impl.HighlightInfo; @@ -18,8 +18,8 @@ import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.psi.util.PsiUtil; -import com.intellij.util.IncorrectOperationException; import com.intellij.refactoring.util.FieldConflictsResolver; +import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -135,7 +135,7 @@ public class CreateMethodFromUsageFix extends CreateFromUsageBaseFix { } if (enclosingContext instanceof PsiMethod && methodName.equals(enclosingContext.getName()) && - !targetClass.equals(parentClass)) { + PsiTreeUtil.isAncestor(targetClass, parentClass, true)) { FieldConflictsResolver.qualifyReference(ref, method, null); } -- 2.11.4.GIT