diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml index 9480185749c..f03b1b0af04 100644 --- a/idea/src/META-INF/plugin.xml +++ b/idea/src/META-INF/plugin.xml @@ -6,7 +6,7 @@ @snapshot@ JetBrains Inc. - + JUnit TestNG-J diff --git a/idea/src/org/jetbrains/jet/plugin/k2jsrun/K2JSBrowserProgramRunner.java b/idea/src/org/jetbrains/jet/plugin/k2jsrun/K2JSBrowserProgramRunner.java index 6b9c9f7a6da..537bb255ced 100644 --- a/idea/src/org/jetbrains/jet/plugin/k2jsrun/K2JSBrowserProgramRunner.java +++ b/idea/src/org/jetbrains/jet/plugin/k2jsrun/K2JSBrowserProgramRunner.java @@ -17,7 +17,6 @@ package org.jetbrains.jet.plugin.k2jsrun; import com.intellij.execution.ExecutionException; -import com.intellij.execution.Executor; import com.intellij.execution.configurations.RunProfile; import com.intellij.execution.configurations.RunProfileState; import com.intellij.execution.runners.ExecutionEnvironment; @@ -25,18 +24,20 @@ import com.intellij.execution.runners.GenericProgramRunner; import com.intellij.execution.ui.RunContentDescriptor; import com.intellij.openapi.project.Project; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import static org.jetbrains.jet.plugin.k2jsrun.K2JSRunnerUtils.copyJSFileFromOutputToDestination; import static org.jetbrains.jet.plugin.k2jsrun.K2JSRunnerUtils.openBrowser; public final class K2JSBrowserProgramRunner extends GenericProgramRunner { + @Nullable @Override protected RunContentDescriptor doExecute( Project project, - Executor executor, RunProfileState state, RunContentDescriptor contentToReuse, - ExecutionEnvironment env) throws ExecutionException { + ExecutionEnvironment env + ) throws ExecutionException { if (project == null) { return null; } diff --git a/idea/src/org/jetbrains/jet/plugin/k2jsrun/K2JSRunnerUtils.java b/idea/src/org/jetbrains/jet/plugin/k2jsrun/K2JSRunnerUtils.java index 4d8a90508d9..91e51c0ff79 100644 --- a/idea/src/org/jetbrains/jet/plugin/k2jsrun/K2JSRunnerUtils.java +++ b/idea/src/org/jetbrains/jet/plugin/k2jsrun/K2JSRunnerUtils.java @@ -18,7 +18,7 @@ package org.jetbrains.jet.plugin.k2jsrun; import com.intellij.execution.configurations.RunProfile; import com.intellij.execution.runners.ExecutionEnvironment; -import com.intellij.ide.browsers.BrowsersConfiguration; +import com.intellij.ide.browsers.UrlOpener; import com.intellij.openapi.compiler.CompilerPaths; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleManager; @@ -80,7 +80,8 @@ public final class K2JSRunnerUtils { } String filePath = configurationSettings.getPageToOpenFilePath(); String url = VirtualFileManager.constructUrl(LocalFileSystem.PROTOCOL, filePath); - BrowsersConfiguration.launchBrowser(configurationSettings.getBrowserFamily(), url); + + UrlOpener.launchBrowser(configurationSettings.getBrowserFamily(), url); } @NotNull diff --git a/idea/src/org/jetbrains/jet/plugin/libraries/JetDummyClassFileViewProvider.java b/idea/src/org/jetbrains/jet/plugin/libraries/JetDummyClassFileViewProvider.java index fd6da8b23a2..95c196634d6 100644 --- a/idea/src/org/jetbrains/jet/plugin/libraries/JetDummyClassFileViewProvider.java +++ b/idea/src/org/jetbrains/jet/plugin/libraries/JetDummyClassFileViewProvider.java @@ -178,6 +178,14 @@ class JetDummyClassFileViewProvider extends UserDataHolderBase implements FileVi throw new UnsupportedOperationException(); } + @NotNull + @Override + public PsiFile getStubBindingRoot() { + PsiFile psi = getPsi(getBaseLanguage()); + assert psi != null; + return psi; + } + public static JetFile createJetFile(PsiManager psiManager, VirtualFile file, String text) { return new JetDummyClassFileViewProvider(psiManager, file, text).getPsi(JetLanguage.INSTANCE); } diff --git a/update_dependencies.xml b/update_dependencies.xml index a8eca570537..800de667483 100644 --- a/update_dependencies.xml +++ b/update_dependencies.xml @@ -1,6 +1,6 @@ - - + +