MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

inplace renaming with injections

Browse Source
This commit is contained in:
Dmitry Avdeev
2012-08-29 20:24:09 +04:00
parent b3022b3b77
commit 6493c56659
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/refactoring/rename/inplace/InplaceRefactoring.java
+1 -1
View File
@@ -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);
}
platform/lang-impl/src/com/intellij/refactoring/rename/inplace/MemberInplaceRenamer.java
+2 -2
View File
@@ -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