Merge pull request #1623 from ahoppen/remove-windows-workaround

Remove `sanitizedHomeDirectoryForCurrentUser`

Author: ahoppen

Package.swift

@@ -31,7 +31,6 @@ let package = Package(
         "SKOptions",
         "SKSupport",
         "SourceKitLSP",
-        "SwiftExtensions",
         "ToolchainRegistry",
         .product(name: "ArgumentParser", package: "swift-argument-parser"),
         .product(name: "SwiftToolsSupport-auto", package: "swift-tools-support-core"),

Sources/Diagnose/DiagnoseCommand.swift

@@ -256,7 +256,7 @@ package struct DiagnoseCommand: AsyncParsableCommand {
     let destinationDir = bundlePath.appendingPathComponent("logs")
     try FileManager.default.createDirectory(at: destinationDir, withIntermediateDirectories: true)
 
-    let logFileDirectoryURL = FileManager.default.sanitizedHomeDirectoryForCurrentUser
+    let logFileDirectoryURL = FileManager.default.homeDirectoryForCurrentUser
       .appendingPathComponent(".sourcekit-lsp")
       .appendingPathComponent("logs")
     let enumerator = FileManager.default.enumerator(at: logFileDirectoryURL, includingPropertiesForKeys: nil)

Sources/SKSupport/FileSystem.swift

@@ -21,7 +21,7 @@ extension AbsolutePath {
   package init(expandingTilde path: String) throws {
     if path.first == "~" {
       try self.init(
-        AbsolutePath(validating: FileManager.default.sanitizedHomeDirectoryForCurrentUser.path),
+        AbsolutePath(validating: FileManager.default.homeDirectoryForCurrentUser.path),
         validating: String(path.dropFirst(2))
       )
     } else {

Sources/SwiftExtensions/CMakeLists.txt

@@ -6,7 +6,6 @@ add_library(SwiftExtensions STATIC
   CartesianProduct.swift
   Collection+Only.swift
   Collection+PartitionIntoBatches.swift
-  FileManager+SanitizedHomeDirectoryOfCurrentUser.swift
   NSLock+WithLock.swift
   PipeAsStringHandler.swift
   ResultExtensions.swift

Sources/SwiftExtensions/FileManager+SanitizedHomeDirectoryOfCurrentUser.swift

@@ -10,7 +10,6 @@ target_link_libraries(sourcekit-lsp PRIVATE
   SKOptions
   SKSupport
   SourceKitLSP
-  SwiftExtensions
   ToolchainRegistry
   ArgumentParser
   TSCBasic)

Sources/sourcekit-lsp/CMakeLists.txt

@@ -233,7 +233,7 @@ struct SourceKitLSP: AsyncParsableCommand {
     var options = SourceKitLSPOptions.merging(
       base: commandLineOptions(),
       override: SourceKitLSPOptions(
-        path: FileManager.default.sanitizedHomeDirectoryForCurrentUser
+        path: FileManager.default.homeDirectoryForCurrentUser
           .appendingPathComponent(".sourcekit-lsp")
           .appendingPathComponent("config.json")
       )
@@ -289,7 +289,7 @@ struct SourceKitLSP: AsyncParsableCommand {
     let realStdoutHandle = FileHandle(fileDescriptor: realStdout, closeOnDealloc: false)
 
     // Directory should match the directory we are searching for logs in `DiagnoseCommand.addNonDarwinLogs`.
-    let logFileDirectoryURL = FileManager.default.sanitizedHomeDirectoryForCurrentUser
+    let logFileDirectoryURL = FileManager.default.homeDirectoryForCurrentUser
       .appendingPathComponent(".sourcekit-lsp")
       .appendingPathComponent("logs")
     await setUpGlobalLogFileHandler(