Explicitly qualify module name for extensions that add retroactive conformances

ahoppen · ahoppen · commit ae660e0e9f8a · 2024-07-31T17:25:20.000-07:00
diff --git a/Sources/Diagnose/IndexCommand.swift b/Sources/Diagnose/IndexCommand.swift
@@ -121,4 +121,4 @@ fileprivate extension SourceKitLSPServer {
   }
 }
 
-extension ExperimentalFeature: ExpressibleByArgument {}
+extension ExperimentalFeature: ArgumentParser.ExpressibleByArgument {}
diff --git a/Sources/SKSupport/DocumentURI+CustomLogStringConvertible.swift b/Sources/SKSupport/DocumentURI+CustomLogStringConvertible.swift
@@ -21,4 +21,4 @@ extension DocumentURI {
     return "<DocumentURI length=\(description.count) hash=\(description.hashForLogging)>"
   }
 }
-extension DocumentURI: CustomLogStringConvertible {}
+extension DocumentURI: SKLogging.CustomLogStringConvertible {}
diff --git a/Sources/SKTestSupport/TestJSONRPCConnection.swift b/Sources/SKTestSupport/TestJSONRPCConnection.swift
@@ -202,7 +202,7 @@ private let testMessageRegistry = MessageRegistry(
   notifications: [EchoNotification.self, ShowMessageNotification.self]
 )
 
-extension String: ResponseType {}
+extension String: LanguageServerProtocol.ResponseType {}
 
 package struct EchoRequest: RequestType {
   package static let method: String = "test_server/echo"
diff --git a/Sources/SourceKitLSP/IndexStoreDB+MainFilesProvider.swift b/Sources/SourceKitLSP/IndexStoreDB+MainFilesProvider.swift
@@ -34,4 +34,4 @@ extension UncheckedIndex {
   }
 }
 
-extension UncheckedIndex: MainFilesProvider {}
+extension UncheckedIndex: BuildSystemIntegration.MainFilesProvider {}
diff --git a/Sources/sourcekit-lsp/SourceKitLSP.swift b/Sources/sourcekit-lsp/SourceKitLSP.swift
@@ -84,11 +84,11 @@ extension PathPrefixMapping {
     )
   }
 }
-extension PathPrefixMapping: ExpressibleByArgument {}
+extension PathPrefixMapping: ArgumentParser.ExpressibleByArgument {}
 
-extension SKOptions.BuildConfiguration: ExpressibleByArgument {}
+extension SKOptions.BuildConfiguration: ArgumentParser.ExpressibleByArgument {}
 
-extension SKOptions.WorkspaceType: ExpressibleByArgument {}
+extension SKOptions.WorkspaceType: ArgumentParser.ExpressibleByArgument {}
 
 @main
 struct SourceKitLSP: AsyncParsableCommand {

Original file line number	Diff line number	Diff line change
`@@ -121,4 +121,4 @@ fileprivate extension SourceKitLSPServer {`
`121`	`121`	`}`
`122`	`122`	`}`
`123`	`123`
`124`		`-extension ExperimentalFeature: ExpressibleByArgument {}`
	`124`	`+extension ExperimentalFeature: ArgumentParser.ExpressibleByArgument {}`
Original file line number	Diff line number	Diff line change
`@@ -21,4 +21,4 @@ extension DocumentURI {`
`21`	`21`	`return "<DocumentURI length=\(description.count) hash=\(description.hashForLogging)>"`
`22`	`22`	`}`
`23`	`23`	`}`
`24`		`-extension DocumentURI: CustomLogStringConvertible {}`
	`24`	`+extension DocumentURI: SKLogging.CustomLogStringConvertible {}`
Original file line number	Diff line number	Diff line change
`@@ -202,7 +202,7 @@ private let testMessageRegistry = MessageRegistry(`
`202`	`202`	`notifications: [EchoNotification.self, ShowMessageNotification.self]`
`203`	`203`	`)`
`204`	`204`
`205`		`-extension String: ResponseType {}`
	`205`	`+extension String: LanguageServerProtocol.ResponseType {}`
`206`	`206`
`207`	`207`	`package struct EchoRequest: RequestType {`
`208`	`208`	`package static let method: String = "test_server/echo"`
Original file line number	Diff line number	Diff line change
`@@ -34,4 +34,4 @@ extension UncheckedIndex {`
`34`	`34`	`}`
`35`	`35`	`}`
`36`	`36`
`37`		`-extension UncheckedIndex: MainFilesProvider {}`
	`37`	`+extension UncheckedIndex: BuildSystemIntegration.MainFilesProvider {}`
Original file line number	Diff line number	Diff line change
`@@ -84,11 +84,11 @@ extension PathPrefixMapping {`
`84`	`84`	`)`
`85`	`85`	`}`
`86`	`86`	`}`
`87`		`-extension PathPrefixMapping: ExpressibleByArgument {}`
	`87`	`+extension PathPrefixMapping: ArgumentParser.ExpressibleByArgument {}`
`88`	`88`
`89`		`-extension SKOptions.BuildConfiguration: ExpressibleByArgument {}`
	`89`	`+extension SKOptions.BuildConfiguration: ArgumentParser.ExpressibleByArgument {}`
`90`	`90`
`91`		`-extension SKOptions.WorkspaceType: ExpressibleByArgument {}`
	`91`	`+extension SKOptions.WorkspaceType: ArgumentParser.ExpressibleByArgument {}`
`92`	`92`
`93`	`93`	`@main`
`94`	`94`	`struct SourceKitLSP: AsyncParsableCommand {`