From 5ad1a7ae72f7bc9d05b2e3153288928aa37e69e5 Mon Sep 17 00:00:00 2001
From: Daniil Ovchinnikov <daniil.ovchinnikov@jetbrains.com>
Date: Tue, 29 Nov 2016 09:32:31 -0500
Subject: [PATCH] [groovy] do not configure program parameters with other stuff
 (IDEA-164688)

---
 .../runner/GroovyScriptRunConfiguration.java  | 12 ++++++++--
 ...ogramRunConfigurationParametersDelegate.kt | 22 +++++++++++++++++++
 2 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 plugins/groovy/src/org/jetbrains/plugins/groovy/runner/util/CommonProgramRunConfigurationParametersDelegate.kt

diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/runner/GroovyScriptRunConfiguration.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/runner/GroovyScriptRunConfiguration.java
index ef5c33636332..a5088d0534f1 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/runner/GroovyScriptRunConfiguration.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/runner/GroovyScriptRunConfiguration.java
@@ -25,7 +25,6 @@ import com.intellij.execution.process.ProcessAdapter;
 import com.intellij.execution.process.ProcessEvent;
 import com.intellij.execution.runners.ExecutionEnvironment;
 import com.intellij.execution.util.JavaParametersUtil;
-import com.intellij.execution.util.ProgramParametersUtil;
 import com.intellij.execution.util.ScriptFileUtil;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.module.Module;
@@ -63,12 +62,15 @@ import org.jetbrains.plugins.groovy.GroovyBundle;
 import org.jetbrains.plugins.groovy.lang.psi.GroovyFile;
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.GrTypeDefinition;
 import org.jetbrains.plugins.groovy.lang.psi.util.GroovyRunnerPsiUtil;
+import org.jetbrains.plugins.groovy.runner.util.CommonProgramRunConfigurationParametersDelegate;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Map;
 
+import static com.intellij.execution.util.ProgramParametersUtil.configureConfiguration;
+
 /**
  * @author peter
  */
@@ -210,7 +212,13 @@ public class GroovyScriptRunConfiguration extends ModuleBasedConfiguration<RunCo
           module == null ? JavaParametersUtil.createProjectJdk(getProject(), jrePath)
                          : JavaParametersUtil.createModuleJdk(module, !tests, jrePath)
         );
-        ProgramParametersUtil.configureConfiguration(params, GroovyScriptRunConfiguration.this);
+        configureConfiguration(params, new CommonProgramRunConfigurationParametersDelegate(GroovyScriptRunConfiguration.this) {
+          @Nullable
+          @Override
+          public String getProgramParameters() {
+            return null;
+          }
+        });
         scriptRunner.configureCommandLine(params, module, tests, scriptFile, GroovyScriptRunConfiguration.this);
 
         return params;
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/runner/util/CommonProgramRunConfigurationParametersDelegate.kt b/plugins/groovy/src/org/jetbrains/plugins/groovy/runner/util/CommonProgramRunConfigurationParametersDelegate.kt
new file mode 100644
index 000000000000..698ec8d19ee4
--- /dev/null
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/runner/util/CommonProgramRunConfigurationParametersDelegate.kt
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2000-2016 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jetbrains.plugins.groovy.runner.util
+
+import com.intellij.execution.CommonProgramRunConfigurationParameters
+
+open class CommonProgramRunConfigurationParametersDelegate(
+  delegate: CommonProgramRunConfigurationParameters
+) : CommonProgramRunConfigurationParameters by delegate