CLI: use "--" to separate free arguments from compiler options

 #KT-9370 Fixed

Author: udalov

compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/CommonCompilerArguments.java

@@ -109,6 +109,8 @@ public abstract class CommonCompilerArguments implements Serializable {
 
     public List<String> freeArgs = new SmartList<>();
 
+    public List<String> unknownArgs = new SmartList<>();
+
     public List<String> unknownExtraFlags = new SmartList<>();
 
     // Names of extra (-X...) arguments which have been passed in an obsolete form ("-Xaaa bbb", instead of "-Xaaa=bbb")

compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/argumentUtils.kt

@@ -24,14 +24,9 @@ import java.util.*
 fun <A : CommonCompilerArguments> parseArguments(args: Array<String>, arguments: A, ignoreInvalidArguments: Boolean = false) {
     parseCommandLineArguments(args, arguments)
 
-    if (ignoreInvalidArguments) {
-        arguments.freeArgs.removeAll { it.startsWith("-") }
-    }
-
-    for (argument in arguments.freeArgs) {
-        if (argument.startsWith("-")) {
-            throw IllegalArgumentException("Invalid argument: " + argument)
-        }
+    val invalidArgument = arguments.unknownArgs.firstOrNull()?.takeUnless { ignoreInvalidArguments }
+    if (invalidArgument != null) {
+        throw IllegalArgumentException("Invalid argument: $invalidArgument")
     }
 }
 

compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/parseCommandLineArguments.kt

@@ -30,6 +30,7 @@ val Argument.isAdvanced: Boolean
     get() = value.startsWith(ADVANCED_ARGUMENT_PREFIX) && value.length > ADVANCED_ARGUMENT_PREFIX.length
 
 private val ADVANCED_ARGUMENT_PREFIX = "-X"
+private val FREE_ARGS_DELIMITER = "--"
 
 // Parses arguments in the passed [result] object, or throws an [IllegalArgumentException] with the message to be displayed to the user
 fun <A : CommonCompilerArguments> parseCommandLineArguments(args: Array<String>, result: A) {
@@ -41,22 +42,32 @@ fun <A : CommonCompilerArguments> parseCommandLineArguments(args: Array<String>,
     }
 
     val visitedArgs = mutableSetOf<String>()
+    var freeArgsStarted = false
 
     var i = 0
     while (i < args.size) {
         val arg = args[i++]
+
+        if (freeArgsStarted) {
+            result.freeArgs.add(arg)
+            continue
+        }
+        if (arg == FREE_ARGS_DELIMITER) {
+            freeArgsStarted = true
+            continue
+        }
+
         val argumentField = fields.firstOrNull { (_, argument) ->
             argument.value == arg ||
             argument.shortName.takeUnless(String::isEmpty) == arg ||
             (argument.isAdvanced && arg.startsWith(argument.value + "="))
         }
 
         if (argumentField == null) {
-            if (arg.startsWith(ADVANCED_ARGUMENT_PREFIX)) {
-                result.unknownExtraFlags.add(arg)
-            }
-            else {
-                result.freeArgs.add(arg)
+            when {
+                arg.startsWith(ADVANCED_ARGUMENT_PREFIX) -> result.unknownExtraFlags.add(arg)
+                arg.startsWith("-") -> result.unknownArgs.add(arg)
+                else -> result.freeArgs.add(arg)
             }
             continue
         }

compiler/testData/integration/smoke/scriptDashedArgs/script.expected

@@ -0,0 +1,8 @@
+OUT:
+hi
+-name
+Marty
+--
+there
+
+Return code: 0

compiler/testData/integration/smoke/scriptDashedArgs/script.kts

@@ -0,0 +1,3 @@
+for (arg in args) {
+    println(arg)
+}

compiler/tests/org/jetbrains/kotlin/integration/CompilerSmokeTest.java

@@ -57,6 +57,10 @@ public void testSimpleScript() throws Exception {
         runCompiler("script", "-script", "script.kts", "hi", "there");
     }
 
+    public void testScriptDashedArgs() throws Exception {
+        runCompiler("script", "-script", "script.kts", "--", "hi", "-name", "Marty", "--", "there");
+    }
+
     public void testScriptWithClasspath() throws Exception {
         runCompiler("script", "-cp", new File("lib/javax.inject.jar").getAbsolutePath(), "-script", "script.kts");
     }