Merge pull request #2183 from hamishknight/2175-6.2

Author: hamishknight

Sources/SourceKitLSP/Swift/Diagnostic.swift

@@ -248,10 +248,19 @@ extension Diagnostic {
       educationalNotePaths.count > 0,
       let primaryPath = educationalNotePaths[0]
     {
-      let url = URL(fileURLWithPath: primaryPath)
-      let name = url.deletingPathExtension().lastPathComponent
-      code = .string(name)
-      codeDescription = .init(href: DocumentURI(url))
+      // Swift >= 6.2 returns a URL rather than a file path
+      let url: URL? =
+        if primaryPath.starts(with: "http") {
+          URL(string: primaryPath)
+        } else {
+          URL(fileURLWithPath: primaryPath)
+        }
+
+      if let url {
+        let name = url.deletingPathExtension().lastPathComponent
+        code = .string(name)
+        codeDescription = .init(href: DocumentURI(url))
+      }
     }
 
     var actions: [CodeAction]? = nil

Tests/SourceKitLSPTests/LocalSwiftTests.swift

@@ -379,8 +379,13 @@ final class LocalSwiftTests: XCTestCase {
     XCTAssertEqual(diags.diagnostics.count, 1)
     let diag = diags.diagnostics.first!
     XCTAssertEqual(diag.code, .string("property-wrapper-requirements"))
-    let filename = try XCTUnwrap(diag.codeDescription?.href.fileURL?.lastPathComponent)
-    XCTAssert(filename.starts(with: "property-wrapper-requirements"))
+
+    let noteUri = try XCTUnwrap(diag.codeDescription?.href)
+    if noteUri.fileURL != nil {
+      // Check we're not creating an absolute path out of a URL
+      XCTAssertFalse(noteUri.stringValue.contains("https://"))
+    }
+    XCTAssert(noteUri.arbitrarySchemeURL.lastPathComponent.starts(with: "property-wrapper-requirements"))
   }
 
   func testFixitsAreIncludedInPublishDiagnostics() async throws {