Update to eap 130.1365
This commit is contained in:
@@ -6,7 +6,7 @@
|
||||
<version>@snapshot@</version>
|
||||
<vendor url="http://www.jetbrains.com">JetBrains Inc.</vendor>
|
||||
|
||||
<idea-version since-build="130.1330" until-build="131.0"/>
|
||||
<idea-version since-build="130.1364" until-build="131.0"/>
|
||||
|
||||
<depends optional="true" config-file="junit.xml">JUnit</depends>
|
||||
<depends optional="true" config-file="testng-j.xml">TestNG-J</depends>
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<project name="Update Dependencies" default="update">
|
||||
<property name="jb.buildserver.build.id" value="1991596"/>
|
||||
<property name="public.buildserver.build.id" value="86986"/>
|
||||
<property name="jb.buildserver.build.id" value="1996871"/>
|
||||
<property name="public.buildserver.build.id" value="87482"/>
|
||||
<property name="idea.archive.name" value="ideaIC-130.SNAPSHOT.win.zip"/>
|
||||
|
||||
<property name="idea.sdk.fetch.needed" value="true"/>
|
||||
|
||||
Reference in New Issue
Block a user