From 6493c56659180e6e251467affbbcb3dd14f232e2 Mon Sep 17 00:00:00 2001 From: Dmitry Avdeev Date: Wed, 29 Aug 2012 20:10:47 +0400 Subject: [PATCH] inplace renaming with injections --- .../refactoring/rename/inplace/InplaceRefactoring.java | 2 +- .../refactoring/rename/inplace/MemberInplaceRenamer.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/InplaceRefactoring.java b/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/InplaceRefactoring.java index 67395edb926f..7f743742985f 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/InplaceRefactoring.java +++ b/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/InplaceRefactoring.java @@ -190,7 +190,7 @@ public abstract class InplaceRefactoring { return buildTemplateAndStart(refs, stringUsages, scope, containingFile); } - protected boolean notSameFile(@Nullable VirtualFile file, PsiFile containingFile) { + protected boolean notSameFile(@Nullable VirtualFile file, @NotNull PsiFile containingFile) { return !Comparing.equal(getTopLevelVirtualFile(containingFile.getViewProvider()), file); } diff --git a/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/MemberInplaceRenamer.java b/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/MemberInplaceRenamer.java index 853cf081c58d..4a86b817e16a 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/MemberInplaceRenamer.java +++ b/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/MemberInplaceRenamer.java @@ -125,9 +125,9 @@ public class MemberInplaceRenamer extends VariableInplaceRenamer { } @Override - protected boolean notSameFile(@Nullable VirtualFile file, PsiFile containingFile) { + protected boolean notSameFile(@Nullable VirtualFile file, @NotNull PsiFile containingFile) { final PsiFile currentFile = PsiDocumentManager.getInstance(myProject).getPsiFile(myEditor.getDocument()); - return currentFile == null || containingFile != currentFile; + return currentFile == null || InjectedLanguageUtil.getTopLevelFile(containingFile) != InjectedLanguageUtil.getTopLevelFile(currentFile); } @Override