Fix build warnings

Quite a few of these were reminders to clean things up once we no longer need to support testing using compilers and sourcekitd from older toolchains.

Author: ahoppen

Package.swift

@@ -123,12 +123,14 @@ var targets: [Target] = [
   .target(
     name: "CompletionScoring",
     dependencies: ["CCompletionScoring"],
+    exclude: ["CMakeLists.txt"],
     swiftSettings: globalSwiftSettings
   ),
 
   .target(
     name: "CompletionScoringForPlugin",
     dependencies: ["CCompletionScoring"],
+    exclude: ["CMakeLists.txt"],
     swiftSettings: globalSwiftSettings
   ),
 
@@ -549,6 +551,7 @@ var targets: [Target] = [
       "SwiftExtensionsForPlugin",
       "SwiftSourceKitPluginCommon",
     ],
+    exclude: ["CMakeLists.txt"],
     swiftSettings: globalSwiftSettings + [
       .unsafeFlags([
         "-module-alias", "SourceKitD=SourceKitDForPlugin",
@@ -568,6 +571,7 @@ var targets: [Target] = [
       "SwiftExtensionsForPlugin",
       "SKLoggingForPlugin",
     ],
+    exclude: ["CMakeLists.txt"],
     swiftSettings: globalSwiftSettings + [
       .unsafeFlags([
         "-module-alias", "SourceKitD=SourceKitDForPlugin",
@@ -590,6 +594,7 @@ var targets: [Target] = [
       "SwiftSourceKitPluginCommon",
       "SwiftExtensionsForPlugin",
     ],
+    exclude: ["CMakeLists.txt"],
     swiftSettings: globalSwiftSettings + [
       .unsafeFlags([
         "-module-alias", "CompletionScoring=CompletionScoringForPlugin",

Sources/BuildSystemIntegration/SwiftPMBuildSystem.swift

@@ -413,23 +413,7 @@ package actor SwiftPMBuildSystem: BuiltInBuildSystem {
 
       throw NonFileURIError(uri: file)
     }
-    let compileArguments = try buildTarget.compileArguments(for: fileURL)
-
-    #if compiler(>=6.1)
-    #warning("When we drop support for Swift 5.10 we no longer need to adjust compiler arguments for the Modules move")
-    #endif
-    // Fix up compiler arguments that point to a `/Modules` subdirectory if the Swift version in the toolchain is less
-    // than 6.0 because it places the modules one level higher up.
-    let toolchainVersion = await orLog("Getting Swift version") { try await toolchain.swiftVersion }
-    guard let toolchainVersion, toolchainVersion < SwiftVersion(6, 0) else {
-      return compileArguments
-    }
-    return compileArguments.map { argument in
-      if argument.hasSuffix("/Modules"), argument.contains(self.swiftPMWorkspace.location.scratchDirectory.pathString) {
-        return String(argument.dropLast(8))
-      }
-      return argument
-    }
+    return try buildTarget.compileArguments(for: fileURL)
   }
 
   package func buildTargets(request: WorkspaceBuildTargetsRequest) async throws -> WorkspaceBuildTargetsResponse {

Sources/SemanticIndex/UpdateIndexStoreTaskDescription.swift

@@ -576,12 +576,6 @@ private func adjustClangCompilerArgumentsForIndexStoreUpdate(
   return result
 }
 
-#if compiler(>=6.1)
-#warning(
-  "Remove -fmodules-validate-system-headers from supplementalClangIndexingArgs once all supported Swift compilers have https://github.com/apple/swift/pull/74063"
-)
-#endif
-
 fileprivate let supplementalClangIndexingArgs: [String] = [
   // Retain extra information for indexing
   "-fretain-comments-from-system-headers",
@@ -596,11 +590,6 @@ fileprivate let supplementalClangIndexingArgs: [String] = [
   "-Xclang", "-fallow-pcm-with-compiler-errors",
   "-Wno-non-modular-include-in-framework-module",
   "-Wno-incomplete-umbrella",
-
-  // sourcekitd adds `-fno-modules-validate-system-headers` before https://github.com/apple/swift/pull/74063.
-  // This completely disables system module validation and never re-builds pcm for system modules. The intended behavior
-  // is to only re-build those PCMs once per sourcekitd session.
-  "-fmodules-validate-system-headers",
 ]
 
 fileprivate extension Sequence {

Sources/SourceKitLSP/Documentation/DocCServer.swift

@@ -58,7 +58,7 @@ package struct DocCServer {
     let request = ConvertRequest(
       bundleInfo: DocumentationBundle.Info(
         displayName: documentationBundleDisplayName,
-        identifier: documentationBundleIdentifier,
+        id: DocumentationBundle.Identifier(rawValue: documentationBundleIdentifier),
         defaultCodeListingLanguage: nil,
         defaultAvailability: nil,
         defaultModuleKind: nil

Sources/SourceKitLSP/Swift/CursorInfo.swift

@@ -30,15 +30,6 @@ struct CursorInfo {
   /// The annotated declaration XML string.
   var annotatedDeclaration: String?
 
-  #if swift(>=6.2)
-  #warning(
-    "Documentation transitioned from XML to the raw string in Swift 6.0. We should be able to remove documentationXML now"
-  )
-  #endif
-  /// The documentation comment XML string. The schema is at
-  /// https://github.com/apple/swift/blob/main/bindings/xml/comment-xml-schema.rng
-  var documentationXML: String?
-
   /// The documentation as it is spelled in
   var documentation: String?
 
@@ -48,12 +39,10 @@ struct CursorInfo {
   init(
     _ symbolInfo: SymbolDetails,
     annotatedDeclaration: String?,
-    documentationXML: String?,
     documentation: String?
   ) {
     self.symbolInfo = symbolInfo
     self.annotatedDeclaration = annotatedDeclaration
-    self.documentationXML = documentationXML
     self.documentation = documentation
   }
 
@@ -106,7 +95,6 @@ struct CursorInfo {
         systemModule: module
       ),
       annotatedDeclaration: dict[keys.annotatedDecl],
-      documentationXML: dict[keys.docFullAsXML],
       documentation: dict[keys.docComment]
     )
   }

Sources/SourceKitLSP/Swift/SwiftLanguageService.swift

@@ -741,10 +741,6 @@ extension SwiftLanguageService {
         }
         result += documentation
         return result
-      } else if let doc = cursorInfo.documentationXML {
-        return """
-          \(orLog("Convert XML to Markdown") { try xmlDocumentationToMarkdown(doc) } ?? doc)
-          """
       } else if let annotated: String = cursorInfo.annotatedDeclaration {
         return """
           \(orLog("Convert XML to Markdown") { try xmlDocumentationToMarkdown(annotated) } ?? annotated)

Sources/SwiftExtensions/Atomics.swift

@@ -12,10 +12,7 @@
 
 import CAtomics
 
-#if compiler(>=6.2)
-#warning("We should be able to use atomics in the stdlib when we raise the deployment target to require Swift 6")
-#endif
-
+// TODO: Use atomic types from the standard library (https://github.com/swiftlang/sourcekit-lsp/issues/1949)
 package final class AtomicBool: Sendable {
   private nonisolated(unsafe) let atomic: UnsafeMutablePointer<CAtomicUInt32>
 

Sources/SwiftSourceKitPlugin/Plugin.swift

@@ -246,7 +246,7 @@ public func sourcekitd_plugin_initialize_2(
     )
   } else {
     DynamicallyLoadedSourceKitD.forPlugin = try! DynamicallyLoadedSourceKitD.inProcLibrary(
-      relativeTo: URL(fileURLWithPath: String(cString: parentLibraryPath))
+      relativeTo: URL(fileURLWithPath: parentLibraryPath)
     )
   }
   #else