From 7c05fd210a2431bb98991401347b8206cdd00a7c Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Mon, 16 Jun 2014 14:55:54 +0400 Subject: [PATCH] Update to idea/138.628 --- .../jet/plugin/JetLightCodeInsightFixtureTestCase.java | 6 +++--- .../jetbrains/jet/plugin/KotlinCodeInsightTestCase.java | 5 +++-- .../org/jetbrains/jet/plugin/KotlinCompletionTestCase.java | 5 +++-- .../jetbrains/jet/plugin/KotlinDaemonAnalyzerTestCase.java | 5 +++-- .../jetbrains/jet/plugin/KotlinHierarchyViewTestBase.java | 5 +++-- .../jetbrains/jet/plugin/KotlinLightQuickFixTestCase.java | 5 +++-- .../jet/resolve/AbstractReferenceResolveTest.java | 7 +++---- update_dependencies.xml | 4 ++-- 8 files changed, 23 insertions(+), 19 deletions(-) diff --git a/idea/tests/org/jetbrains/jet/plugin/JetLightCodeInsightFixtureTestCase.java b/idea/tests/org/jetbrains/jet/plugin/JetLightCodeInsightFixtureTestCase.java index 7b9af81a415..24f363d9aa8 100644 --- a/idea/tests/org/jetbrains/jet/plugin/JetLightCodeInsightFixtureTestCase.java +++ b/idea/tests/org/jetbrains/jet/plugin/JetLightCodeInsightFixtureTestCase.java @@ -22,7 +22,7 @@ import com.intellij.openapi.actionSystem.ex.ActionManagerEx; import com.intellij.openapi.editor.ex.EditorEx; import com.intellij.openapi.startup.StartupManager; import com.intellij.openapi.util.io.FileUtil; -import com.intellij.openapi.vfs.newvfs.impl.VirtualDirectoryImpl; +import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess; import com.intellij.psi.FileViewProvider; import com.intellij.psi.PsiManager; import com.intellij.psi.impl.PsiManagerEx; @@ -46,12 +46,12 @@ public abstract class JetLightCodeInsightFixtureTestCase extends LightCodeInsigh protected void setUp() throws Exception { super.setUp(); ((StartupManagerImpl) StartupManager.getInstance(getProject())).runPostStartupActivities(); - VirtualDirectoryImpl.allowRootAccess(JetTestCaseBuilder.getHomeDirectory()); + VfsRootAccess.allowRootAccess(JetTestCaseBuilder.getHomeDirectory()); } @Override protected void tearDown() throws Exception { - VirtualDirectoryImpl.disallowRootAccess(JetTestCaseBuilder.getHomeDirectory()); + VfsRootAccess.disallowRootAccess(JetTestCaseBuilder.getHomeDirectory()); Set builtInsSources = getProject().getComponent(BuiltInsReferenceResolver.class).getBuiltInsSources(); FileManager fileManager = ((PsiManagerEx) PsiManager.getInstance(getProject())).getFileManager(); diff --git a/idea/tests/org/jetbrains/jet/plugin/KotlinCodeInsightTestCase.java b/idea/tests/org/jetbrains/jet/plugin/KotlinCodeInsightTestCase.java index 2318dcc8e7b..d63eee634f4 100644 --- a/idea/tests/org/jetbrains/jet/plugin/KotlinCodeInsightTestCase.java +++ b/idea/tests/org/jetbrains/jet/plugin/KotlinCodeInsightTestCase.java @@ -17,6 +17,7 @@ package org.jetbrains.jet.plugin; import com.intellij.codeInsight.CodeInsightTestCase; +import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess; import com.intellij.openapi.vfs.newvfs.impl.VirtualDirectoryImpl; import org.jetbrains.jet.JetTestCaseBuilder; @@ -24,12 +25,12 @@ public abstract class KotlinCodeInsightTestCase extends CodeInsightTestCase { @Override protected void setUp() throws Exception { super.setUp(); - VirtualDirectoryImpl.allowRootAccess(JetTestCaseBuilder.getHomeDirectory()); + VfsRootAccess.allowRootAccess(JetTestCaseBuilder.getHomeDirectory()); } @Override protected void tearDown() throws Exception { - VirtualDirectoryImpl.disallowRootAccess(JetTestCaseBuilder.getHomeDirectory()); + VfsRootAccess.disallowRootAccess(JetTestCaseBuilder.getHomeDirectory()); super.tearDown(); } } diff --git a/idea/tests/org/jetbrains/jet/plugin/KotlinCompletionTestCase.java b/idea/tests/org/jetbrains/jet/plugin/KotlinCompletionTestCase.java index 620ae5b692e..6a8f36617a2 100644 --- a/idea/tests/org/jetbrains/jet/plugin/KotlinCompletionTestCase.java +++ b/idea/tests/org/jetbrains/jet/plugin/KotlinCompletionTestCase.java @@ -17,6 +17,7 @@ package org.jetbrains.jet.plugin; import com.intellij.codeInsight.completion.CompletionTestCase; +import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess; import com.intellij.openapi.vfs.newvfs.impl.VirtualDirectoryImpl; import org.jetbrains.jet.JetTestCaseBuilder; @@ -24,12 +25,12 @@ abstract public class KotlinCompletionTestCase extends CompletionTestCase { @Override protected void setUp() throws Exception { super.setUp(); - VirtualDirectoryImpl.allowRootAccess(JetTestCaseBuilder.getHomeDirectory()); + VfsRootAccess.allowRootAccess(JetTestCaseBuilder.getHomeDirectory()); } @Override protected void tearDown() throws Exception { - VirtualDirectoryImpl.disallowRootAccess(JetTestCaseBuilder.getHomeDirectory()); + VfsRootAccess.disallowRootAccess(JetTestCaseBuilder.getHomeDirectory()); super.tearDown(); } } diff --git a/idea/tests/org/jetbrains/jet/plugin/KotlinDaemonAnalyzerTestCase.java b/idea/tests/org/jetbrains/jet/plugin/KotlinDaemonAnalyzerTestCase.java index e888d2fa2e5..e8d22e64ad2 100644 --- a/idea/tests/org/jetbrains/jet/plugin/KotlinDaemonAnalyzerTestCase.java +++ b/idea/tests/org/jetbrains/jet/plugin/KotlinDaemonAnalyzerTestCase.java @@ -17,6 +17,7 @@ package org.jetbrains.jet.plugin; import com.intellij.codeInsight.daemon.DaemonAnalyzerTestCase; +import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess; import com.intellij.openapi.vfs.newvfs.impl.VirtualDirectoryImpl; import org.jetbrains.jet.JetTestCaseBuilder; @@ -24,12 +25,12 @@ abstract public class KotlinDaemonAnalyzerTestCase extends DaemonAnalyzerTestCas @Override protected void setUp() throws Exception { super.setUp(); - VirtualDirectoryImpl.allowRootAccess(JetTestCaseBuilder.getHomeDirectory()); + VfsRootAccess.allowRootAccess(JetTestCaseBuilder.getHomeDirectory()); } @Override protected void tearDown() throws Exception { - VirtualDirectoryImpl.disallowRootAccess(JetTestCaseBuilder.getHomeDirectory()); + VfsRootAccess.disallowRootAccess(JetTestCaseBuilder.getHomeDirectory()); super.tearDown(); } } diff --git a/idea/tests/org/jetbrains/jet/plugin/KotlinHierarchyViewTestBase.java b/idea/tests/org/jetbrains/jet/plugin/KotlinHierarchyViewTestBase.java index d80044b4fc2..ee96f1cf479 100644 --- a/idea/tests/org/jetbrains/jet/plugin/KotlinHierarchyViewTestBase.java +++ b/idea/tests/org/jetbrains/jet/plugin/KotlinHierarchyViewTestBase.java @@ -16,6 +16,7 @@ package org.jetbrains.jet.plugin; +import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess; import com.intellij.openapi.vfs.newvfs.impl.VirtualDirectoryImpl; import com.intellij.testFramework.codeInsight.hierarchy.HierarchyViewTestBase; import org.jetbrains.jet.JetTestCaseBuilder; @@ -24,12 +25,12 @@ public abstract class KotlinHierarchyViewTestBase extends HierarchyViewTestBase @Override protected void setUp() throws Exception { super.setUp(); - VirtualDirectoryImpl.allowRootAccess(JetTestCaseBuilder.getHomeDirectory()); + VfsRootAccess.allowRootAccess(JetTestCaseBuilder.getHomeDirectory()); } @Override protected void tearDown() throws Exception { - VirtualDirectoryImpl.disallowRootAccess(JetTestCaseBuilder.getHomeDirectory()); + VfsRootAccess.disallowRootAccess(JetTestCaseBuilder.getHomeDirectory()); super.tearDown(); } } diff --git a/idea/tests/org/jetbrains/jet/plugin/KotlinLightQuickFixTestCase.java b/idea/tests/org/jetbrains/jet/plugin/KotlinLightQuickFixTestCase.java index c5ab558f2a5..9e8809eb7c2 100644 --- a/idea/tests/org/jetbrains/jet/plugin/KotlinLightQuickFixTestCase.java +++ b/idea/tests/org/jetbrains/jet/plugin/KotlinLightQuickFixTestCase.java @@ -17,6 +17,7 @@ package org.jetbrains.jet.plugin; import com.intellij.codeInsight.daemon.quickFix.LightQuickFixTestCase; +import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess; import com.intellij.openapi.vfs.newvfs.impl.VirtualDirectoryImpl; import org.jetbrains.jet.JetTestCaseBuilder; @@ -24,12 +25,12 @@ abstract public class KotlinLightQuickFixTestCase extends LightQuickFixTestCase @Override protected void setUp() throws Exception { super.setUp(); - VirtualDirectoryImpl.allowRootAccess(JetTestCaseBuilder.getHomeDirectory()); + VfsRootAccess.allowRootAccess(JetTestCaseBuilder.getHomeDirectory()); } @Override protected void tearDown() throws Exception { - VirtualDirectoryImpl.disallowRootAccess(JetTestCaseBuilder.getHomeDirectory()); + VfsRootAccess.disallowRootAccess(JetTestCaseBuilder.getHomeDirectory()); super.tearDown(); } } diff --git a/idea/tests/org/jetbrains/jet/resolve/AbstractReferenceResolveTest.java b/idea/tests/org/jetbrains/jet/resolve/AbstractReferenceResolveTest.java index c6587b8e488..e884edb4c41 100644 --- a/idea/tests/org/jetbrains/jet/resolve/AbstractReferenceResolveTest.java +++ b/idea/tests/org/jetbrains/jet/resolve/AbstractReferenceResolveTest.java @@ -20,7 +20,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Ordering; import com.intellij.ide.startup.impl.StartupManagerImpl; import com.intellij.openapi.startup.StartupManager; -import com.intellij.openapi.vfs.newvfs.impl.VirtualDirectoryImpl; +import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess; import com.intellij.psi.*; import com.intellij.psi.impl.PsiManagerEx; import com.intellij.psi.impl.file.impl.FileManager; @@ -36,7 +36,6 @@ import org.jetbrains.jet.plugin.references.BuiltInsReferenceResolver; import org.jetbrains.jet.test.util.UtilPackage; import org.jetbrains.jet.testing.ReferenceUtils; -import java.io.File; import java.util.List; import java.util.Set; @@ -66,12 +65,12 @@ public abstract class AbstractReferenceResolveTest extends LightPlatformCodeInsi protected void setUp() throws Exception { super.setUp(); ((StartupManagerImpl) StartupManager.getInstance(getProject())).runPostStartupActivities(); - VirtualDirectoryImpl.allowRootAccess(JetTestCaseBuilder.getHomeDirectory()); + VfsRootAccess.allowRootAccess(JetTestCaseBuilder.getHomeDirectory()); } @Override protected void tearDown() throws Exception { - VirtualDirectoryImpl.disallowRootAccess(JetTestCaseBuilder.getHomeDirectory()); + VfsRootAccess.disallowRootAccess(JetTestCaseBuilder.getHomeDirectory()); Set builtInsSources = getProject().getComponent(BuiltInsReferenceResolver.class).getBuiltInsSources(); FileManager fileManager = ((PsiManagerEx) PsiManager.getInstance(getProject())).getFileManager(); diff --git a/update_dependencies.xml b/update_dependencies.xml index 72f1d766947..fc95a87b540 100644 --- a/update_dependencies.xml +++ b/update_dependencies.xml @@ -1,6 +1,6 @@ - - + +