Merge pull request #928 from bitjammer/acgarland/explicit-repl-subcommand

Stop launching REPL when there aren't inputs

Author: bitjammer

Sources/SwiftDriver/Driver/Driver.swift

@@ -1488,13 +1488,7 @@ extension Driver {
       switch outputOption.option {
       case .emitImportedModules:
         return .singleCompile
-
-      case .repl:
-        if driverKind == .interactive, !parsedOptions.hasAnyInput {
-          diagnosticsEngine.emit(.warning_unnecessary_repl_mode(option: outputOption.option, kind: driverKind))
-        }
-        fallthrough
-      case .lldbRepl:
+      case .repl, .lldbRepl:
         return .repl
 
       case .deprecatedIntegratedRepl:
@@ -1570,10 +1564,6 @@ extension Driver {
 }
 
 extension Diagnostic.Message {
-  static func warning_unnecessary_repl_mode(option: Option, kind: DriverKind) -> Diagnostic.Message {
-    .warning("unnecessary option '\(option.spelling)'; this is the default for '\(kind.rawValue)' with no input files")
-  }
-
   static func warn_ignoring_batch_mode(_ option: Option) -> Diagnostic.Message {
     .warning("ignoring '-enable-batch-mode' because '\(option.spelling)' was also specified")
   }

Sources/SwiftDriver/Jobs/Planning.swift

@@ -746,19 +746,7 @@ extension Driver {
       }
       return ([try generateDumpPCMJob(input: inputFiles.first!)], nil)
     case .intro:
-      // TODO: Remove this check once the REPL no longer launches
-      // by default.
-      if !inputFiles.isEmpty {
-        throw PlanningError.replReceivedInput
-      }
-      // end TODO.
-
-      var introJobs = try helpIntroJobs()
-
-      // TODO: Remove this to stop launching the REPL by default.
-      introJobs.append(try replJob())
-
-      return (introJobs, nil)
+      return (try helpIntroJobs(), nil)
     }
   }
 }

Sources/SwiftDriver/Jobs/SwiftHelpIntroJob.swift

@@ -14,15 +14,6 @@ import SwiftOptions
 extension Driver {
   mutating func helpIntroJobs() throws -> [Job] {
     return [
-      Job(
-        moduleName: moduleOutputInfo.name,
-        kind: .versionRequest,
-        tool: .absolute(try toolchain.getToolPath(.swiftCompiler)),
-        commandLine: [.flag("--version")],
-        inputs: [],
-        primaryInputs: [],
-        outputs: [],
-        requiresInPlaceExecution: false),
       Job(
         moduleName: moduleOutputInfo.name,
         kind: .help,

Sources/swift-help/main.swift

@@ -110,7 +110,7 @@ struct SwiftHelp: ParsableCommand {
     // `repl` not included in `Subcommand`, also print it here.
     do {
       let padding = String(repeating: " ", count: maxSubcommandNameLength - "repl".count)
-      print("  \(plainBold)swift repl\(plain)\(padding)    Experiment with Swift code interactively (default)")
+      print("  \(plainBold)swift repl\(plain)\(padding)    Experiment with Swift code interactively")
     }
 
     print("\n  Use \(plainBold)`swift --help`\(plain) for descriptions of available options and flags.")

Tests/SwiftDriverTests/SwiftDriverTests.swift

@@ -553,12 +553,6 @@ final class SwiftDriverTests: XCTestCase {
       XCTAssertEqual(driver.moduleOutputInfo.name, "main")
     }
 
-    try assertDriverDiagnostics(args: "swift", "-repl") { driver, verifier in
-      verifier.expect(.warning("unnecessary option '-repl'; this is the default for 'swift' with no input files"))
-      XCTAssertNil(driver.moduleOutputInfo.output)
-      XCTAssertEqual(driver.moduleOutputInfo.name, "REPL")
-    }
-
     try assertNoDriverDiagnostics(args: "swiftc", "foo.swift", "bar.swift", "-emit-library", "-o", "libWibble.so") { driver in
       XCTAssertEqual(driver.moduleOutputInfo.name, "Wibble")
     }
@@ -2750,20 +2744,11 @@ final class SwiftDriverTests: XCTestCase {
     do {
       var driver = try Driver(args: ["swift"], env: envWithFakeSwiftHelp)
       let plannedJobs = try driver.planBuild()
-      XCTAssertEqual(plannedJobs.count, 3)
-
-      let versionJob = plannedJobs[0]
-      XCTAssertTrue(versionJob.tool.name.contains("swift"))
-      XCTAssertTrue(versionJob.commandLine.contains(.flag("--version")))
+      XCTAssertEqual(plannedJobs.count, 1)
 
-      let helpJob = plannedJobs[1]
+      let helpJob = plannedJobs[0]
       XCTAssertTrue(helpJob.tool.name.contains("swift-help"))
       XCTAssertTrue(helpJob.commandLine.contains(.flag("intro")))
-
-      let replJob = plannedJobs[2]
-      XCTAssertTrue(replJob.tool.name.contains("lldb"))
-      XCTAssertTrue(replJob.requiresInPlaceExecution)
-      XCTAssert(replJob.commandLine.contains(where: { isExpectedLLDBREPLFlag($0) }))
     }
 
     do {