Adopt MemberImportVisibility

Author: ahoppen

Package.swift

@@ -5,7 +5,8 @@ import PackageDescription
 
 /// Swift settings that should be applied to every Swift target.
 let globalSwiftSettings: [SwiftSetting] = [
-  .enableUpcomingFeature("InternalImportsByDefault")
+  .enableUpcomingFeature("InternalImportsByDefault"),
+  .enableUpcomingFeature("MemberImportVisibility"),
 ]
 
 var products: [Product] = [

Sources/BuildSystemIntegration/BuildTargetIdentifierExtensions.swift

@@ -12,9 +12,11 @@
 
 #if compiler(>=6)
 package import BuildServerProtocol
+import LanguageServerProtocol
 import SKLogging
 #else
 import BuildServerProtocol
+import LanguageServerProtocol
 import SKLogging
 #endif
 

Sources/BuildSystemIntegration/CompilationDatabase.swift

@@ -16,6 +16,7 @@ import Foundation
 package import LanguageServerProtocol
 import SKLogging
 import SKSupport
+import SwiftExtensions
 
 package import struct TSCBasic.AbsolutePath
 package import protocol TSCBasic.FileSystem
@@ -27,6 +28,7 @@ import Foundation
 import LanguageServerProtocol
 import SKLogging
 import SKSupport
+import SwiftExtensions
 
 import struct TSCBasic.AbsolutePath
 import protocol TSCBasic.FileSystem

Sources/BuildSystemIntegration/ExternalBuildSystemAdapter.swift

@@ -16,6 +16,7 @@ import LanguageServerProtocol
 import LanguageServerProtocolJSONRPC
 import SKLogging
 import SKOptions
+import SKSupport
 import SwiftExtensions
 
 import struct TSCBasic.AbsolutePath

Sources/BuildSystemIntegration/FallbackBuildSettings.swift

@@ -11,15 +11,19 @@
 //===----------------------------------------------------------------------===//
 
 #if compiler(>=6)
+import Foundation
 package import LanguageServerProtocol
 package import SKOptions
+import SKSupport
 
 import enum PackageLoading.Platform
 import struct TSCBasic.AbsolutePath
 import class TSCBasic.Process
 #else
+import Foundation
 import LanguageServerProtocol
 import SKOptions
+import SKSupport
 
 import enum PackageLoading.Platform
 import struct TSCBasic.AbsolutePath

Sources/BuildSystemIntegration/FileBuildSettings.swift

@@ -12,6 +12,7 @@
 
 import Foundation
 import LanguageServerProtocol
+import SKSupport
 
 /// Build settings for a single file.
 ///

Sources/Diagnose/DiagnoseCommand.swift

@@ -14,6 +14,7 @@
 package import ArgumentParser
 import Foundation
 import ToolchainRegistry
+import SKSupport
 import SwiftExtensions
 
 import struct TSCBasic.AbsolutePath
@@ -23,6 +24,7 @@ import class TSCUtility.PercentProgressAnimation
 import ArgumentParser
 import Foundation
 import ToolchainRegistry
+import SKSupport
 import SwiftExtensions
 
 import struct TSCBasic.AbsolutePath

Sources/Diagnose/ReproducerBundle.swift

@@ -14,6 +14,8 @@ import Foundation
 import SwiftExtensions
 import ToolchainRegistry
 
+import struct TSCBasic.AbsolutePath
+
 /// Create a folder that contains all files that should be necessary to reproduce a sourcekitd crash.
 /// - Parameters:
 ///   - requestInfo: The reduced request info

Sources/Diagnose/RequestInfo.swift

@@ -166,6 +166,9 @@ private func extractCompilerArguments(
   }
   let template = lines[...compilerArgsStartIndex] + ["$COMPILER_ARGS"] + lines[compilerArgsEndIndex...]
   let compilerArgsJson = "[" + lines[(compilerArgsStartIndex + 1)..<compilerArgsEndIndex].joined(separator: "\n") + "]"
-  let compilerArgs = try JSONDecoder().decode([String].self, from: compilerArgsJson)
+  guard let data = compilerArgsJson.data(using: .utf8) else {
+    throw GenericError("Failed to represent compiler argument JSON in UTF-8")
+  }
+  let compilerArgs = try JSONDecoder().decode([String].self, from: data)
   return (template.joined(separator: "\n"), compilerArgs)
 }

Sources/Diagnose/RunSourcekitdRequestCommand.swift

@@ -73,7 +73,7 @@ package struct RunSourceKitdRequestCommand: AsyncParsableCommand {
 
     for sourcekitdRequestPath in sourcekitdRequestPaths {
       var requestString = try String(contentsOf: URL(fileURLWithPath: sourcekitdRequestPath), encoding: .utf8)
-      if let lineColumn = position?.split(separator: ":", maxSplits: 2).map(Int.init),
+      if let lineColumn = position?.split(separator: ":", maxSplits: 2).map({ Int($0) }),
         lineColumn.count == 2,
         let line = lineColumn[0],
         let column = lineColumn[1]