From d2ecc1e3619ba7c254240391fd992d7dad7b7905 Mon Sep 17 00:00:00 2001
From: Ilya Chernikov <ilya.chernikov@jetbrains.com>
Date: Mon, 4 Jan 2021 13:06:18 +0100
Subject: [PATCH] Implement -X arguments passing from kotlin runner to compiler

---
 .../src/org/jetbrains/kotlin/runner/Main.kt   | 21 ++++++++++-----
 .../src/org/jetbrains/kotlin/runner/Runner.kt |  1 +
 .../org/jetbrains/kotlin/runner/runners.kt    | 11 +++++---
 .../testData/launcher/funWithResultReturn.kts |  4 +++
 .../jetbrains/kotlin/cli/AbstractCliTest.java |  5 ++--
 .../kotlin/cli/LauncherScriptTest.kt          | 26 ++++++++++++++++---
 6 files changed, 52 insertions(+), 16 deletions(-)
 create mode 100644 compiler/testData/launcher/funWithResultReturn.kts

diff --git a/compiler/cli/cli-runner/src/org/jetbrains/kotlin/runner/Main.kt b/compiler/cli/cli-runner/src/org/jetbrains/kotlin/runner/Main.kt
index 67ab6854cba..a1faab9b8ab 100644
--- a/compiler/cli/cli-runner/src/org/jetbrains/kotlin/runner/Main.kt
+++ b/compiler/cli/cli-runner/src/org/jetbrains/kotlin/runner/Main.kt
@@ -42,6 +42,7 @@ object Main {
         var collectingExpressions = false
         var needsCompiler = false
         val arguments = arrayListOf<String>()
+        val compilerArguments = arrayListOf<String>()
         var expression: String? = null
         var noReflect = false
 
@@ -103,6 +104,10 @@ object Main {
             }
             else if ("-no-reflect" == arg) {
                 noReflect = true
+                compilerArguments.add(arg)
+            }
+            else if (arg.startsWith("-X")) {
+                compilerArguments.add(arg)
             }
             else if (arg.startsWith("-")) {
                 throw RunnerException("unsupported argument: $arg")
@@ -146,7 +151,7 @@ object Main {
             }
         }
 
-        runner.run(classpath, arguments, compilerClasspath)
+        runner.run(classpath, compilerArguments, arguments, compilerClasspath)
     }
 
     private fun MutableList<URL>.addPath(path: String) {
@@ -167,19 +172,21 @@ object Main {
     private fun printUsageAndExit() {
         println("""kotlin: run Kotlin programs, scripts or REPL.
 
-Usage: kotlin <options> <command> <arguments>
+Usage: kotlin <options> <command> [<arguments>]
 where command may be one of:
   foo.Bar                    Runs the 'main' function from the class with the given qualified name
+                             (compiler arguments are ignored) 
   app.jar                    Runs the given JAR file as 'java -jar' would do
-                             (-classpath argument is ignored and no Kotlin runtime is added to the classpath)
-""" +
-//  script.kts                 Compiles and runs the given script
-//  -expression (-e) '2+2'     Evaluates the expression and prints the result
-"""and possible options include:
+                             (compiler arguments are ignored and no Kotlin stdlib is added to the classpath)
+  script.kts                 Compiles and runs the given script, passing <arguments> to it
+  -expression (-e) '2+2'     Evaluates the expression and prints the result, passing <arguments> to it
+  <no command>               Runs Kotlin REPL, passing <arguments> to it
+and possible options include:
   -classpath (-cp) <path>    Paths where to find user class files
   -Dname=value               Set a system JVM property
   -J<option>                 Pass an option directly to JVM
   -no-reflect                Don't include Kotlin reflection implementation into classpath
+  -X<flag>[=value]           Pass -X argument to the compiler
   -version                   Display Kotlin version
   -help (-h)                 Print a synopsis of options
 """)
diff --git a/compiler/cli/cli-runner/src/org/jetbrains/kotlin/runner/Runner.kt b/compiler/cli/cli-runner/src/org/jetbrains/kotlin/runner/Runner.kt
index 3626c98e13e..cef1d0681df 100644
--- a/compiler/cli/cli-runner/src/org/jetbrains/kotlin/runner/Runner.kt
+++ b/compiler/cli/cli-runner/src/org/jetbrains/kotlin/runner/Runner.kt
@@ -21,6 +21,7 @@ import java.net.URL
 interface Runner {
     fun run(
         classpath: List<URL>,
+        compilerArguments: List<String>,
         arguments: List<String>,
         compilerClasspath: List<URL>
     )
diff --git a/compiler/cli/cli-runner/src/org/jetbrains/kotlin/runner/runners.kt b/compiler/cli/cli-runner/src/org/jetbrains/kotlin/runner/runners.kt
index 279c13c77be..1e9f2e9337a 100644
--- a/compiler/cli/cli-runner/src/org/jetbrains/kotlin/runner/runners.kt
+++ b/compiler/cli/cli-runner/src/org/jetbrains/kotlin/runner/runners.kt
@@ -32,7 +32,7 @@ abstract class AbstractRunner : Runner {
 
     protected abstract fun createClassLoader(classpath: List<URL>): ClassLoader
 
-    override fun run(classpath: List<URL>, arguments: List<String>, compilerClasspath: List<URL>) {
+    override fun run(classpath: List<URL>, compilerArguments: List<String>, arguments: List<String>, compilerClasspath: List<URL>) {
         val classLoader = createClassLoader(classpath)
 
         val mainClass = try {
@@ -128,17 +128,19 @@ private fun MutableList<String>.addClasspathArgIfNeeded(classpath: List<URL>) {
 }
 
 class ReplRunner : RunnerWithCompiler() {
-    override fun run(classpath: List<URL>, arguments: List<String>, compilerClasspath: List<URL>) {
+    override fun run(classpath: List<URL>, compilerArguments: List<String>, arguments: List<String>, compilerClasspath: List<URL>) {
         val compilerArgs = ArrayList<String>()
         compilerArgs.addClasspathArgIfNeeded(classpath)
+        compilerArgs.addAll(compilerArguments)
         runCompiler(compilerClasspath, compilerArgs)
     }
 }
 
 class ScriptRunner(private val path: String) : RunnerWithCompiler() {
-    override fun run(classpath: List<URL>, arguments: List<String>, compilerClasspath: List<URL>) {
+    override fun run(classpath: List<URL>, compilerArguments: List<String>, arguments: List<String>, compilerClasspath: List<URL>) {
         val compilerArgs = ArrayList<String>().apply {
             addClasspathArgIfNeeded(classpath)
+            addAll(compilerArguments)
             add("-script")
             add(path)
             if (arguments.isNotEmpty() && arguments.first() != "--") {
@@ -151,9 +153,10 @@ class ScriptRunner(private val path: String) : RunnerWithCompiler() {
 }
 
 class ExpressionRunner(private val code: String) : RunnerWithCompiler() {
-    override fun run(classpath: List<URL>, arguments: List<String>, compilerClasspath: List<URL>) {
+    override fun run(classpath: List<URL>, compilerArguments: List<String>, arguments: List<String>, compilerClasspath: List<URL>) {
         val compilerArgs = ArrayList<String>().apply {
             addClasspathArgIfNeeded(classpath)
+            addAll(compilerArguments)
             add("-expression")
             add(code)
             if (arguments.isNotEmpty() && arguments.first() != "--") {
diff --git a/compiler/testData/launcher/funWithResultReturn.kts b/compiler/testData/launcher/funWithResultReturn.kts
new file mode 100644
index 00000000000..522a68b1285
--- /dev/null
+++ b/compiler/testData/launcher/funWithResultReturn.kts
@@ -0,0 +1,4 @@
+
+fun f() : Result<Int> = Result.success(42)
+
+println(f().getOrNull())
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/cli/AbstractCliTest.java b/compiler/tests-common/tests/org/jetbrains/kotlin/cli/AbstractCliTest.java
index 3e04797b1a8..6b216c63828 100644
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/cli/AbstractCliTest.java
+++ b/compiler/tests-common/tests/org/jetbrains/kotlin/cli/AbstractCliTest.java
@@ -24,6 +24,7 @@ import kotlin.io.FilesKt;
 import kotlin.io.path.PathsKt;
 import kotlin.text.Charsets;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.checkers.ThirdPartyAnnotationPathsKt;
 import org.jetbrains.kotlin.cli.common.CLITool;
 import org.jetbrains.kotlin.cli.common.ExitCode;
@@ -82,7 +83,7 @@ public abstract class AbstractCliTest extends TestCaseWithTmpdir {
     }
 
     @NotNull
-    public static String getNormalizedCompilerOutput(@NotNull String pureOutput, @NotNull ExitCode exitCode, @NotNull String testDataDir) {
+    public static String getNormalizedCompilerOutput(@NotNull String pureOutput, @Nullable ExitCode exitCode, @NotNull String testDataDir) {
         String testDataAbsoluteDir = new File(testDataDir).getAbsolutePath();
         String normalizedOutputWithoutExitCode = StringUtil.convertLineSeparators(pureOutput)
                 .replace(testDataAbsoluteDir, TESTDATA_DIR)
@@ -96,7 +97,7 @@ public abstract class AbstractCliTest extends TestCaseWithTmpdir {
                 .replace("\n" + Usage.BAT_DELIMITER_CHARACTERS_NOTE + "\n", "")
                 .replaceAll("log4j:WARN.*\n", "");
 
-        return normalizedOutputWithoutExitCode + exitCode + "\n";
+        return exitCode == null ? normalizedOutputWithoutExitCode : (normalizedOutputWithoutExitCode + exitCode + "\n");
     }
 
     private void doTest(@NotNull String fileName, @NotNull CLITool<?> compiler) {
diff --git a/compiler/tests/org/jetbrains/kotlin/cli/LauncherScriptTest.kt b/compiler/tests/org/jetbrains/kotlin/cli/LauncherScriptTest.kt
index 7d1706ef646..acae78df290 100644
--- a/compiler/tests/org/jetbrains/kotlin/cli/LauncherScriptTest.kt
+++ b/compiler/tests/org/jetbrains/kotlin/cli/LauncherScriptTest.kt
@@ -48,9 +48,16 @@ class LauncherScriptTest : TestCaseWithTmpdir() {
         )
         pb.directory(workDirectory)
         val process = pb.start()
-        val stdout = StringUtil.convertLineSeparators(process.inputStream.bufferedReader().use { it.readText() })
-        val stderr = StringUtil.convertLineSeparators(process.errorStream.bufferedReader().use { it.readText() })
-            .replace("Picked up [_A-Z]+:.*\n".toRegex(), "")
+        val stdout =
+            AbstractCliTest.getNormalizedCompilerOutput(
+                StringUtil.convertLineSeparators(process.inputStream.bufferedReader().use { it.readText() }),
+                null, testDataDirectory
+            )
+        val stderr =
+            AbstractCliTest.getNormalizedCompilerOutput(
+                StringUtil.convertLineSeparators(process.errorStream.bufferedReader().use { it.readText() }),
+                null, testDataDirectory
+            ).replace("Picked up [_A-Z]+:.*\n".toRegex(), "")
         process.waitFor(10, TimeUnit.SECONDS)
         val exitCode = process.exitValue()
         try {
@@ -228,6 +235,19 @@ class LauncherScriptTest : TestCaseWithTmpdir() {
         runProcess("kotlin", "LegacyAssertEnabledKt", "-J-ea:kotlin._Assertions", workDirectory = tmpdir)
     }
 
+    fun testScriptWithXArguments() {
+        runProcess(
+            "kotlin", "$testDataDirectory/funWithResultReturn.kts",
+            expectedExitCode = 1,
+            expectedStderr = """error: 'kotlin.Result' cannot be used as a return type (funWithResultReturn.kts:2:11)
+compiler/testData/launcher/funWithResultReturn.kts:2:11: error: 'kotlin.Result' cannot be used as a return type
+fun f() : Result<Int> = Result.success(42)
+          ^
+          """
+        )
+        runProcess("kotlin", "-Xallow-result-return-type", "$testDataDirectory/funWithResultReturn.kts", expectedStdout = "42\n")
+    }
+
     fun testProperty() {
         runProcess("kotlinc", "$testDataDirectory/property.kt", "-d", tmpdir.path)