azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update to idea/138.628

Browse Source
This commit is contained in:
Nikolay Krasko
2014-06-16 14:55:54 +04:00
parent 71939af35f
commit 7c05fd210a
8 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/tests/org/jetbrains/jet/plugin/JetLightCodeInsightFixtureTestCase.java
+3 -3
View File
@@ -22,7 +22,7 @@ import com.intellij.openapi.actionSystem.ex.ActionManagerEx;
import com.intellij.openapi.editor.ex.EditorEx; import com.intellij.openapi.editor.ex.EditorEx;
import com.intellij.openapi.startup.StartupManager; import com.intellij.openapi.startup.StartupManager;
import com.intellij.openapi.util.io.FileUtil; 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.FileViewProvider;
import com.intellij.psi.PsiManager; import com.intellij.psi.PsiManager;
import com.intellij.psi.impl.PsiManagerEx; import com.intellij.psi.impl.PsiManagerEx;
@@ -46,12 +46,12 @@ public abstract class JetLightCodeInsightFixtureTestCase extends LightCodeInsigh
protected void setUp() throws Exception { protected void setUp() throws Exception {
super.setUp(); super.setUp();
((StartupManagerImpl) StartupManager.getInstance(getProject())).runPostStartupActivities(); ((StartupManagerImpl) StartupManager.getInstance(getProject())).runPostStartupActivities();
VirtualDirectoryImpl.allowRootAccess(JetTestCaseBuilder.getHomeDirectory()); VfsRootAccess.allowRootAccess(JetTestCaseBuilder.getHomeDirectory());
} }
@Override @Override
protected void tearDown() throws Exception { protected void tearDown() throws Exception {
VirtualDirectoryImpl.disallowRootAccess(JetTestCaseBuilder.getHomeDirectory()); VfsRootAccess.disallowRootAccess(JetTestCaseBuilder.getHomeDirectory());
Set<JetFile> builtInsSources = getProject().getComponent(BuiltInsReferenceResolver.class).getBuiltInsSources(); Set<JetFile> builtInsSources = getProject().getComponent(BuiltInsReferenceResolver.class).getBuiltInsSources();
FileManager fileManager = ((PsiManagerEx) PsiManager.getInstance(getProject())).getFileManager(); FileManager fileManager = ((PsiManagerEx) PsiManager.getInstance(getProject())).getFileManager();
idea/tests/org/jetbrains/jet/plugin/KotlinCodeInsightTestCase.java
+3 -2
View File
@@ -17,6 +17,7 @@
package org.jetbrains.jet.plugin; package org.jetbrains.jet.plugin;
import com.intellij.codeInsight.CodeInsightTestCase; import com.intellij.codeInsight.CodeInsightTestCase;
import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess;
import com.intellij.openapi.vfs.newvfs.impl.VirtualDirectoryImpl; import com.intellij.openapi.vfs.newvfs.impl.VirtualDirectoryImpl;
import org.jetbrains.jet.JetTestCaseBuilder; import org.jetbrains.jet.JetTestCaseBuilder;
@@ -24,12 +25,12 @@ public abstract class KotlinCodeInsightTestCase extends CodeInsightTestCase {
@Override @Override
protected void setUp() throws Exception { protected void setUp() throws Exception {
super.setUp(); super.setUp();
VirtualDirectoryImpl.allowRootAccess(JetTestCaseBuilder.getHomeDirectory()); VfsRootAccess.allowRootAccess(JetTestCaseBuilder.getHomeDirectory());
} }
@Override @Override
protected void tearDown() throws Exception { protected void tearDown() throws Exception {
VirtualDirectoryImpl.disallowRootAccess(JetTestCaseBuilder.getHomeDirectory()); VfsRootAccess.disallowRootAccess(JetTestCaseBuilder.getHomeDirectory());
super.tearDown(); super.tearDown();
} }
} }
idea/tests/org/jetbrains/jet/plugin/KotlinCompletionTestCase.java
+3 -2
View File
@@ -17,6 +17,7 @@
package org.jetbrains.jet.plugin; package org.jetbrains.jet.plugin;
import com.intellij.codeInsight.completion.CompletionTestCase; import com.intellij.codeInsight.completion.CompletionTestCase;
import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess;
import com.intellij.openapi.vfs.newvfs.impl.VirtualDirectoryImpl; import com.intellij.openapi.vfs.newvfs.impl.VirtualDirectoryImpl;
import org.jetbrains.jet.JetTestCaseBuilder; import org.jetbrains.jet.JetTestCaseBuilder;
@@ -24,12 +25,12 @@ abstract public class KotlinCompletionTestCase extends CompletionTestCase {
@Override @Override
protected void setUp() throws Exception { protected void setUp() throws Exception {
super.setUp(); super.setUp();
VirtualDirectoryImpl.allowRootAccess(JetTestCaseBuilder.getHomeDirectory()); VfsRootAccess.allowRootAccess(JetTestCaseBuilder.getHomeDirectory());
} }
@Override @Override
protected void tearDown() throws Exception { protected void tearDown() throws Exception {
VirtualDirectoryImpl.disallowRootAccess(JetTestCaseBuilder.getHomeDirectory()); VfsRootAccess.disallowRootAccess(JetTestCaseBuilder.getHomeDirectory());
super.tearDown(); super.tearDown();
} }
} }
idea/tests/org/jetbrains/jet/plugin/KotlinDaemonAnalyzerTestCase.java
+3 -2
View File
@@ -17,6 +17,7 @@
package org.jetbrains.jet.plugin; package org.jetbrains.jet.plugin;
import com.intellij.codeInsight.daemon.DaemonAnalyzerTestCase; import com.intellij.codeInsight.daemon.DaemonAnalyzerTestCase;
import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess;
import com.intellij.openapi.vfs.newvfs.impl.VirtualDirectoryImpl; import com.intellij.openapi.vfs.newvfs.impl.VirtualDirectoryImpl;
import org.jetbrains.jet.JetTestCaseBuilder; import org.jetbrains.jet.JetTestCaseBuilder;
@@ -24,12 +25,12 @@ abstract public class KotlinDaemonAnalyzerTestCase extends DaemonAnalyzerTestCas
@Override @Override
protected void setUp() throws Exception { protected void setUp() throws Exception {
super.setUp(); super.setUp();
VirtualDirectoryImpl.allowRootAccess(JetTestCaseBuilder.getHomeDirectory()); VfsRootAccess.allowRootAccess(JetTestCaseBuilder.getHomeDirectory());
} }
@Override @Override
protected void tearDown() throws Exception { protected void tearDown() throws Exception {
VirtualDirectoryImpl.disallowRootAccess(JetTestCaseBuilder.getHomeDirectory()); VfsRootAccess.disallowRootAccess(JetTestCaseBuilder.getHomeDirectory());
super.tearDown(); super.tearDown();
} }
} }
idea/tests/org/jetbrains/jet/plugin/KotlinHierarchyViewTestBase.java
+3 -2
View File
@@ -16,6 +16,7 @@
package org.jetbrains.jet.plugin; package org.jetbrains.jet.plugin;
import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess;
import com.intellij.openapi.vfs.newvfs.impl.VirtualDirectoryImpl; import com.intellij.openapi.vfs.newvfs.impl.VirtualDirectoryImpl;
import com.intellij.testFramework.codeInsight.hierarchy.HierarchyViewTestBase; import com.intellij.testFramework.codeInsight.hierarchy.HierarchyViewTestBase;
import org.jetbrains.jet.JetTestCaseBuilder; import org.jetbrains.jet.JetTestCaseBuilder;
@@ -24,12 +25,12 @@ public abstract class KotlinHierarchyViewTestBase extends HierarchyViewTestBase
@Override @Override
protected void setUp() throws Exception { protected void setUp() throws Exception {
super.setUp(); super.setUp();
VirtualDirectoryImpl.allowRootAccess(JetTestCaseBuilder.getHomeDirectory()); VfsRootAccess.allowRootAccess(JetTestCaseBuilder.getHomeDirectory());
} }
@Override @Override
protected void tearDown() throws Exception { protected void tearDown() throws Exception {
VirtualDirectoryImpl.disallowRootAccess(JetTestCaseBuilder.getHomeDirectory()); VfsRootAccess.disallowRootAccess(JetTestCaseBuilder.getHomeDirectory());
super.tearDown(); super.tearDown();
} }
} }
idea/tests/org/jetbrains/jet/plugin/KotlinLightQuickFixTestCase.java
+3 -2
View File
@@ -17,6 +17,7 @@
package org.jetbrains.jet.plugin; package org.jetbrains.jet.plugin;
import com.intellij.codeInsight.daemon.quickFix.LightQuickFixTestCase; import com.intellij.codeInsight.daemon.quickFix.LightQuickFixTestCase;
import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess;
import com.intellij.openapi.vfs.newvfs.impl.VirtualDirectoryImpl; import com.intellij.openapi.vfs.newvfs.impl.VirtualDirectoryImpl;
import org.jetbrains.jet.JetTestCaseBuilder; import org.jetbrains.jet.JetTestCaseBuilder;
@@ -24,12 +25,12 @@ abstract public class KotlinLightQuickFixTestCase extends LightQuickFixTestCase
@Override @Override
protected void setUp() throws Exception { protected void setUp() throws Exception {
super.setUp(); super.setUp();
VirtualDirectoryImpl.allowRootAccess(JetTestCaseBuilder.getHomeDirectory()); VfsRootAccess.allowRootAccess(JetTestCaseBuilder.getHomeDirectory());
} }
@Override @Override
protected void tearDown() throws Exception { protected void tearDown() throws Exception {
VirtualDirectoryImpl.disallowRootAccess(JetTestCaseBuilder.getHomeDirectory()); VfsRootAccess.disallowRootAccess(JetTestCaseBuilder.getHomeDirectory());
super.tearDown(); super.tearDown();
} }
} }
idea/tests/org/jetbrains/jet/resolve/AbstractReferenceResolveTest.java
+3 -4
View File
@@ -20,7 +20,7 @@ import com.google.common.collect.Lists;
import com.google.common.collect.Ordering; import com.google.common.collect.Ordering;
import com.intellij.ide.startup.impl.StartupManagerImpl; import com.intellij.ide.startup.impl.StartupManagerImpl;
import com.intellij.openapi.startup.StartupManager; 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.*;
import com.intellij.psi.impl.PsiManagerEx; import com.intellij.psi.impl.PsiManagerEx;
import com.intellij.psi.impl.file.impl.FileManager; 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.test.util.UtilPackage;
import org.jetbrains.jet.testing.ReferenceUtils; import org.jetbrains.jet.testing.ReferenceUtils;
import java.io.File;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
@@ -66,12 +65,12 @@ public abstract class AbstractReferenceResolveTest extends LightPlatformCodeInsi
protected void setUp() throws Exception { protected void setUp() throws Exception {
super.setUp(); super.setUp();
((StartupManagerImpl) StartupManager.getInstance(getProject())).runPostStartupActivities(); ((StartupManagerImpl) StartupManager.getInstance(getProject())).runPostStartupActivities();
VirtualDirectoryImpl.allowRootAccess(JetTestCaseBuilder.getHomeDirectory()); VfsRootAccess.allowRootAccess(JetTestCaseBuilder.getHomeDirectory());
} }
@Override @Override
protected void tearDown() throws Exception { protected void tearDown() throws Exception {
VirtualDirectoryImpl.disallowRootAccess(JetTestCaseBuilder.getHomeDirectory()); VfsRootAccess.disallowRootAccess(JetTestCaseBuilder.getHomeDirectory());
Set<JetFile> builtInsSources = getProject().getComponent(BuiltInsReferenceResolver.class).getBuiltInsSources(); Set<JetFile> builtInsSources = getProject().getComponent(BuiltInsReferenceResolver.class).getBuiltInsSources();
FileManager fileManager = ((PsiManagerEx) PsiManager.getInstance(getProject())).getFileManager(); FileManager fileManager = ((PsiManagerEx) PsiManager.getInstance(getProject())).getFileManager();
update_dependencies.xml
+2 -2
View File
@@ -1,6 +1,6 @@
<project name="Update Dependencies" default="update"> <project name="Update Dependencies" default="update">
<property name="jb.buildserver.build.id" value="2579041"/> <property name="jb.buildserver.build.id" value="2591549"/>
<property name="public.buildserver.build.id" value="137490"/> <property name="public.buildserver.build.id" value="138515"/>
<condition property="os.tag" value="win.zip"> <condition property="os.tag" value="win.zip">
<os family="windows" /> <os family="windows" />