mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-27 10:03:11 +07:00
pass IDEA proxy settings to groovy compiler, runner, shell and @Grab processor (IDEA-80919)
This commit is contained in:
@@ -63,6 +63,7 @@ import com.intellij.psi.PsiManager;
|
||||
import com.intellij.util.*;
|
||||
import com.intellij.util.cls.ClsFormatException;
|
||||
import com.intellij.util.containers.ContainerUtil;
|
||||
import com.intellij.util.net.HttpConfigurable;
|
||||
import gnu.trove.THashSet;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
import org.jetbrains.groovy.compiler.rt.GroovycRunner;
|
||||
@@ -150,6 +151,7 @@ public abstract class GroovyCompilerBase implements TranslatingCompiler {
|
||||
if (profileGroovyc) {
|
||||
parameters.getVMParametersList().add("-XX:+HeapDumpOnOutOfMemoryError");
|
||||
}
|
||||
parameters.getVMParametersList().addAll(HttpConfigurable.getProxyCmdLineProperties());
|
||||
|
||||
//debug
|
||||
//parameters.getVMParametersList().add("-Xdebug"); parameters.getVMParametersList().add("-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5239");
|
||||
|
||||
@@ -32,6 +32,7 @@ import com.intellij.openapi.vfs.CharsetToolkit;
|
||||
import com.intellij.openapi.vfs.VirtualFile;
|
||||
import com.intellij.openapi.vfs.encoding.EncodingManager;
|
||||
import com.intellij.openapi.vfs.encoding.EncodingProjectManager;
|
||||
import com.intellij.util.net.HttpConfigurable;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
import org.jetbrains.plugins.groovy.util.GroovyUtils;
|
||||
@@ -100,6 +101,7 @@ public class DefaultGroovyScriptRunner extends GroovyScriptRunner {
|
||||
|
||||
final String confPath = getConfPath(groovyHome);
|
||||
params.getVMParametersList().add("-Dgroovy.starter.conf=" + confPath);
|
||||
params.getVMParametersList().addAll(HttpConfigurable.getProxyCmdLineProperties());
|
||||
|
||||
params.setMainClass("org.codehaus.groovy.tools.GroovyStarter");
|
||||
|
||||
|
||||
Reference in New Issue
Block a user