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

Update to eap 130.1365

Browse Source
This commit is contained in:
Nikolay Krasko
2013-07-29 19:39:57 +04:00
parent 203e80debe
commit a4451dbf24
5 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/META-INF/plugin.xml
+1 -1
View File
@@ -6,7 +6,7 @@
<version>@snapshot@</version> <version>@snapshot@</version>
<vendor url="http://www.jetbrains.com">JetBrains Inc.</vendor> <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="junit.xml">JUnit</depends>
<depends optional="true" config-file="testng-j.xml">TestNG-J</depends> <depends optional="true" config-file="testng-j.xml">TestNG-J</depends>
idea/src/org/jetbrains/jet/plugin/k2jsrun/K2JSBrowserProgramRunner.java
+4 -3
View File
@@ -17,7 +17,6 @@
package org.jetbrains.jet.plugin.k2jsrun; package org.jetbrains.jet.plugin.k2jsrun;
import com.intellij.execution.ExecutionException; import com.intellij.execution.ExecutionException;
import com.intellij.execution.Executor;
import com.intellij.execution.configurations.RunProfile; import com.intellij.execution.configurations.RunProfile;
import com.intellij.execution.configurations.RunProfileState; import com.intellij.execution.configurations.RunProfileState;
import com.intellij.execution.runners.ExecutionEnvironment; 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.execution.ui.RunContentDescriptor;
import com.intellij.openapi.project.Project; import com.intellij.openapi.project.Project;
import org.jetbrains.annotations.NotNull; 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.copyJSFileFromOutputToDestination;
import static org.jetbrains.jet.plugin.k2jsrun.K2JSRunnerUtils.openBrowser; import static org.jetbrains.jet.plugin.k2jsrun.K2JSRunnerUtils.openBrowser;
public final class K2JSBrowserProgramRunner extends GenericProgramRunner { public final class K2JSBrowserProgramRunner extends GenericProgramRunner {
@Nullable
@Override @Override
protected RunContentDescriptor doExecute( protected RunContentDescriptor doExecute(
Project project, Project project,
Executor executor,
RunProfileState state, RunProfileState state,
RunContentDescriptor contentToReuse, RunContentDescriptor contentToReuse,
ExecutionEnvironment env) throws ExecutionException { ExecutionEnvironment env
) throws ExecutionException {
if (project == null) { if (project == null) {
return null; return null;
} }
idea/src/org/jetbrains/jet/plugin/k2jsrun/K2JSRunnerUtils.java
+3 -2
View File
@@ -18,7 +18,7 @@ package org.jetbrains.jet.plugin.k2jsrun;
import com.intellij.execution.configurations.RunProfile; import com.intellij.execution.configurations.RunProfile;
import com.intellij.execution.runners.ExecutionEnvironment; 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.compiler.CompilerPaths;
import com.intellij.openapi.module.Module; import com.intellij.openapi.module.Module;
import com.intellij.openapi.module.ModuleManager; import com.intellij.openapi.module.ModuleManager;
@@ -80,7 +80,8 @@ public final class K2JSRunnerUtils {
} }
String filePath = configurationSettings.getPageToOpenFilePath(); String filePath = configurationSettings.getPageToOpenFilePath();
String url = VirtualFileManager.constructUrl(LocalFileSystem.PROTOCOL, filePath); String url = VirtualFileManager.constructUrl(LocalFileSystem.PROTOCOL, filePath);
BrowsersConfiguration.launchBrowser(configurationSettings.getBrowserFamily(), url);
UrlOpener.launchBrowser(configurationSettings.getBrowserFamily(), url);
} }
@NotNull @NotNull
idea/src/org/jetbrains/jet/plugin/libraries/JetDummyClassFileViewProvider.java
+8
View File
@@ -178,6 +178,14 @@ class JetDummyClassFileViewProvider extends UserDataHolderBase implements FileVi
throw new UnsupportedOperationException(); 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) { public static JetFile createJetFile(PsiManager psiManager, VirtualFile file, String text) {
return new JetDummyClassFileViewProvider(psiManager, file, text).getPsi(JetLanguage.INSTANCE); return new JetDummyClassFileViewProvider(psiManager, file, text).getPsi(JetLanguage.INSTANCE);
} }
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="1991596"/> <property name="jb.buildserver.build.id" value="1996871"/>
<property name="public.buildserver.build.id" value="86986"/> <property name="public.buildserver.build.id" value="87482"/>
<property name="idea.archive.name" value="ideaIC-130.SNAPSHOT.win.zip"/> <property name="idea.archive.name" value="ideaIC-130.SNAPSHOT.win.zip"/>
<property name="idea.sdk.fetch.needed" value="true"/> <property name="idea.sdk.fetch.needed" value="true"/>