diff --git a/java/java-impl/src/com/intellij/refactoring/inline/InlineConstantFieldProcessor.java b/java/java-impl/src/com/intellij/refactoring/inline/InlineConstantFieldProcessor.java index e8a94e02374a..ac1ab26c57a5 100644 --- a/java/java-impl/src/com/intellij/refactoring/inline/InlineConstantFieldProcessor.java +++ b/java/java-impl/src/com/intellij/refactoring/inline/InlineConstantFieldProcessor.java @@ -105,7 +105,13 @@ public class InlineConstantFieldProcessor extends BaseRefactoringProcessor { usages.add(info); } if (mySearchInCommentsAndStrings || mySearchForTextOccurrences) { - TextOccurrencesUtil.UsageInfoFactory nonCodeUsageFactory = new NonCodeUsageInfoFactory(myField, myField.getName()); + TextOccurrencesUtil.UsageInfoFactory nonCodeUsageFactory = new NonCodeUsageInfoFactory(myField, myField.getName()){ + @Override + public UsageInfo createUsageInfo(@NotNull PsiElement usage, int startOffset, int endOffset) { + if (PsiTreeUtil.isAncestor(myField, usage, false)) return null; + return super.createUsageInfo(usage, startOffset, endOffset); + } + }; if (mySearchInCommentsAndStrings) { String stringToSearch = ElementDescriptionUtil.getElementDescription(myField, NonCodeSearchDescriptionLocation.STRINGS_AND_COMMENTS); diff --git a/java/java-impl/src/com/intellij/refactoring/inline/InlineMethodProcessor.java b/java/java-impl/src/com/intellij/refactoring/inline/InlineMethodProcessor.java index 873ebab9d542..ce76e8bc97a0 100644 --- a/java/java-impl/src/com/intellij/refactoring/inline/InlineMethodProcessor.java +++ b/java/java-impl/src/com/intellij/refactoring/inline/InlineMethodProcessor.java @@ -131,16 +131,22 @@ public class InlineMethodProcessor extends BaseRefactoringProcessor { } if (mySearchInComments || mySearchForTextOccurrences) { - + final NonCodeUsageInfoFactory infoFactory = new NonCodeUsageInfoFactory(myMethod, myMethod.getName()) { + @Override + public UsageInfo createUsageInfo(@NotNull PsiElement usage, int startOffset, int endOffset) { + if (PsiTreeUtil.isAncestor(myMethod, usage, false)) return null; + return super.createUsageInfo(usage, startOffset, endOffset); + } + }; if (mySearchInComments) { String stringToSearch = ElementDescriptionUtil.getElementDescription(myMethod, NonCodeSearchDescriptionLocation.STRINGS_AND_COMMENTS); - TextOccurrencesUtil.addUsagesInStringsAndComments(myMethod, stringToSearch, usages, new NonCodeUsageInfoFactory(myMethod, myMethod.getName())); + TextOccurrencesUtil.addUsagesInStringsAndComments(myMethod, stringToSearch, usages, infoFactory); } if (mySearchForTextOccurrences) { String stringToSearch = ElementDescriptionUtil.getElementDescription(myMethod, NonCodeSearchDescriptionLocation.NON_JAVA); TextOccurrencesUtil - .addTextOccurences(myMethod, stringToSearch, GlobalSearchScope.projectScope(myProject), usages, new NonCodeUsageInfoFactory(myMethod, myMethod.getName())); + .addTextOccurences(myMethod, stringToSearch, GlobalSearchScope.projectScope(myProject), usages, infoFactory); } }