Merge pull request #1058 from ahoppen/ahoppen/skdrequestvalue

ahoppen · web-flow · commit acff38b788a9 · 2024-02-22T17:33:40.000-08:00
Rename `SKDValue` to `SKDRequestValue`
diff --git a/Sources/SourceKitD/SKDRequestArray.swift b/Sources/SourceKitD/SKDRequestArray.swift
@@ -22,7 +22,7 @@ import CRT
 
 extension SourceKitD {
   /// Create a `SKDRequestArray` from the given array.
-  public func array(_ array: [SKDValue]) -> SKDRequestArray {
+  public func array(_ array: [SKDRequestValue]) -> SKDRequestArray {
     let result = SKDRequestArray(sourcekitd: self)
     for element in array {
       result.append(element)
@@ -44,7 +44,7 @@ public final class SKDRequestArray {
     sourcekitd.api.request_release(array)
   }
 
-  public func append(_ newValue: SKDValue) {
+  public func append(_ newValue: SKDRequestValue) {
     switch newValue {
     case let newValue as String:
       sourcekitd.api.request_array_set_string(array, -1, newValue)
@@ -56,20 +56,20 @@ public final class SKDRequestArray {
       sourcekitd.api.request_array_set_value(array, -1, newValue.dict)
     case let newValue as SKDRequestArray:
       sourcekitd.api.request_array_set_value(array, -1, newValue.array)
-    case let newValue as Array<SKDValue>:
+    case let newValue as Array<SKDRequestValue>:
       self.append(sourcekitd.array(newValue))
-    case let newValue as Dictionary<sourcekitd_uid_t, SKDValue>:
+    case let newValue as Dictionary<sourcekitd_uid_t, SKDRequestValue>:
       self.append(sourcekitd.dictionary(newValue))
-    case let newValue as Optional<SKDValue>:
+    case let newValue as Optional<SKDRequestValue>:
       if let newValue {
         self.append(newValue)
       }
     default:
-      preconditionFailure("Unknown type conforming to SKDValueProtocol")
+      preconditionFailure("Unknown type conforming to SKDRequestValue")
     }
   }
 
-  public static func += (array: SKDRequestArray, other: some Sequence<SKDValue>) {
+  public static func += (array: SKDRequestArray, other: some Sequence<SKDRequestValue>) {
     for item in other {
       array.append(item)
     }
diff --git a/Sources/SourceKitD/SKDRequestDictionary.swift b/Sources/SourceKitD/SKDRequestDictionary.swift
@@ -27,20 +27,20 @@ import CRT
 ///   switch exhaustively over this protocol.
 ///   Do not add new conformances without adding a new case in the subscript and
 ///   `append` function.
-public protocol SKDValue {}
+public protocol SKDRequestValue {}
 
-extension String: SKDValue {}
-extension Int: SKDValue {}
-extension sourcekitd_uid_t: SKDValue {}
-extension SKDRequestDictionary: SKDValue {}
-extension SKDRequestArray: SKDValue {}
-extension Array<SKDValue>: SKDValue {}
-extension Dictionary<sourcekitd_uid_t, SKDValue>: SKDValue {}
-extension Optional: SKDValue where Wrapped: SKDValue {}
+extension String: SKDRequestValue {}
+extension Int: SKDRequestValue {}
+extension sourcekitd_uid_t: SKDRequestValue {}
+extension SKDRequestDictionary: SKDRequestValue {}
+extension SKDRequestArray: SKDRequestValue {}
+extension Array<SKDRequestValue>: SKDRequestValue {}
+extension Dictionary<sourcekitd_uid_t, SKDRequestValue>: SKDRequestValue {}
+extension Optional: SKDRequestValue where Wrapped: SKDRequestValue {}
 
 extension SourceKitD {
   /// Create a `SKDRequestDictionary` from the given dictionary.
-  public func dictionary(_ dict: [sourcekitd_uid_t: SKDValue]) -> SKDRequestDictionary {
+  public func dictionary(_ dict: [sourcekitd_uid_t: SKDRequestValue]) -> SKDRequestDictionary {
     let result = SKDRequestDictionary(sourcekitd: self)
     for (key, value) in dict {
       result.set(key, to: value)
@@ -62,7 +62,7 @@ public final class SKDRequestDictionary {
     sourcekitd.api.request_release(dict)
   }
 
-  public func set(_ key: sourcekitd_uid_t, to newValue: SKDValue) {
+  public func set(_ key: sourcekitd_uid_t, to newValue: SKDRequestValue) {
     switch newValue {
     case let newValue as String:
       sourcekitd.api.request_dictionary_set_string(dict, key, newValue)
@@ -74,16 +74,16 @@ public final class SKDRequestDictionary {
       sourcekitd.api.request_dictionary_set_value(dict, key, newValue.dict)
     case let newValue as SKDRequestArray:
       sourcekitd.api.request_dictionary_set_value(dict, key, newValue.array)
-    case let newValue as Array<SKDValue>:
+    case let newValue as Array<SKDRequestValue>:
       self.set(key, to: sourcekitd.array(newValue))
-    case let newValue as Dictionary<sourcekitd_uid_t, SKDValue>:
+    case let newValue as Dictionary<sourcekitd_uid_t, SKDRequestValue>:
       self.set(key, to: sourcekitd.dictionary(newValue))
-    case let newValue as Optional<SKDValue>:
+    case let newValue as Optional<SKDRequestValue>:
       if let newValue {
         self.set(key, to: newValue)
       }
     default:
-      preconditionFailure("Unknown type conforming to SKDValueProtocol")
+      preconditionFailure("Unknown type conforming to SKDRequestValue")
     }
   }
 }
diff --git a/Sources/SourceKitLSP/Rename.swift b/Sources/SourceKitLSP/Rename.swift
@@ -372,7 +372,7 @@ extension SwiftLanguageServer {
     let req = sourcekitd.dictionary([
       keys.request: sourcekitd.requests.nameTranslation,
       keys.sourceFile: snapshot.uri.pseudoPath,
-      keys.compilerArgs: await self.buildSettings(for: snapshot.uri)?.compilerArgs as [SKDValue]?,
+      keys.compilerArgs: await self.buildSettings(for: snapshot.uri)?.compilerArgs as [SKDRequestValue]?,
       keys.offset: offset,
       keys.nameKind: sourcekitd.values.nameSwift,
       keys.baseName: name.baseName,
@@ -429,7 +429,7 @@ extension SwiftLanguageServer {
     let req = sourcekitd.dictionary([
       keys.request: sourcekitd.requests.nameTranslation,
       keys.sourceFile: snapshot.uri.pseudoPath,
-      keys.compilerArgs: await self.buildSettings(for: snapshot.uri)?.compilerArgs as [SKDValue]?,
+      keys.compilerArgs: await self.buildSettings(for: snapshot.uri)?.compilerArgs as [SKDRequestValue]?,
       keys.offset: offset,
       keys.nameKind: sourcekitd.values.nameObjc,
     ])
diff --git a/Sources/SourceKitLSP/Swift/CodeCompletionSession.swift b/Sources/SourceKitLSP/Swift/CodeCompletionSession.swift
@@ -183,7 +183,7 @@ class CodeCompletionSession {
       keys.sourceFile: uri.pseudoPath,
       keys.sourceText: snapshot.text,
       keys.codeCompleteOptions: optionsDictionary(filterText: filterText, options: options),
-      keys.compilerArgs: compileCommand?.compilerArgs as [SKDValue]?,
+      keys.compilerArgs: compileCommand?.compilerArgs as [SKDRequestValue]?,
     ])
 
     let dict = try await sourcekitd.send(req, fileContents: snapshot.text)
diff --git a/Sources/SourceKitLSP/Swift/CursorInfo.swift b/Sources/SourceKitLSP/Swift/CursorInfo.swift
@@ -134,7 +134,7 @@ extension SwiftLanguageServer {
       keys.offset: offsetRange.lowerBound,
       keys.length: offsetRange.upperBound != offsetRange.lowerBound ? offsetRange.count : nil,
       keys.sourceFile: snapshot.uri.pseudoPath,
-      keys.compilerArgs: await self.buildSettings(for: uri)?.compilerArgs as [SKDValue]?,
+      keys.compilerArgs: await self.buildSettings(for: uri)?.compilerArgs as [SKDRequestValue]?,
     ])
 
     appendAdditionalParameters?(skreq)
diff --git a/Sources/SourceKitLSP/Swift/DiagnosticReportManager.swift b/Sources/SourceKitLSP/Swift/DiagnosticReportManager.swift
@@ -104,7 +104,7 @@ actor DiagnosticReportManager {
     let skreq = sourcekitd.dictionary([
       keys.request: requests.diagnostics,
       keys.sourceFile: snapshot.uri.pseudoPath,
-      keys.compilerArgs: compilerArgs as [SKDValue],
+      keys.compilerArgs: compilerArgs as [SKDRequestValue],
     ])
 
     let dict = try await self.sourcekitd.send(skreq, fileContents: snapshot.text)
diff --git a/Sources/SourceKitLSP/Swift/OpenInterface.swift b/Sources/SourceKitLSP/Swift/OpenInterface.swift
@@ -73,10 +73,10 @@ extension SwiftLanguageServer {
     let skreq = sourcekitd.dictionary([
       keys.request: requests.editorOpenInterface,
       keys.moduleName: name,
-      keys.groupName: request.groupNames.isEmpty ? nil : request.groupNames as [SKDValue],
+      keys.groupName: request.groupNames.isEmpty ? nil : request.groupNames as [SKDRequestValue],
       keys.name: interfaceURI.pseudoPath,
       keys.synthesizedExtension: 1,
-      keys.compilerArgs: await self.buildSettings(for: uri)?.compilerArgs as [SKDValue]?,
+      keys.compilerArgs: await self.buildSettings(for: uri)?.compilerArgs as [SKDRequestValue]?,
     ])
 
     let dict = try await self.sourcekitd.send(skreq, fileContents: nil)
diff --git a/Sources/SourceKitLSP/Swift/RelatedIdentifiers.swift b/Sources/SourceKitLSP/Swift/RelatedIdentifiers.swift
@@ -73,7 +73,7 @@ extension SwiftLanguageServer {
       keys.offset: offset,
       keys.sourceFile: snapshot.uri.pseudoPath,
       keys.includeNonEditableBaseNames: includeNonEditableBaseNames ? 1 : 0,
-      keys.compilerArgs: await self.buildSettings(for: snapshot.uri)?.compilerArgs as [SKDValue]?,
+      keys.compilerArgs: await self.buildSettings(for: snapshot.uri)?.compilerArgs as [SKDRequestValue]?,
     ])
 
     let dict = try await self.sourcekitd.send(skreq, fileContents: snapshot.text)
diff --git a/Sources/SourceKitLSP/Swift/SemanticRefactoring.swift b/Sources/SourceKitLSP/Swift/SemanticRefactoring.swift
@@ -149,7 +149,7 @@ extension SwiftLanguageServer {
       keys.column: utf8Column + 1,
       keys.length: offsetRange.count,
       keys.actionUID: self.sourcekitd.api.uid_get_from_cstr(refactorCommand.actionString)!,
-      keys.compilerArgs: await self.buildSettings(for: snapshot.uri)?.compilerArgs as [SKDValue]?,
+      keys.compilerArgs: await self.buildSettings(for: snapshot.uri)?.compilerArgs as [SKDRequestValue]?,
     ])
 
     let dict = try await self.sourcekitd.send(skreq, fileContents: snapshot.text)
diff --git a/Sources/SourceKitLSP/Swift/SemanticTokens.swift b/Sources/SourceKitLSP/Swift/SemanticTokens.swift
@@ -27,7 +27,7 @@ extension SwiftLanguageServer {
     let skreq = sourcekitd.dictionary([
       keys.request: requests.semanticTokens,
       keys.sourceFile: snapshot.uri.pseudoPath,
-      keys.compilerArgs: buildSettings.compilerArgs as [SKDValue],
+      keys.compilerArgs: buildSettings.compilerArgs as [SKDRequestValue],
     ])
 
     let dict = try await sourcekitd.send(skreq, fileContents: snapshot.text)
diff --git a/Sources/SourceKitLSP/Swift/SwiftLanguageServer.swift b/Sources/SourceKitLSP/Swift/SwiftLanguageServer.swift
@@ -299,7 +299,7 @@ extension SwiftLanguageServer {
       keys.request: self.requests.editorOpen,
       keys.name: path,
       keys.sourceText: snapshot.text,
-      keys.compilerArgs: compileCmd?.compilerArgs as [SKDValue]?,
+      keys.compilerArgs: compileCmd?.compilerArgs as [SKDRequestValue]?,
     ])
 
     _ = try? await self.sourcekitd.send(openReq, fileContents: snapshot.text)
@@ -346,7 +346,7 @@ extension SwiftLanguageServer {
       keys.name: note.textDocument.uri.pseudoPath,
       keys.sourceText: snapshot.text,
       keys.syntacticOnly: 1,
-      keys.compilerArgs: await self.buildSettings(for: snapshot.uri)?.compilerArgs as [SKDValue]?,
+      keys.compilerArgs: await self.buildSettings(for: snapshot.uri)?.compilerArgs as [SKDRequestValue]?,
     ])
 
     _ = try? await self.sourcekitd.send(req, fileContents: snapshot.text)
diff --git a/Sources/SourceKitLSP/Swift/VariableTypeInfo.swift b/Sources/SourceKitLSP/Swift/VariableTypeInfo.swift
@@ -90,7 +90,7 @@ extension SwiftLanguageServer {
     let skreq = sourcekitd.dictionary([
       keys.request: requests.collectVariableType,
       keys.sourceFile: snapshot.uri.pseudoPath,
-      keys.compilerArgs: await self.buildSettings(for: uri)?.compilerArgs as [SKDValue]?,
+      keys.compilerArgs: await self.buildSettings(for: uri)?.compilerArgs as [SKDRequestValue]?,
     ])
 
     if let range = range,
