fixed various test issues, format

Author: Wang Lun

Sources/SourceKitLSP/SourceKitLSPServer.swift

@@ -1854,7 +1854,7 @@ extension SourceKitLSPServer {
       // For module symbols, prefer using systemModule information if available
       let moduleName: String
       let groupName: String?
-      
+
       if let systemModule = symbol.systemModule {
         moduleName = systemModule.moduleName
         groupName = systemModule.groupName
@@ -1864,7 +1864,7 @@ extension SourceKitLSPServer {
       } else {
         return []
       }
-      
+
       let interfaceLocation = try await self.definitionInInterface(
         moduleName: moduleName,
         groupName: groupName,
@@ -2067,10 +2067,12 @@ extension SourceKitLSPServer {
   ) async throws -> Location {
     // Check if we're already in the target interface with the same module/group/symbol
     if case .generatedInterface(let interfaceData) = try? ReferenceDocumentURL(from: originatorUri),
-       interfaceData.moduleName == moduleName && interfaceData.groupName == groupName {
+      interfaceData.moduleName == moduleName && interfaceData.groupName == groupName
+    {
       // If we have a specific symbol USR, try to find its position in the current interface
       if let symbolUSR = symbolUSR,
-         let swiftLanguageService = languageService as? SwiftLanguageService {
+        let swiftLanguageService = languageService as? SwiftLanguageService
+      {
         do {
           let position = try await swiftLanguageService.generatedInterfaceManager.position(
             ofUsr: symbolUSR,

Tests/SourceKitLSPTests/SwiftInterfaceTests.swift

@@ -153,7 +153,7 @@ final class SwiftInterfaceTests: XCTestCase {
           public init() {}
         }
         """,
-        "Exec/main.swift": "import 1️⃣MyLibrary"
+        "Exec/main.swift": "import 1️⃣MyLibrary",
       ],
       manifest: """
         let package = Package(
@@ -196,13 +196,21 @@ final class SwiftInterfaceTests: XCTestCase {
   func testSemanticFunctionalityInGeneratedInterface() async throws {
     let project = try await SwiftPMTestProject(
       files: [
-        "MyLibrary/MyLibrary.swift": "public struct Lib { public func foo() -> String {} }",
-        "Exec/main.swift": "import 1️⃣MyLibrary"
+        "MyLibrary/MyLibrary.swift": """
+        public struct Lib {
+          public func foo() -> String {}
+          public init() {}
+        }
+        """,
+        "Exec/main.swift": "import 1️⃣MyLibrary",
       ],
       manifest: """
         let package = Package(
           name: "MyLibrary",
-          targets: [.target(name: "MyLibrary"), .executableTarget(name: "Exec", dependencies: ["MyLibrary"])]
+          targets: [
+            .target(name: "MyLibrary"),
+            .executableTarget(name: "Exec", dependencies: ["MyLibrary"])
+          ]
         )
         """,
       capabilities: ClientCapabilities(experimental: [
@@ -217,21 +225,28 @@ final class SwiftInterfaceTests: XCTestCase {
     )
     let referenceDocumentUri = try XCTUnwrap(response?.locations?.only).uri
     let referenceDocument = try await project.testClient.send(GetReferenceDocumentRequest(uri: referenceDocumentUri))
-    
+
     // Test hover functionality in the interface
-    if let stringIndex = referenceDocument.content.firstRange(of: "-> String") {
-      let (line, column) = LineTable(referenceDocument.content)
-        .lineAndUTF16ColumnOf(referenceDocument.content.index(stringIndex.lowerBound, offsetBy: 3))
-      project.testClient.send(
-        DidOpenTextDocumentNotification(
-          textDocument: TextDocumentItem(uri: referenceDocumentUri, language: .swift, version: 0, text: referenceDocument.content)
+    let stringIndex = try XCTUnwrap(referenceDocument.content.firstRange(of: "-> String"))
+    let (line, column) = LineTable(referenceDocument.content)
+      .lineAndUTF16ColumnOf(referenceDocument.content.index(stringIndex.lowerBound, offsetBy: 3))
+    project.testClient.send(
+      DidOpenTextDocumentNotification(
+        textDocument: TextDocumentItem(
+          uri: referenceDocumentUri,
+          language: .swift,
+          version: 0,
+          text: referenceDocument.content
         )
       )
-      let hover = try await project.testClient.send(
-        HoverRequest(textDocument: TextDocumentIdentifier(referenceDocumentUri), position: Position(line: line, utf16index: column))
+    )
+    let hover = try await project.testClient.send(
+      HoverRequest(
+        textDocument: TextDocumentIdentifier(referenceDocumentUri),
+        position: Position(line: line, utf16index: column)
       )
-      XCTAssertNotNil(hover)
-    }
+    )
+    XCTAssertNotNil(hover)
   }
 
   func testJumpToSynthesizedExtensionMethodInSystemModuleWithoutIndex() async throws {
@@ -313,13 +328,11 @@ final class SwiftInterfaceTests: XCTestCase {
         GetReferenceDocumentRequest.method: .dictionary(["supported": .bool(true)])
       ])
     )
-    let uri = DocumentURI(for: .swiftinterface)
+    let uri = DocumentURI(for: .swift)
 
     let positions = testClient.openDocument(
       """
-      func test(x: 1️⃣String) {
-        let a: 2️⃣Int = 5
-      }
+      func test(x: 1️⃣String) {}
       """,
       uri: uri
     )
@@ -331,25 +344,13 @@ final class SwiftInterfaceTests: XCTestCase {
     let interfaceUri = try XCTUnwrap(stringDefinition?.locations?.only?.uri)
     let interfaceContents = try await testClient.send(GetReferenceDocumentRequest(uri: interfaceUri))
     // Open the interface document
-    testClient.send(
-      DidOpenTextDocumentNotification(
-        textDocument: TextDocumentItem(
-          uri: interfaceUri,
-          language: .swift,
-          version: 0,
-          text: interfaceContents.content
-        )
-      )
-    )
+    testClient.openDocument(interfaceContents.content, uri: interfaceUri, language: .swift)
 
     // Find a symbol within the interface (e.g., "init" method in String)
-    guard let initRange = interfaceContents.content.range(of: "public init()") else {
-      XCTFail("Could not find 'public init()' in String interface")
-      return
-    }
+    let initRange = try XCTUnwrap(interfaceContents.content.range(of: "public init()"))
     let lineTable = LineTable(interfaceContents.content)
     let (line, column) = lineTable.lineAndUTF16ColumnOf(initRange.lowerBound)
-    let initPosition = Position(line: line, utf16index: column + 7) // Position on "init"
+    let initPosition = Position(line: line, utf16index: column + 7)  // Position on "init"
 
     // Test definition request within the interface
     let internalDefinition = try await testClient.send(
@@ -359,18 +360,9 @@ final class SwiftInterfaceTests: XCTestCase {
       )
     )
 
-    // The definition should either:
-    // 1. Return a position within the same interface (internal navigation)
-    // 2. Return the same position if it's already at the definition
-    // 3. Return nil if no definition is available
-    if let location = internalDefinition?.locations?.first {
-      // If we get a location, it should be in the same interface or a related one
-      XCTAssertTrue(
-        location.uri.pseudoPath.hasSuffix(".swiftinterface") ||
-        location.uri == interfaceUri,
-        "Internal navigation should stay within interface files, got: \(location.uri.pseudoPath)"
-      )
-    }
+    let location = try XCTUnwrap(internalDefinition?.locations?.first)
+    XCTAssertTrue(location.uri.pseudoPath.hasSuffix(".swiftinterface"))
+    XCTAssertTrue(location.uri == interfaceUri)
   }
 
   func testFoundationImportNavigation() async throws {
@@ -385,7 +377,8 @@ final class SwiftInterfaceTests: XCTestCase {
       """
       import 1️⃣Foundation
       """,
-      uri: uri
+      uri: uri,
+      language: .swift
     )
 
     // Test navigation to Foundation module
@@ -394,11 +387,8 @@ final class SwiftInterfaceTests: XCTestCase {
     )
     let foundationLocation = try XCTUnwrap(foundationDefinition?.locations?.only)
     // Verify it's a swiftinterface file (can be either file:// or sourcekit-lsp:// scheme)
-    XCTAssertTrue(
-      foundationLocation.uri.pseudoPath.hasSuffix(".swiftinterface") ||
-      (foundationLocation.uri.scheme == "sourcekit-lsp" && 
-       foundationLocation.uri.pseudoPath.contains("Foundation.swiftinterface"))
-    )
+    XCTAssertTrue(foundationLocation.uri.scheme == "sourcekit-lsp")
+    XCTAssertTrue(foundationLocation.uri.pseudoPath.hasSuffix("Foundation.swiftinterface"))
   }
 
   func testFoundationSubmoduleNavigation() async throws {
@@ -419,23 +409,18 @@ final class SwiftInterfaceTests: XCTestCase {
     let foundationDefinition = try await testClient.send(
       DefinitionRequest(textDocument: TextDocumentIdentifier(uri), position: positions["1️⃣"])
     )
-    if let foundationLocation = foundationDefinition?.locations?.only {
-      XCTAssertTrue(
-        foundationLocation.uri.pseudoPath.contains("Foundation.swiftinterface") ||
-        foundationLocation.uri.scheme == "sourcekit-lsp"
-      )
-    }
+    let foundationLocation = try XCTUnwrap(foundationDefinition?.locations?.only)
+    XCTAssertTrue(foundationLocation.uri.pseudoPath.contains("Foundation.swiftinterface"))
+    XCTAssertTrue(foundationLocation.uri.scheme == "sourcekit-lsp")
+
     // Test navigation to NSAffineTransform
     let transformDefinition = try await testClient.send(
       DefinitionRequest(textDocument: TextDocumentIdentifier(uri), position: positions["2️⃣"])
     )
-    if let transformLocation = transformDefinition?.locations?.only {
-      // Verify we can identify this as a swiftinterface file
-      XCTAssertTrue(
-        transformLocation.uri.pseudoPath.contains("Foundation.NSAffineTransform.swiftinterface") ||
-        transformLocation.uri.scheme == "sourcekit-lsp"
-      )
-    }
+    let transformLocation = try XCTUnwrap(transformDefinition?.locations?.only)
+    // Verify we can identify this as a swiftinterface file
+    XCTAssertTrue(transformLocation.uri.pseudoPath.contains("Foundation.NSAffineTransform.swiftinterface"))
+    XCTAssertTrue(transformLocation.uri.scheme == "sourcekit-lsp")
   }
 }