Merge pull request #368 from cltnschlosser/cs_optionsIntegrationTests

Update option diagnostics to match c++ driver

Author: cltnschlosser

Sources/SwiftDriver/Driver/Driver.swift

@@ -1055,7 +1055,12 @@ extension Driver {
       case .emitImportedModules:
         return .singleCompile
 
-      case .repl, .lldbRepl:
+      case .repl:
+        if driverKind == .interactive, !parsedOptions.hasAnyInput {
+          diagnosticsEngine.emit(.warning_unnecessary_repl_mode(option: outputOption.option, kind: driverKind))
+        }
+        fallthrough
+      case .lldbRepl:
         return .repl
 
       case .deprecatedIntegratedRepl:
@@ -1120,6 +1125,10 @@ 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")
   }
@@ -1252,7 +1261,7 @@ extension Driver {
         compilerOutputType = nil
 
       case .i:
-        diagnosticsEngine.emit(.error_i_mode(driverKind))
+        diagnosticsEngine.emit(.error_i_mode)
 
       case .repl, .deprecatedIntegratedRepl, .lldbRepl:
         compilerOutputType = nil
@@ -1291,11 +1300,11 @@ extension Driver {
 }
 
 extension Diagnostic.Message {
-  static func error_i_mode(_ driverKind: DriverKind) -> Diagnostic.Message {
+  static var error_i_mode: Diagnostic.Message {
     .error(
       """
       the flag '-i' is no longer required and has been removed; \
-      use '\(driverKind.usage) input-filename'
+      use '\(DriverKind.interactive.usage) input-filename'
       """
     )
   }
@@ -1424,7 +1433,8 @@ extension Driver {
 
     if format == .codeView && (level == .lineTables || level == .dwarfTypes) {
       let levelOption = parsedOptions.getLast(in: .g)!.option
-      diagnosticsEngine.emit(.error_argument_not_allowed_with(arg: format.rawValue, other: levelOption.spelling))
+      let fullNotAllowedOption = Option.debugInfoFormat.spelling + format.rawValue
+      diagnosticsEngine.emit(.error_argument_not_allowed_with(arg: fullNotAllowedOption, other: levelOption.spelling))
     }
 
     return DebugInfo(format: format, level: level, shouldVerify: shouldVerify)

Sources/SwiftDriver/Incremental Compilation/IncrementalCompilationState.swift

@@ -175,7 +175,7 @@ extension Diagnostic.Message {
   static var warning_incremental_requires_build_record_entry: Diagnostic.Message {
     .warning(
       "ignoring -incremental; " +
-        "output file map has no master dependencies entry under \(FileType.swiftDeps)"
+        "output file map has no master dependencies entry (\"\(FileType.swiftDeps)\" under \"\")"
     )
   }
   fileprivate static func remark_incremental_compilation_disabled(because why: String) -> Diagnostic.Message {

Tests/SwiftDriverTests/SwiftDriverTests.swift

@@ -378,7 +378,7 @@ final class SwiftDriverTests: XCTestCase {
     }
 
     try assertDriverDiagnostics(args: "swiftc", "foo.swift", "-emit-module", "-gdwarf-types", "-debug-info-format=codeview") {
-      $1.expect(.error("argument 'codeview' is not allowed with '-gdwarf-types'"))
+      $1.expect(.error("argument '-debug-info-format=codeview' is not allowed with '-gdwarf-types'"))
     }
   }
 
@@ -423,7 +423,8 @@ final class SwiftDriverTests: XCTestCase {
       XCTAssertEqual(driver.moduleOutputInfo.name, "main")
     }
 
-    try assertNoDriverDiagnostics(args: "swift", "-repl") { driver in
+    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")
     }