Merge remote-tracking branch 'origin/master'

This commit is contained in:
Alexander Lobas
2012-06-27 18:00:16 +04:00
123 changed files with 856 additions and 447 deletions
@@ -27,7 +27,7 @@ import com.intellij.openapi.editor.ex.EditorEx;
import com.intellij.openapi.fileEditor.FileDocumentManager;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.*;
import com.intellij.psi.impl.source.tree.injected.InjectedLanguageFacadeImpl;
import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil;
import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.refactoring.PackageWrapper;
import com.intellij.refactoring.actions.RenameElementAction;
@@ -106,7 +106,7 @@ public class AndroidRenameTest extends AndroidTestCase {
protected void run() throws Throwable {
Editor editor = myFixture.getEditor();
PsiFile file = myFixture.getFile();
Editor completionEditor = InjectedLanguageFacadeImpl.getEditorForInjectedLanguageNoCommit(editor, file);
Editor completionEditor = InjectedLanguageUtil.getEditorForInjectedLanguageNoCommit(editor, file);
PsiElement element = TargetElementUtilBase.findTargetElement(completionEditor, TargetElementUtilBase.REFERENCED_ELEMENT_ACCEPTED |
TargetElementUtilBase.ELEMENT_NAME_ACCEPTED);
assert element != null;