Merge pull request #4 from apple/update

Sync with SwiftPM trunk

Author: aciidgh

Sources/TSCBasic/DiagnosticsEngine.swift

@@ -32,6 +32,8 @@ public struct Diagnostic: CustomStringConvertible {
 
         case note
 
+        case remark
+
         // FIXME: Kill this
         case ignored
     }
@@ -164,6 +166,10 @@ extension Diagnostic.Message {
         .init(data: data, behavior: .note)
     }
 
+    public static func remark(_ data: DiagnosticData) -> Diagnostic.Message {
+      .init(data: data, behavior: .remark)
+  }
+
     public static func error(_ str: String) -> Diagnostic.Message {
         .error(StringDiagnostic(str))
     }
@@ -175,6 +181,10 @@ extension Diagnostic.Message {
     public static func note(_ str: String) -> Diagnostic.Message {
         .note(StringDiagnostic(str))
     }
+
+    public static func remark(_ str: String) -> Diagnostic.Message {
+        .remark(StringDiagnostic(str))
+    }
 }
 
 public struct StringDiagnostic: DiagnosticData {

Sources/TSCUtility/Diagnostics.swift

@@ -54,6 +54,13 @@ extension DiagnosticsEngine {
         emit(.note(note), location: location)
     }
 
+  public func emit(
+      remark: String,
+      location: DiagnosticLocation = UnknownLocation.location
+  ) {
+      emit(.remark(remark), location: location)
+  }
+
     /// Emit a Swift error.
     ///
     /// Errors will be converted into diagnostic data if possible.

Tests/TSCBasicTests/DiagnosticsEngineTests.swift

@@ -83,15 +83,17 @@ class DiagnosticsEngineTests: XCTestCase {
         )
         diagnostics.emit(.error(StringDiagnostic("diag 2")), location: location)
         diagnostics.emit(.note(StringDiagnostic("diag 3")), location: location)
+        diagnostics.emit(.remark(StringDiagnostic("diag 4")), location: location)
         diagnostics.emit(.error(StringDiagnostic("end")), location: location)
 
-        XCTAssertEqual(handledDiagnostics.count, 4)
+        XCTAssertEqual(handledDiagnostics.count, 5)
         for diagnostic in handledDiagnostics {
             XCTAssertEqual(diagnostic.location.description, location.description)
         }
         XCTAssertEqual(handledDiagnostics[0].description, "literal foo, bar 2 str bar str")
         XCTAssertEqual(handledDiagnostics[1].description, "diag 2")
         XCTAssertEqual(handledDiagnostics[2].description, "diag 3")
-        XCTAssertEqual(handledDiagnostics[3].description, "end")
+        XCTAssertEqual(handledDiagnostics[3].description, "diag 4")
+        XCTAssertEqual(handledDiagnostics[4].description, "end")
     }
 }