Remove imports of SwiftPM modules that are not strictly necessary

Author: ahoppen

Sources/BuildSystemIntegration/FallbackBuildSettings.swift

@@ -10,26 +10,20 @@
 //
 //===----------------------------------------------------------------------===//
 
-#if compiler(>=6)
 import Foundation
-package import LanguageServerProtocol
 import LanguageServerProtocolExtensions
-package import SKOptions
+import SwiftExtensions
 import TSCExtensions
 
-import enum PackageLoading.Platform
 import struct TSCBasic.AbsolutePath
 import class TSCBasic.Process
+
+#if compiler(>=6)
+package import LanguageServerProtocol
+package import SKOptions
 #else
-import Foundation
 import LanguageServerProtocol
-import LanguageServerProtocolExtensions
 import SKOptions
-import TSCExtensions
-
-import enum PackageLoading.Platform
-import struct TSCBasic.AbsolutePath
-import class TSCBasic.Process
 #endif
 
 /// The path to the SDK.

Sources/SKTestSupport/SkipUnless.swift

@@ -21,7 +21,6 @@ import TSCExtensions
 import ToolchainRegistry
 import XCTest
 
-import enum PackageLoading.Platform
 import struct TSCBasic.AbsolutePath
 import class TSCBasic.Process
 import enum TSCBasic.ProcessEnv

Sources/SourceKitLSP/SourceKitLSPServer.swift

@@ -19,15 +19,13 @@ import IndexStoreDB
 package import LanguageServerProtocol
 package import LanguageServerProtocolExtensions
 import LanguageServerProtocolJSONRPC
-import PackageLoading
 import SKLogging
 package import SKOptions
 import SemanticIndex
 import SourceKitD
 package import SwiftExtensions
 package import ToolchainRegistry
 
-import struct PackageModel.BuildFlags
 import struct TSCBasic.AbsolutePath
 import protocol TSCBasic.FileSystem
 #else
@@ -39,15 +37,13 @@ import IndexStoreDB
 import LanguageServerProtocol
 import LanguageServerProtocolExtensions
 import LanguageServerProtocolJSONRPC
-import PackageLoading
 import SKLogging
 import SKOptions
 import SemanticIndex
 import SourceKitD
 import SwiftExtensions
 import ToolchainRegistry
 
-import struct PackageModel.BuildFlags
 import struct TSCBasic.AbsolutePath
 import protocol TSCBasic.FileSystem
 #endif

Sources/SwiftExtensions/CMakeLists.txt

@@ -12,6 +12,7 @@ add_library(SwiftExtensions STATIC
   FileManagerExtensions.swift
   NSLock+WithLock.swift
   PipeAsStringHandler.swift
+  Platform.swift
   ResultExtensions.swift
   Sequence+AsyncMap.swift
   Sequence+ContainsAnyIn.swift

Sources/SwiftExtensions/Platform.swift

@@ -0,0 +1,43 @@
+//===----------------------------------------------------------------------===//
+//
+// 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
+//
+//===----------------------------------------------------------------------===//
+
+package enum Platform: Equatable, Sendable {
+  case darwin
+  case linux
+  case windows
+
+  package static var current: Platform? {
+    #if os(Windows)
+    return .windows
+    #elseif canImport(Darwin)
+    return .darwin
+    #else
+    return .linux
+    #endif
+  }
+
+  /// The file extension used for a dynamic library on this platform.
+  package var dynamicLibraryExtension: String {
+    switch self {
+    case .darwin: return ".dylib"
+    case .linux: return ".so"
+    case .windows: return ".dll"
+    }
+  }
+
+  package var executableExtension: String {
+    switch self {
+    case .windows: return ".exe"
+    case .linux, .darwin: return ""
+    }
+  }
+}

Sources/ToolchainRegistry/Toolchain.swift

@@ -14,7 +14,6 @@ import RegexBuilder
 import SKLogging
 import SwiftExtensions
 
-import enum PackageLoading.Platform
 import class TSCBasic.Process
 
 #if compiler(>=6)

Tests/BuildSystemIntegrationTests/FallbackBuildSettingsTests.swift

@@ -19,8 +19,6 @@ import SourceKitLSP
 import TSCBasic
 import XCTest
 
-import struct PackageModel.BuildFlags
-
 final class FallbackBuildSystemTests: XCTestCase {
 
   func testSwift() throws {

Tests/SourceKitDTests/CrashRecoveryTests.swift

@@ -19,8 +19,6 @@ import SourceKitD
 import SwiftExtensions
 import XCTest
 
-import enum PackageLoading.Platform
-
 fileprivate extension HoverResponse {
   func contains(string: String) -> Bool {
     switch self.contents {

Tests/SourceKitDTests/SourceKitDTests.swift

@@ -16,11 +16,11 @@ import LanguageServerProtocol
 import LanguageServerProtocolExtensions
 import SKTestSupport
 import SourceKitD
+import SwiftExtensions
 import TSCBasic
 import ToolchainRegistry
 import XCTest
 
-import enum PackageLoading.Platform
 import class TSCBasic.Process
 
 final class SourceKitDTests: XCTestCase {

Tests/SourceKitLSPTests/BackgroundIndexingTests.swift

@@ -17,7 +17,6 @@ import SKOptions
 import SKTestSupport
 import SemanticIndex
 import SourceKitLSP
-import SourceKitLSPAPI
 import SwiftExtensions
 import TSCExtensions
 import ToolchainRegistry

Tests/SourceKitLSPTests/DefinitionTests.swift

@@ -16,8 +16,6 @@ import SKTestSupport
 import SwiftExtensions
 import XCTest
 
-import enum PackageLoading.Platform
-
 class DefinitionTests: XCTestCase {
   func testJumpToDefinitionAtEndOfIdentifier() async throws {
     let testClient = try await TestSourceKitLSPClient()

Tests/ToolchainRegistryTests/ToolchainRegistryTests.swift

@@ -17,8 +17,6 @@ import TSCBasic
 import ToolchainRegistry
 import XCTest
 
-import enum PackageLoading.Platform
-
 #if canImport(Android)
 import Android
 #endif