summaryrefslogtreecommitdiff
path: root/java/testFramework/src/com/intellij/codeInsight/CodeInsightTestCase.java
diff options
context:
space:
mode:
authorTor Norbye <tnorbye@google.com>2014-08-20 17:28:18 -0700
committerTor Norbye <tnorbye@google.com>2014-08-20 17:28:18 -0700
commitd76e3920c56d37c942092b7dca20fcaded81c0a5 (patch)
tree80a55c7b59c38377216daaada4e8bc47b69ceb9a /java/testFramework/src/com/intellij/codeInsight/CodeInsightTestCase.java
parent3b37877a2561bf9fbe072253a18688807d523505 (diff)
parent1aa2e09bdbd413eacb677e9fa4b50630530d0656 (diff)
downloadidea-d76e3920c56d37c942092b7dca20fcaded81c0a5.tar.gz
Merge remote-tracking branch 'aosp/upstream-master' into merge
Conflicts: .idea/modules.xml platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdatesXmlLoader.java Change-Id: Id899dae9a1e1c79272f8a70e14a7dcef4f760d7f
Diffstat (limited to 'java/testFramework/src/com/intellij/codeInsight/CodeInsightTestCase.java')
-rw-r--r--java/testFramework/src/com/intellij/codeInsight/CodeInsightTestCase.java5
1 files changed, 0 insertions, 5 deletions
diff --git a/java/testFramework/src/com/intellij/codeInsight/CodeInsightTestCase.java b/java/testFramework/src/com/intellij/codeInsight/CodeInsightTestCase.java
index 9aee3cf51fdc..6ecec97f7fe7 100644
--- a/java/testFramework/src/com/intellij/codeInsight/CodeInsightTestCase.java
+++ b/java/testFramework/src/com/intellij/codeInsight/CodeInsightTestCase.java
@@ -537,11 +537,6 @@ public abstract class CodeInsightTestCase extends PsiTestCase {
}
}
- @Override
- public Object getData(String dataId) {
- return CommonDataKeys.EDITOR.is(dataId) ? myEditor : super.getData(dataId);
- }
-
protected VirtualFile getVirtualFile(@NonNls @NotNull String filePath) {
String fullPath = getTestDataPath() + filePath;