Merge pull request #4 from diogot/feature/fix-source-url-parsing

Fix sourceURL parsing for xcresulttool query-string format

Author: diogot

Sources/XCResultParser/Models/SourceLocation.swift

@@ -32,19 +32,53 @@ public struct SourceLocation: Sendable, Equatable {
     }
 
     /// Parse sourceURL from build issues
-    /// Format: `file:///absolute/path/to/File.swift#LineNumber`
+    /// Format: `file:///path/File.swift#EndingColumnNumber=X&EndingLineNumber=X&StartingColumnNumber=X&StartingLineNumber=X&Timestamp=X`
+    /// Note: Line numbers in xcresulttool are 0-based, so we add 1 for 1-based output
     public static func fromSourceURL(_ urlString: String) -> SourceLocation? {
         guard urlString.hasPrefix("file://") else { return nil }
 
         let withoutScheme = String(urlString.dropFirst(7))
         let parts = withoutScheme.split(separator: "#", maxSplits: 1)
         let absolutePath = String(parts[0])
-        let line = parts.count > 1 ? Int(parts[1]) : nil
+
+        var line: Int?
+        var column: Int?
+
+        // Parse query-string fragment if present
+        if parts.count > 1 {
+            let fragment = String(parts[1])
+            let params = fragment.split(separator: "&")
+
+            for param in params {
+                let keyValue = param.split(separator: "=", maxSplits: 1)
+                guard keyValue.count == 2 else { continue }
+
+                let key = String(keyValue[0])
+                let value = String(keyValue[1])
+
+                switch key {
+                case "StartingLineNumber":
+                    // xcresulttool uses 0-based line numbers, convert to 1-based
+                    if let num = Int(value) {
+                        line = num + 1
+                    }
+                case "StartingColumnNumber":
+                    // xcresulttool uses 0-based column numbers, convert to 1-based
+                    if let num = Int(value) {
+                        column = num + 1
+                    }
+                default:
+                    break
+                }
+            }
+        }
+
+        guard let line else { return nil }
 
         return SourceLocation(
             file: absolutePath,
-            line: line ?? 1,
-            column: nil
+            line: line,
+            column: column
         )
     }
 

Tests/XCResultParserTests/Fixtures/build-results-errors.json

@@ -9,14 +9,14 @@
       "issueType": "Error",
       "message": "Cannot find 'undefinedVariable' in scope",
       "targetName": "SampleProject",
-      "sourceURL": "file:///Users/dev/SampleProject/Sources/BrokenFile.swift#25",
+      "sourceURL": "file:///Users/dev/SampleProject/Sources/BrokenFile.swift#StartingLineNumber=24&StartingColumnNumber=0",
       "className": "BrokenFile"
     },
     {
       "issueType": "Error",
       "message": "Type 'String' has no member 'nonExistent'",
       "targetName": "SampleProject",
-      "sourceURL": "file:///Users/dev/SampleProject/Sources/BrokenFile.swift#30"
+      "sourceURL": "file:///Users/dev/SampleProject/Sources/BrokenFile.swift#StartingLineNumber=29&StartingColumnNumber=0"
     }
   ],
   "startTime": 1763935325.829,
@@ -27,7 +27,7 @@
       "issueType": "Warning",
       "message": "Initialization of variable was never used",
       "targetName": "SampleProject",
-      "sourceURL": "file:///Users/dev/SampleProject/Sources/Other.swift#10"
+      "sourceURL": "file:///Users/dev/SampleProject/Sources/Other.swift#StartingLineNumber=9&StartingColumnNumber=0"
     }
   ]
 }

Tests/XCResultParserTests/Fixtures/build-results-warnings.json

@@ -6,7 +6,7 @@
       "issueType": "Analyzer Warning",
       "message": "Potential memory leak",
       "targetName": "SampleProject",
-      "sourceURL": "file:///Users/dev/SampleProject/Sources/Memory.swift#42",
+      "sourceURL": "file:///Users/dev/SampleProject/Sources/Memory.swift#StartingLineNumber=41&StartingColumnNumber=0",
       "className": "Memory"
     }
   ],
@@ -21,14 +21,14 @@
       "issueType": "Warning",
       "message": "Variable 'unused' was never used",
       "targetName": "SampleProject",
-      "sourceURL": "file:///Users/dev/SampleProject/Sources/ContentView.swift#15",
+      "sourceURL": "file:///Users/dev/SampleProject/Sources/ContentView.swift#StartingLineNumber=14&StartingColumnNumber=0",
       "className": "ContentView"
     },
     {
       "issueType": "Warning",
       "message": "Deprecated API usage",
       "targetName": "SampleProject",
-      "sourceURL": "file:///Users/dev/SampleProject/Sources/LegacyCode.swift#100"
+      "sourceURL": "file:///Users/dev/SampleProject/Sources/LegacyCode.swift#StartingLineNumber=99&StartingColumnNumber=0"
     }
   ]
 }

Tests/XCResultParserTests/SourceLocationTests.swift

@@ -3,25 +3,35 @@ import Testing
 
 @Suite("SourceLocation Tests")
 struct SourceLocationTests {
-    @Test("Parse source URL with line number")
-    func parseSourceURLWithLine() {
-        let url = "file:///Users/dev/SampleProject/Sources/ContentView.swift#15"
+    @Test("Parse source URL with xcresulttool format")
+    func parseSourceURLWithXcresulttoolFormat() {
+        // Real format from xcresulttool - line numbers are 0-based
+        let url = "file:///Users/dev/SampleProject/Sources/ContentView.swift#EndingColumnNumber=30&EndingLineNumber=14&StartingColumnNumber=30&StartingLineNumber=14&Timestamp=786206164.289793"
         let location = SourceLocation.fromSourceURL(url)
 
         #expect(location != nil)
         #expect(location?.file == "/Users/dev/SampleProject/Sources/ContentView.swift")
-        #expect(location?.line == 15)
-        #expect(location?.column == nil)
+        #expect(location?.line == 15) // 0-based 14 becomes 1-based 15
+        #expect(location?.column == 31) // 0-based 30 becomes 1-based 31
     }
 
-    @Test("Parse source URL without line number defaults to 1")
-    func parseSourceURLWithoutLine() {
+    @Test("Parse source URL without fragment returns nil")
+    func parseSourceURLWithoutFragment() {
         let url = "file:///Users/dev/SampleProject/Sources/ContentView.swift"
         let location = SourceLocation.fromSourceURL(url)
 
+        #expect(location == nil)
+    }
+
+    @Test("Parse source URL with minimal fragment")
+    func parseSourceURLWithMinimalFragment() {
+        let url = "file:///Users/dev/SampleProject/Sources/ContentView.swift#StartingLineNumber=9"
+        let location = SourceLocation.fromSourceURL(url)
+
         #expect(location != nil)
         #expect(location?.file == "/Users/dev/SampleProject/Sources/ContentView.swift")
-        #expect(location?.line == 1)
+        #expect(location?.line == 10) // 0-based 9 becomes 1-based 10
+        #expect(location?.column == nil)
     }
 
     @Test("Parse invalid URL returns nil")
@@ -30,6 +40,14 @@ struct SourceLocationTests {
         #expect(location == nil)
     }
 
+    @Test("Parse source URL with invalid fragment returns nil")
+    func parseSourceURLWithInvalidFragment() {
+        let url = "file:///Users/dev/SampleProject/Sources/ContentView.swift#InvalidFragment"
+        let location = SourceLocation.fromSourceURL(url)
+
+        #expect(location == nil)
+    }
+
     @Test("Parse failure message with location")
     func parseFailureMessageWithLocation() {
         let name = "SampleProjectTests.swift:14: Issue recorded: This test will always fail"