Merge pull request #971 from ahoppen/ahoppen/retroactive-conformances

Add `@retroactive` annotations

Author: ahoppen

Sources/LSPTestSupport/TestJSONRPCConnection.swift

@@ -176,7 +176,11 @@ private let testMessageRegistry = MessageRegistry(
   notifications: [EchoNotification.self]
 )
 
+#if swift(<5.10)
 extension String: ResponseType {}
+#else
+extension String: @retroactive ResponseType {}
+#endif
 
 public struct EchoRequest: RequestType {
   public static var method: String = "test_server/echo"

Sources/SKSupport/LoggableMessageTypes.swift

@@ -33,11 +33,16 @@ fileprivate extension Encodable {
 
 // MARK: - DocumentURI
 
-extension DocumentURI: CustomLogStringConvertible {
+extension DocumentURI {
   public var redactedDescription: String {
     return "<DocumentURI length=\(description.count) hash=\(description.hashForLogging)>"
   }
 }
+#if swift(<5.10)
+extension DocumentURI: CustomLogStringConvertible {}
+#else
+extension DocumentURI: @retroactive CustomLogStringConvertible {}
+#endif
 
 // MARK: - RequestType
 

Sources/SourceKitLSP/IndexStoreDB+MainFilesProvider.swift

@@ -15,7 +15,7 @@ import LSPLogging
 import LanguageServerProtocol
 import SKCore
 
-extension IndexStoreDB: MainFilesProvider {
+extension IndexStoreDB {
   public func mainFilesContainingFile(_ uri: DocumentURI) -> Set<DocumentURI> {
     let mainFiles: Set<DocumentURI>
     if let url = uri.fileURL {
@@ -30,3 +30,9 @@ extension IndexStoreDB: MainFilesProvider {
     return mainFiles
   }
 }
+
+#if swift(<5.10)
+extension IndexStoreDB: MainFilesProvider {}
+#else
+extension IndexStoreDB: @retroactive MainFilesProvider {}
+#endif

Sources/sourcekit-lsp/SourceKitLSP.swift

@@ -25,7 +25,7 @@ import struct TSCBasic.AbsolutePath
 import struct TSCBasic.RelativePath
 import var TSCBasic.localFileSystem
 
-extension AbsolutePath: ExpressibleByArgument {
+extension AbsolutePath {
   public init?(argument: String) {
     let path: AbsolutePath?
 
@@ -48,8 +48,13 @@ extension AbsolutePath: ExpressibleByArgument {
     .directory
   }
 }
+#if swift(<5.10)
+extension AbsolutePath: ExpressibleByArgument {}
+#else
+extension AbsolutePath: @retroactive ExpressibleByArgument {}
+#endif
 
-extension RelativePath: ExpressibleByArgument {
+extension RelativePath {
   public init?(argument: String) {
     let path = try? RelativePath(validating: argument)
 
@@ -60,8 +65,13 @@ extension RelativePath: ExpressibleByArgument {
     self = path
   }
 }
+#if swift(<5.10)
+extension RelativePath: ExpressibleByArgument {}
+#else
+extension RelativePath: @retroactive ExpressibleByArgument {}
+#endif
 
-extension PathPrefixMapping: ExpressibleByArgument {
+extension PathPrefixMapping {
   public init?(argument: String) {
     guard let eqIndex = argument.firstIndex(of: "=") else { return nil }
     self.init(
@@ -70,8 +80,17 @@ extension PathPrefixMapping: ExpressibleByArgument {
     )
   }
 }
+#if swift(<5.10)
+extension PathPrefixMapping: ExpressibleByArgument {}
+#else
+extension PathPrefixMapping: @retroactive ExpressibleByArgument {}
+#endif
 
+#if swift(<5.10)
 extension BuildConfiguration: ExpressibleByArgument {}
+#else
+extension BuildConfiguration: @retroactive ExpressibleByArgument {}
+#endif
 
 @main
 struct SourceKitLSP: ParsableCommand {