wip

pointfreeco · Jul 10, 2024 · c29835d · c29835d
1 parent eaa3ad4
commit c29835d
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 22 deletions.
diff --git a/Sources/IssueReporting/IssueContext.swift b/Sources/IssueReporting/IssueContext.swift
@@ -14,7 +14,17 @@ public struct IssueContext: Sendable {
 
   /// The source `#column` to associate with an issue.
   public let column: UInt
-
+
+  /// Creates source context for an issue with the calling context.
+  public static func issueContext(
+    fileID: StaticString = #fileID,
+    filePath: StaticString = #filePath,
+    line: UInt = #line,
+    column: UInt = #column
+  ) -> Self {
+    Self(fileID: fileID, filePath: filePath, line: line, column: column)
+  }
+
   /// Creates source context for an issue.
   ///
   /// - Parameters:
@@ -23,10 +33,10 @@ public struct IssueContext: Sendable {
   ///   - line: The source `#line` to associate with an issue.
   ///   - column: The source `#column` to associate with an issue.
   public init(
-    fileID: StaticString = #fileID,
-    filePath: StaticString = #filePath,
-    line: UInt = #line,
-    column: UInt = #column
+    fileID: StaticString,
+    filePath: StaticString,
+    line: UInt,
+    column: UInt
   ) {
     self.fileID = fileID
     self.filePath = filePath

diff --git a/Sources/IssueReporting/ReportIssue.swift b/Sources/IssueReporting/ReportIssue.swift
@@ -16,7 +16,7 @@
 @_transparent
 public func reportIssue(
   _ message: @autoclosure () -> String = "",
-  context issueContext: IssueContext = IssueContext()
+  context issueContext: IssueContext = .issueContext()
 ) {
   switch TestContext.current {
   case .swiftTesting:

diff --git a/Sources/IssueReporting/Unimplemented.swift b/Sources/IssueReporting/Unimplemented.swift
@@ -11,7 +11,7 @@ public func unimplemented<each Argument, Result>(
   _ description: @autoclosure @escaping @Sendable () -> String = "",
   placeholder: @autoclosure @escaping @Sendable () -> Result = (),
   function: StaticString = #function,
-  context issueContext: IssueContext = IssueContext()
+  context issueContext: IssueContext = .issueContext()
 ) -> @Sendable (repeat each Argument) -> Result {
   return { (argument: repeat each Argument) in
     _fail(
@@ -35,7 +35,7 @@ public func unimplemented<each Argument, Result>(
 public func unimplemented<each Argument, Result>(
   _ description: @autoclosure @escaping @Sendable () -> String = "",
   function: StaticString = #function,
-  context issueContext: IssueContext = IssueContext()
+  context issueContext: IssueContext = .issueContext()
 ) -> @Sendable (repeat each Argument) throws -> Result {
   return { (argument: repeat each Argument) in
     let description = description()
@@ -62,7 +62,7 @@ public func unimplemented<each Argument, Result>(
   _ description: @autoclosure @escaping @Sendable () -> String = "",
   placeholder: @autoclosure @escaping @Sendable () -> Result = (),
   function: StaticString = #function,
-  context issueContext: IssueContext = IssueContext()
+  context issueContext: IssueContext = .issueContext()
 ) -> @Sendable (repeat each Argument) async -> Result {
   return { (argument: repeat each Argument) in
     _fail(
@@ -87,7 +87,7 @@ public func unimplemented<each Argument, Result>(
 public func unimplemented<each Argument, Result>(
   _ description: @autoclosure @escaping @Sendable () -> String = "",
   function: StaticString = #function,
-  context issueContext: IssueContext = IssueContext()
+  context issueContext: IssueContext = .issueContext()
 ) -> @Sendable (repeat each Argument) async throws -> Result {
   return { (argument: repeat each Argument) in
     let description = description()
@@ -106,7 +106,7 @@ public func unimplemented<Result>(
   _ description: @autoclosure @escaping @Sendable () -> String = "",
   placeholder: @autoclosure @escaping @Sendable () -> Result = (),
   function: StaticString = #function,
-  context issueContext: IssueContext = IssueContext()
+  context issueContext: IssueContext = .issueContext()
 ) -> Result {
   _fail(
     description(),

diff --git a/Sources/IssueReporting/WithExpectedIssue.swift b/Sources/IssueReporting/WithExpectedIssue.swift
@@ -33,7 +33,7 @@
 public func withExpectedIssue(
   _ message: String? = nil,
   isIntermittent: Bool = false,
-  context issueContext: IssueContext = IssueContext(),
+  context issueContext: IssueContext = .issueContext(),
   _ body: () throws -> Void
 ) {
   switch TestContext.current {

diff --git a/Sources/XCTestDynamicOverlay/Internal/Deprecations.swift b/Sources/XCTestDynamicOverlay/Internal/Deprecations.swift
@@ -15,8 +15,10 @@ public func XCTFail(_ message: String = "", file: StaticString = #filePath, line
   reportIssue(
     message,
     context: IssueContext(
+      fileID: XCTFailContext.current?.file ?? file,
       filePath: XCTFailContext.current?.file ?? file,
-      line: XCTFailContext.current?.line ?? line
+      line: XCTFailContext.current?.line ?? line,
+      column: 0
     )
   )
 }
@@ -298,7 +300,8 @@ public func unimplemented<each Argument, Result>(
       context: IssueContext(
         fileID: fileID,
         filePath: filePath,
-        line: line
+        line: line,
+        column: 0
       )
     )
     do {
@@ -491,11 +494,13 @@ public func XCTUnimplemented<each Argument, Result>(
   unimplemented(
     description(),
     placeholder: placeholder(),
-    fileID: fileID,
-    filePath: filePath,
     function: function,
-    line: line,
-    column: column
+    context: IssueContext(
+      fileID: fileID,
+      filePath: filePath,
+      line: line,
+      column: column
+    )
   )
 }
 
@@ -528,11 +533,13 @@ public func XCTUnimplemented<each Argument, Result>(
 ) -> @Sendable (repeat each Argument) throws -> Result {
   unimplemented(
     description(),
-    fileID: fileID,
-    filePath: filePath,
     function: function,
-    line: line,
-    column: column
+    context: IssueContext(
+      fileID: fileID,
+      filePath: filePath,
+      line: line,
+      column: column
+    )
   )
 }