Merge pull request #2364 from ahoppen/no-optional-map

Don’t use `Optional.map` or `Optional.flatMap`

Author: ahoppen

Sources/BuildServerIntegration/SwiftPMBuildServer.swift

@@ -215,19 +215,29 @@ package actor SwiftPMBuildServer: BuiltInBuildServer {
     let hostSDK = try SwiftSDK.hostSwiftSDK(AbsolutePath(validating: destinationToolchainBinDir.filePath))
     let hostSwiftPMToolchain = try UserToolchain(swiftSDK: hostSDK)
 
+    let triple: Triple? =
+      if let triple = options.swiftPMOrDefault.triple {
+        try Triple(triple)
+      } else {
+        nil
+      }
+    let swiftSDKsDirectory: AbsolutePath? =
+      if let swiftSDKsDirectory = options.swiftPMOrDefault.swiftSDKsDirectory {
+        try AbsolutePath(validating: swiftSDKsDirectory, relativeTo: absProjectRoot)
+      } else {
+        nil
+      }
     let destinationSDK = try SwiftSDK.deriveTargetSwiftSDK(
       hostSwiftSDK: hostSDK,
       hostTriple: hostSwiftPMToolchain.targetTriple,
       customToolsets: options.swiftPMOrDefault.toolsets?.map {
         try AbsolutePath(validating: $0, relativeTo: absProjectRoot)
       } ?? [],
-      customCompileTriple: options.swiftPMOrDefault.triple.map { try Triple($0) },
+      customCompileTriple: triple,
       swiftSDKSelector: options.swiftPMOrDefault.swiftSDK,
       store: SwiftSDKBundleStore(
         swiftSDKsDirectory: localFileSystem.getSharedSwiftSDKsDirectory(
-          explicitDirectory: options.swiftPMOrDefault.swiftSDKsDirectory.map {
-            try AbsolutePath(validating: $0, relativeTo: absProjectRoot)
-          }
+          explicitDirectory: swiftSDKsDirectory
         ),
         hostToolchainBinDir: hostSwiftPMToolchain.swiftCompilerPath.parentDirectory,
         fileSystem: localFileSystem,
@@ -320,9 +330,13 @@ package actor SwiftPMBuildServer: BuiltInBuildServer {
       disableSandbox: options.swiftPMOrDefault.disableSandbox ?? false
     )
 
-    self.traitConfiguration = TraitConfiguration(
-      enabledTraits: options.swiftPMOrDefault.traits.flatMap(Set.init)
-    )
+    let enabledTraits: Set<String>? =
+      if let traits = options.swiftPMOrDefault.traits {
+        Set(traits)
+      } else {
+        nil
+      }
+    self.traitConfiguration = TraitConfiguration(enabledTraits: enabledTraits)
 
     packageLoadingQueue.async {
       await orLog("Initial package loading") {

Sources/Diagnose/ReduceCommand.swift

@@ -50,7 +50,12 @@ package struct ReduceCommand: AsyncParsableCommand {
   )
   var predicate: String?
 
-  private var nsPredicate: NSPredicate? { predicate.map { NSPredicate(format: $0) } }
+  private var nsPredicate: NSPredicate? {
+    guard let predicate else {
+      return nil
+    }
+    return NSPredicate(format: predicate)
+  }
   #else
   private var nsPredicate: NSPredicate? { nil }
   #endif

Sources/Diagnose/ReduceFrontendCommand.swift

@@ -40,7 +40,12 @@ package struct ReduceFrontendCommand: AsyncParsableCommand {
   )
   var predicate: String?
 
-  private var nsPredicate: NSPredicate? { predicate.map { NSPredicate(format: $0) } }
+  private var nsPredicate: NSPredicate? {
+    guard let predicate else {
+      return nil
+    }
+    return NSPredicate(format: predicate)
+  }
   #else
   private var nsPredicate: NSPredicate? { nil }
   #endif

Sources/SemanticIndex/UpdateIndexStoreTaskDescription.swift

@@ -521,7 +521,7 @@ package struct UpdateIndexStoreTaskDescription: IndexTaskDescription {
         indexFiles: indexFiles,
         buildSettings: buildSettings,
         processArguments: args,
-        workingDirectory: buildSettings.workingDirectory.map(AbsolutePath.init(validating:))
+        workingDirectory: buildSettings.workingDirectoryPath
       )
     case .singleFile(let file, let buildSettings):
       // We only end up in this case if the file's build settings didn't contain `-index-unit-output-path` and the build
@@ -532,7 +532,7 @@ package struct UpdateIndexStoreTaskDescription: IndexTaskDescription {
         indexFiles: [file.mainFile],
         buildSettings: buildSettings,
         processArguments: args,
-        workingDirectory: buildSettings.workingDirectory.map(AbsolutePath.init(validating:))
+        workingDirectory: buildSettings.workingDirectoryPath
       )
     }
   }
@@ -556,7 +556,7 @@ package struct UpdateIndexStoreTaskDescription: IndexTaskDescription {
       indexFiles: [uri],
       buildSettings: buildSettings,
       processArguments: args,
-      workingDirectory: buildSettings.workingDirectory.map(AbsolutePath.init(validating:))
+      workingDirectory: buildSettings.workingDirectoryPath
     )
   }
 
@@ -780,3 +780,14 @@ fileprivate extension Process {
     }
   }
 }
+
+fileprivate extension FileBuildSettings {
+  var workingDirectoryPath: AbsolutePath? {
+    get throws {
+      guard let workingDirectory else {
+        return nil
+      }
+      return try AbsolutePath(validating: workingDirectory)
+    }
+  }
+}

Sources/SourceKitD/SKDResponseDictionary.swift

@@ -36,7 +36,10 @@ package final class SKDResponseDictionary: Sendable {
   }
 
   package subscript(key: sourcekitd_api_uid_t) -> String? {
-    return sourcekitd.api.variant_dictionary_get_string(dict, key).map(String.init(cString:))
+    guard let cString = sourcekitd.api.variant_dictionary_get_string(dict, key) else {
+      return nil
+    }
+    return String(cString: cString)
   }
 
   package subscript(key: sourcekitd_api_uid_t) -> Int? {

Sources/SwiftLanguageService/Diagnostic.swift

@@ -442,8 +442,13 @@ extension DiagnosticStage {
     case sourcekitd.values.semaDiagStage:
       self = .sema
     default:
-      let desc = sourcekitd.api.uid_get_string_ptr(uid).map { String(cString: $0) }
-      logger.fault("Unknown diagnostic stage \(desc ?? "nil", privacy: .public)")
+      let uidDescription =
+        if let cString = sourcekitd.api.uid_get_string_ptr(uid) {
+          String(cString: cString)
+        } else {
+          "<nil>"
+        }
+      logger.fault("Unknown diagnostic stage \(uidDescription, privacy: .public)")
       return nil
     }
   }

Sources/SwiftLanguageService/SemanticTokens.swift

@@ -62,8 +62,8 @@ extension SwiftLanguageService {
     let semanticTokens = await orLog("Loading semantic tokens") { try await semanticHighlightingTokens(for: snapshot) }
 
     let range =
-      if let range = range.flatMap({ snapshot.byteSourceRange(of: $0) }) {
-        range
+      if let range {
+        snapshot.byteSourceRange(of: range)
       } else {
         await tree.range
       }

Sources/SwiftLanguageService/SwiftLanguageService.swift

@@ -651,11 +651,17 @@ extension SwiftLanguageService {
           // Check that the document wasn't modified while we were getting diagnostics. This could happen because we are
           // calling `publishDiagnosticsIfNeeded` outside of `messageHandlingQueue` and thus a concurrent edit is
           // possible while we are waiting for the sourcekitd request to return a result.
+          let latestVersionString =
+            if let version = latestSnapshotID?.version {
+              String(version)
+            } else {
+              "<nil>"
+            }
           logger.log(
             """
             Document was modified while loading diagnostics. \
             Loaded diagnostics for \(snapshot.id.version, privacy: .public), \
-            latest snapshot is \((latestSnapshotID?.version).map(String.init) ?? "<nil>", privacy: .public)
+            latest snapshot is \(latestVersionString, privacy: .public)
             """
           )
           throw CancellationError()

Sources/SwiftLanguageService/SwiftTestingScanner.swift

@@ -232,7 +232,12 @@ final class SyntacticSwiftTestingTestScanner: SyntaxVisitor {
     let suiteAttribute = node.attributes
       .compactMap { $0.as(AttributeSyntax.self) }
       .first { $0.isNamed("Suite", inModuleNamed: "Testing") }
-    let attributeData = suiteAttribute.map(TestingAttributeData.init(attribute:))
+    let attributeData: TestingAttributeData? =
+      if let suiteAttribute {
+        TestingAttributeData(attribute: suiteAttribute)
+      } else {
+        nil
+      }
 
     if attributeData?.isHidden ?? false {
       return .skipChildren

Sources/SwiftLanguageService/SyntaxHighlightingTokenParser.swift

@@ -203,8 +203,13 @@ struct SyntaxHighlightingTokenParser {
         values.stringInterpolation
       ]
       if !ignoredKinds.contains(uid) {
-        let name = api.uid_get_string_ptr(uid).map(String.init(cString:))
-        logger.error("Unknown token kind: \(name ?? "?", privacy: .public)")
+        let name =
+          if let cString = api.uid_get_string_ptr(uid) {
+            String(cString: cString)
+          } else {
+            "<nil>"
+          }
+        logger.error("Unknown token kind: \(name, privacy: .public)")
       }
       return nil
     }