Correct immediate mode -e arg handling

When parsing the options for an immediate-mode run, if we encounter what would otherwise be an input and the -e flag has already been specified, treat that argument *and* all subsequent arguments as arguments to the script being executed.

Author: beccadax

Sources/SwiftOptions/OptionParsing.swift

@@ -45,6 +45,7 @@ extension OptionTable {
     }
 
     var parsedOptions = ParsedOptions()
+    var seenDashE = false
     var index = arguments.startIndex
     while index < arguments.endIndex {
       // Capture the next argument.
@@ -58,10 +59,16 @@ extension OptionTable {
 
       // If this is not a flag, record it as an input.
       if argument == "-" || argument.first! != "-" {
+        // If we've seen -e, this argument and all remaining ones are arguments to the -e script.
+        if driverKind == .interactive && seenDashE {
+          parsedOptions.addOption(.DASHDASH, argument: .multiple(Array(arguments[(index-1)...])))
+          break
+        }
+        
         parsedOptions.addInput(argument)
 
         // In interactive mode, synthesize a "--" argument for all args after the first input.
-        if driverKind == .interactive && index < arguments.endIndex && !parsedOptions.lookupWithoutConsuming(.e).isEmpty {
+        if driverKind == .interactive && index < arguments.endIndex {
           parsedOptions.addOption(.DASHDASH, argument: .multiple(Array(arguments[index...])))
           break
         }
@@ -90,6 +97,10 @@ extension OptionTable {
             currentDriverKind: driverKind)
         }
       }
+      
+      if option == .e {
+        seenDashE = true
+      }
 
       // Translate the argument
       switch option.kind {

Tests/SwiftDriverTests/SwiftDriverTests.swift

@@ -302,17 +302,19 @@ final class SwiftDriverTests: XCTestCase {
   func testDashE() throws {
     let fs = localFileSystem
 
-    let driver1 = try Driver(args: ["swift", "-e", "print(1)", "-eprint(2)", "foo/bar.swift", "baz/quux.swift"], fileSystem: fs)
-    XCTAssertEqual(driver1.inputFiles.count, 3)
-    let tempFilesForDriver1 = driver1.inputFiles.filter {
-      !["bar.swift", "quux.swift"].contains($0.file.basename)
-    }
-    XCTAssertEqual(tempFilesForDriver1.count, 1)
-    XCTAssertEqual(tempFilesForDriver1[0].file.basename, "main.swift")
-    let tempFileContentsForDriver1 = try fs.readFileContents(tempFilesForDriver1[0].file.absolutePath!)
+    var driver1 = try Driver(args: ["swift", "-e", "print(1)", "-eprint(2)", "foo/bar.swift", "baz/quux.swift"], fileSystem: fs)
+    XCTAssertEqual(driver1.inputFiles.count, 1)
+    XCTAssertEqual(driver1.inputFiles[0].file.basename, "main.swift")
+    let tempFileContentsForDriver1 = try fs.readFileContents(XCTUnwrap(driver1.inputFiles[0].file.absolutePath))
     XCTAssertTrue(tempFileContentsForDriver1.description.hasSuffix("\nprint(1)\nprint(2)\n"))
 
-    XCTAssertThrowsError(try Driver(args: ["swift", "-e", "print(1)", "baz/main.swift"], fileSystem: fs))
+    let plannedJobs = try driver1.planBuild().removingAutolinkExtractJobs()
+    XCTAssertEqual(plannedJobs.count, 1)
+    XCTAssertEqual(plannedJobs[0].kind, .interpret)
+    XCTAssertEqual(plannedJobs[0].commandLine.drop(while: { $0 != .flag("--") }),
+                   [.flag("--"), .flag("foo/bar.swift"), .flag("baz/quux.swift")])
+    
+    XCTAssertThrowsError(try Driver(args: ["swiftc", "baz/main.swift", "-e", "print(1)"], fileSystem: fs))
   }
 
   func testRecordedInputModificationDates() throws {