Merge pull request #1573 from ahoppen/package-access-level

Author: ahoppen

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version: 5.8
+// swift-tools-version: 5.9
 
 import Foundation
 import PackageDescription

Sources/CMakeLists.txt

@@ -1,3 +1,4 @@
+add_compile_options("$<$<COMPILE_LANGUAGE:Swift>:SHELL:-package-name SourceKitLSP>")
 add_subdirectory(BuildServerProtocol)
 add_subdirectory(CAtomics)
 add_subdirectory(Csourcekitd)

Sources/Diagnose/DebugCommand.swift

@@ -12,8 +12,8 @@
 
 import ArgumentParser
 
-public struct DebugCommand: ParsableCommand {
-  public static let configuration = CommandConfiguration(
+package struct DebugCommand: ParsableCommand {
+  package static let configuration = CommandConfiguration(
     commandName: "debug",
     abstract: "Commands to debug sourcekit-lsp. Intended for developers of sourcekit-lsp",
     subcommands: [
@@ -24,5 +24,5 @@ public struct DebugCommand: ParsableCommand {
     ]
   )
 
-  public init() {}
+  package init() {}
 }

Sources/Diagnose/DiagnoseCommand.swift

@@ -40,8 +40,8 @@ fileprivate enum BundleComponent: String, CaseIterable, ExpressibleByArgument {
   case swiftFrontendCrashes = "swift-frontend-crashes"
 }
 
-public struct DiagnoseCommand: AsyncParsableCommand {
-  public static let configuration: CommandConfiguration = CommandConfiguration(
+package struct DiagnoseCommand: AsyncParsableCommand {
+  package static let configuration: CommandConfiguration = CommandConfiguration(
     commandName: "diagnose",
     abstract: "Creates a bundle containing information that help diagnose issues with sourcekit-lsp"
   )
@@ -109,7 +109,7 @@ public struct DiagnoseCommand: AsyncParsableCommand {
     ["/Library/Logs/DiagnosticReports", "~/Library/Logs/DiagnosticReports"]
   }
 
-  public init() {}
+  package init() {}
 
   @MainActor
   private func addSourcekitdCrashReproducer(toBundle bundlePath: URL) async throws {
@@ -341,7 +341,7 @@ public struct DiagnoseCommand: AsyncParsableCommand {
   }
 
   @MainActor
-  public func run() async throws {
+  package func run() async throws {
     // IMPORTANT: When adding information to this message, also add it to the message displayed in VS Code
     // (captureDiagnostics.ts in the vscode-swift repository)
     print(

Sources/Diagnose/IndexCommand.swift

@@ -52,8 +52,8 @@ private actor IndexLogMessageHandler: MessageHandler {
 
 }
 
-public struct IndexCommand: AsyncParsableCommand {
-  public static let configuration: CommandConfiguration = CommandConfiguration(
+package struct IndexCommand: AsyncParsableCommand {
+  package static let configuration: CommandConfiguration = CommandConfiguration(
     commandName: "index",
     abstract: "Index a project and print all the processes executed for it as well as their outputs"
   )
@@ -79,9 +79,9 @@ public struct IndexCommand: AsyncParsableCommand {
   @Option(help: "The path to the project that should be indexed")
   var project: String
 
-  public init() {}
+  package init() {}
 
-  public func run() async throws {
+  package func run() async throws {
     let options = SourceKitLSPOptions(
       backgroundIndexing: true,
       experimentalFeatures: Set(experimentalFeatures)

Sources/Diagnose/ReduceCommand.swift

@@ -18,8 +18,8 @@ import struct TSCBasic.AbsolutePath
 import class TSCBasic.Process
 import class TSCUtility.PercentProgressAnimation
 
-public struct ReduceCommand: AsyncParsableCommand {
-  public static let configuration: CommandConfiguration = CommandConfiguration(
+package struct ReduceCommand: AsyncParsableCommand {
+  package static let configuration: CommandConfiguration = CommandConfiguration(
     commandName: "reduce",
     abstract: "Reduce a single sourcekitd crash"
   )
@@ -65,10 +65,10 @@ public struct ReduceCommand: AsyncParsableCommand {
     }
   }
 
-  public init() {}
+  package init() {}
 
   @MainActor
-  public func run() async throws {
+  package func run() async throws {
     guard let sourcekitd = try await toolchain?.sourcekitd else {
       throw ReductionError("Unable to find sourcekitd.framework")
     }

Sources/Diagnose/ReduceFrontendCommand.swift

@@ -18,8 +18,8 @@ import struct TSCBasic.AbsolutePath
 import class TSCBasic.Process
 import class TSCUtility.PercentProgressAnimation
 
-public struct ReduceFrontendCommand: AsyncParsableCommand {
-  public static let configuration: CommandConfiguration = CommandConfiguration(
+package struct ReduceFrontendCommand: AsyncParsableCommand {
+  package static let configuration: CommandConfiguration = CommandConfiguration(
     commandName: "reduce-frontend",
     abstract: "Reduce a single swift-frontend crash"
   )
@@ -73,10 +73,10 @@ public struct ReduceFrontendCommand: AsyncParsableCommand {
     }
   }
 
-  public init() {}
+  package init() {}
 
   @MainActor
-  public func run() async throws {
+  package func run() async throws {
     guard let sourcekitd = try await toolchain?.sourcekitd else {
       throw ReductionError("Unable to find sourcekitd.framework")
     }

Sources/Diagnose/ReduceSwiftFrontend.swift

@@ -11,8 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 @MainActor
-@_spi(Testing)
-public func reduceFrontendIssue(
+package func reduceFrontendIssue(
   frontendArgs: [String],
   using executor: SourceKitRequestExecutor,
   progressUpdate: (_ progress: Double, _ message: String) -> Void

Sources/Diagnose/RequestInfo.swift

@@ -14,8 +14,7 @@ import Foundation
 import RegexBuilder
 
 /// All the information necessary to replay a sourcektid request.
-@_spi(Testing)
-public struct RequestInfo: Sendable {
+package struct RequestInfo: Sendable {
   /// The JSON request object. Contains the following dynamic placeholders:
   ///  - `$OFFSET`: To be replaced by `offset` before running the request
   ///  - `$FILE`: Will be replaced with a path to the file that contains the reduced source code.
@@ -27,15 +26,12 @@ public struct RequestInfo: Sendable {
   var offset: Int
 
   /// The compiler arguments of the request. Replaces the `$COMPILER_ARGS`placeholder in the request template.
-  @_spi(Testing)
-  public var compilerArgs: [String]
+  package var compilerArgs: [String]
 
   /// The contents of the file that the sourcekitd request operates on.
-  @_spi(Testing)
-  public var fileContents: String
+  package var fileContents: String
 
-  @_spi(Testing)
-  public func request(for file: URL) throws -> String {
+  package func request(for file: URL) throws -> String {
     let encoder = JSONEncoder()
     encoder.outputFormatting = .prettyPrinted
     guard var compilerArgs = String(data: try encoder.encode(compilerArgs), encoding: .utf8) else {
@@ -60,8 +56,7 @@ public struct RequestInfo: Sendable {
     }
     """
 
-  @_spi(Testing)
-  public init(requestTemplate: String, offset: Int, compilerArgs: [String], fileContents: String) {
+  package init(requestTemplate: String, offset: Int, compilerArgs: [String], fileContents: String) {
     self.requestTemplate = requestTemplate
     self.offset = offset
     self.compilerArgs = compilerArgs
@@ -71,8 +66,7 @@ public struct RequestInfo: Sendable {
   /// Creates `RequestInfo` from the contents of the JSON sourcekitd request at `requestPath`.
   ///
   /// The contents of the source file are read from disk.
-  @_spi(Testing)
-  public init(request: String) throws {
+  package init(request: String) throws {
     var requestTemplate = request
 
     // Extract offset

Sources/Diagnose/RunSourcekitdRequestCommand.swift

@@ -18,8 +18,8 @@ import SourceKitD
 
 import struct TSCBasic.AbsolutePath
 
-public struct RunSourceKitdRequestCommand: AsyncParsableCommand {
-  public static let configuration = CommandConfiguration(
+package struct RunSourceKitdRequestCommand: AsyncParsableCommand {
+  package static let configuration = CommandConfiguration(
     commandName: "run-sourcekitd-request",
     abstract: "Run a sourcekitd request and print its result"
   )
@@ -39,9 +39,9 @@ public struct RunSourceKitdRequestCommand: AsyncParsableCommand {
   @Option(help: "line:column override for key.offset")
   var position: String?
 
-  public init() {}
+  package init() {}
 
-  public func run() async throws {
+  package func run() async throws {
     var requestString = try String(contentsOf: URL(fileURLWithPath: sourcekitdRequestPath))
 
     let installPath = try AbsolutePath(validating: Bundle.main.bundlePath)