Merge pull request #1751 from ahoppen/windows-fixes

Author: ahoppen

Sources/BuildSystemIntegration/BuildSystemManager.swift

@@ -23,7 +23,6 @@ package import ToolchainRegistry
 
 package import struct TSCBasic.AbsolutePath
 package import struct TSCBasic.RelativePath
-package import func TSCBasic.resolveSymlinks
 #else
 import BuildServerProtocol
 import Dispatch
@@ -37,7 +36,6 @@ import ToolchainRegistry
 
 import struct TSCBasic.AbsolutePath
 import struct TSCBasic.RelativePath
-import func TSCBasic.resolveSymlinks
 #endif
 
 fileprivate typealias RequestCache<Request: RequestType & Hashable> = Cache<Request, Request.Response>
@@ -96,18 +94,6 @@ fileprivate extension BuildTarget {
   }
 }
 
-fileprivate extension DocumentURI {
-  /// If this is a file URI pointing to a symlink, return the realpath of the URI, otherwise return `nil`.
-  var symlinkTarget: DocumentURI? {
-    guard let fileUrl = fileURL, let path = AbsolutePath(validatingOrNil: fileUrl.path),
-      let symlinksResolved = try? TSCBasic.resolveSymlinks(path), symlinksResolved != path
-    else {
-      return nil
-    }
-    return DocumentURI(symlinksResolved.asURL)
-  }
-}
-
 fileprivate extension InitializeBuildResponse {
   var sourceKitData: SourceKitInitializeBuildResponseData? {
     guard dataKind == nil || dataKind == .sourceKit else {

Sources/BuildSystemIntegration/CompilationDatabase.swift

@@ -21,7 +21,6 @@ package import struct TSCBasic.AbsolutePath
 package import protocol TSCBasic.FileSystem
 package import struct TSCBasic.RelativePath
 package import var TSCBasic.localFileSystem
-package import func TSCBasic.resolveSymlinks
 #else
 import BuildServerProtocol
 import Foundation
@@ -33,7 +32,10 @@ import struct TSCBasic.AbsolutePath
 import protocol TSCBasic.FileSystem
 import struct TSCBasic.RelativePath
 import var TSCBasic.localFileSystem
-import func TSCBasic.resolveSymlinks
+#endif
+
+#if os(Windows)
+import WinSDK
 #endif
 
 /// A single compilation database command.
@@ -99,7 +101,7 @@ package struct CompilationDatabaseCompileCommand: Equatable, Codable {
   /// it falls back to `filename`, which is more likely to be the identifier
   /// that a caller will be looking for.
   package var uri: DocumentURI {
-    if filename.hasPrefix("/") || !directory.hasPrefix("/") {
+    if filename.isAbsolutePath || !directory.isAbsolutePath {
       return DocumentURI(filePath: filename, isDirectory: false)
     } else {
       return DocumentURI(URL(fileURLWithPath: directory).appendingPathComponent(filename, isDirectory: false))
@@ -262,7 +264,7 @@ package struct JSONCompilationDatabase: CompilationDatabase, Equatable, Codable
     if let indices = pathToCommands[uri] {
       return indices.map { commands[$0] }
     }
-    if let fileURL = uri.fileURL, let indices = pathToCommands[DocumentURI(fileURL.resolvingSymlinksInPath())] {
+    if let fileURL = uri.fileURL, let indices = pathToCommands[DocumentURI(fileURL.realpath)] {
       return indices.map { commands[$0] }
     }
     return []
@@ -278,13 +280,8 @@ package struct JSONCompilationDatabase: CompilationDatabase, Equatable, Codable
     let uri = command.uri
     pathToCommands[uri, default: []].append(commands.count)
 
-    if let fileURL = uri.fileURL,
-      let symlinksResolved = try? resolveSymlinks(AbsolutePath(validating: fileURL.path))
-    {
-      let canonical = DocumentURI(filePath: symlinksResolved.pathString, isDirectory: false)
-      if canonical != uri {
-        pathToCommands[canonical, default: []].append(commands.count)
-      }
+    if let symlinkTarget = uri.symlinkTarget {
+      pathToCommands[symlinkTarget, default: []].append(commands.count)
     }
 
     commands.append(command)
@@ -295,3 +292,15 @@ enum CompilationDatabaseDecodingError: Error {
   case missingCommandOrArguments
   case fixedDatabaseDecodingError
 }
+
+fileprivate extension String {
+  var isAbsolutePath: Bool {
+    #if os(Windows)
+    Array(self.utf16).withUnsafeBufferPointer { buffer in
+      return !PathIsRelativeW(buffer.baseAddress)
+    }
+    #else
+    return self.hasPrefix("/")
+    #endif
+  }
+}

Sources/BuildSystemIntegration/DetermineBuildSystem.swift

@@ -57,7 +57,9 @@ package func determineBuildSystem(
         return .compilationDatabase(projectRoot: projectRoot)
       }
     case .swiftPM:
-      if let projectRoot = SwiftPMBuildSystem.projectRoot(for: workspaceFolderPath, options: options) {
+      if let projectRootURL = SwiftPMBuildSystem.projectRoot(for: workspaceFolderUrl, options: options),
+        let projectRoot = try? AbsolutePath(validating: projectRootURL.path)
+      {
         return .swiftPM(projectRoot: projectRoot)
       }
     }

Sources/BuildSystemIntegration/LegacyBuildServerBuildSystem.swift

@@ -26,7 +26,6 @@ import struct TSCBasic.FileSystemError
 import func TSCBasic.getEnvSearchPaths
 import var TSCBasic.localFileSystem
 import func TSCBasic.lookupExecutablePath
-import func TSCBasic.resolveSymlinks
 
 #if compiler(>=6.3)
 #warning("We have had a one year transition period to the pull based build server. Consider removing this build server")

Sources/BuildSystemIntegration/SwiftPMBuildSystem.swift

@@ -15,7 +15,7 @@ package import Basics
 @preconcurrency import Build
 package import BuildServerProtocol
 import Dispatch
-import Foundation
+package import Foundation
 package import LanguageServerProtocol
 @preconcurrency import PackageGraph
 import PackageLoading
@@ -33,12 +33,10 @@ package import ToolchainRegistry
 package import struct Basics.AbsolutePath
 package import struct Basics.IdentifiableSet
 package import struct Basics.TSCAbsolutePath
-import struct Foundation.URL
-package import struct TSCBasic.AbsolutePath
-package import protocol TSCBasic.FileSystem
-package import class TSCBasic.Process
-package import var TSCBasic.localFileSystem
-package import func TSCBasic.resolveSymlinks
+import struct TSCBasic.AbsolutePath
+import protocol TSCBasic.FileSystem
+import class TSCBasic.Process
+import var TSCBasic.localFileSystem
 package import class ToolchainRegistry.Toolchain
 #else
 import Basics
@@ -68,7 +66,6 @@ import struct TSCBasic.AbsolutePath
 import protocol TSCBasic.FileSystem
 import class TSCBasic.Process
 import var TSCBasic.localFileSystem
-import func TSCBasic.resolveSymlinks
 import class ToolchainRegistry.Toolchain
 #endif
 
@@ -240,26 +237,18 @@ package actor SwiftPMBuildSystem: BuiltInBuildSystem {
 
   private var targetDependencies: [BuildTargetIdentifier: Set<BuildTargetIdentifier>] = [:]
 
-  static package func projectRoot(
-    for path: TSCBasic.AbsolutePath,
-    options: SourceKitLSPOptions
-  ) -> TSCBasic.AbsolutePath? {
-    guard var path = try? resolveSymlinks(path) else {
-      return nil
-    }
+  static package func projectRoot(for path: URL, options: SourceKitLSPOptions) -> URL? {
+    var path = path.realpath
     while true {
       let packagePath = path.appending(component: "Package.swift")
-      if localFileSystem.isFile(packagePath) {
-        let contents = try? localFileSystem.readFileContents(packagePath)
-        if contents?.cString.contains("PackageDescription") == true {
-          return path
-        }
+      if (try? String(contentsOf: packagePath, encoding: .utf8))?.contains("PackageDescription") ?? false {
+        return path
       }
 
-      if path.isRoot {
-        return nil
+      if (try? AbsolutePath(validating: path.path))?.isRoot ?? true {
+        break
       }
-      path = path.parentDirectory
+      path.deleteLastPathComponent()
     }
     return nil
   }
@@ -611,7 +600,7 @@ package actor SwiftPMBuildSystem: BuiltInBuildSystem {
       let buildSettings = FileBuildSettings(
         compilerArguments: try await compilerArguments(for: DocumentURI(substituteFile), in: swiftPMTarget),
         workingDirectory: projectRoot.pathString
-      ).patching(newFile: DocumentURI(try resolveSymlinks(path).asURL), originalFile: DocumentURI(substituteFile))
+      ).patching(newFile: DocumentURI(path.asURL.realpath), originalFile: DocumentURI(substituteFile))
       return TextDocumentSourceKitOptionsResponse(
         compilerArguments: buildSettings.compilerArguments,
         workingDirectory: buildSettings.workingDirectory

Sources/Diagnose/ReproducerBundle.swift

@@ -26,7 +26,7 @@ func makeReproducerBundle(for requestInfo: RequestInfo, toolchain: Toolchain, bu
     encoding: .utf8
   )
   if let toolchainPath = toolchain.path {
-    try toolchainPath.asURL.resolvingSymlinksInPath().path
+    try toolchainPath.asURL.realpath.path
       .write(
         to: bundlePath.appendingPathComponent("toolchain.txt"),
         atomically: true,

Sources/SKSupport/CMakeLists.txt

@@ -6,6 +6,7 @@ add_library(SKSupport STATIC
   Debouncer.swift
   Dictionary+InitWithElementsKeyedBy.swift
   DocumentURI+CustomLogStringConvertible.swift
+  DocumentURI+symlinkTarget.swift
   FileSystem.swift
   LineTable.swift
   LocalConnection.swift

Sources/SKSupport/DocumentURI+symlinkTarget.swift

@@ -0,0 +1,36 @@
+//===----------------------------------------------------------------------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 2024 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See https://swift.org/LICENSE.txt for license information
+// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//===----------------------------------------------------------------------===//
+
+#if compiler(>=6)
+import Foundation
+package import LanguageServerProtocol
+import struct TSCBasic.AbsolutePath
+#else
+import Foundation
+import LanguageServerProtocol
+
+import struct TSCBasic.RelativePath
+#endif
+
+extension DocumentURI {
+  /// If this is a file URI pointing to a symlink, return the realpath of the URI, otherwise return `nil`.
+  package var symlinkTarget: DocumentURI? {
+    guard let fileUrl = fileURL else {
+      return nil
+    }
+    let realpath = DocumentURI(fileUrl.realpath)
+    if realpath == self {
+      return nil
+    }
+    return realpath
+  }
+}

Sources/SKTestSupport/BuildServerTestProject.swift

@@ -17,7 +17,7 @@ import XCTest
 fileprivate let sdkArgs =
   if let defaultSDKPath {
     """
-    "-sdk", "\(defaultSDKPath)",
+    "-sdk", "\(defaultSDKPath.replacing(#"\"#, with: #"\\"#))",
     """
   } else {
     ""

Sources/SKTestSupport/FindTool.swift

@@ -48,8 +48,14 @@ package func findTool(name: String) async -> URL? {
     return nil
   }
   #if os(Windows)
-  path = String((path.split { $0.isNewline })[0])
+  // where.exe returns all files that match the name. We only care about the first one.
+  if let newlineIndex = path.firstIndex(where: \.isNewline) {
+    path = String(path[..<newlineIndex])
+  }
   #endif
   path = path.trimmingCharacters(in: .whitespacesAndNewlines)
+  if path.isEmpty {
+    return nil
+  }
   return URL(fileURLWithPath: path, isDirectory: false)
 }