Update ReferencesRequest to match version 3.14 of the LSP spec

Author: ahoppen

Sources/LanguageServerProtocol/ReferencesRequest.swift

@@ -33,12 +33,20 @@ public struct ReferencesRequest: RequestType, Hashable {
   /// The document location at which to lookup symbol information.
   public var position: Position
 
-  /// Whether to include the declaration in the list of symbols, or just the references.
-  public var includeDeclaration: Bool?
+  public var context: ReferencesContext
 
-  public init(textDocument: TextDocumentIdentifier, position: Position, includeDeclaration: Bool? = nil) {
+  public init(textDocument: TextDocumentIdentifier, position: Position, context: ReferencesContext) {
     self.textDocument = textDocument
     self.position = position
+    self.context = context
+  }
+}
+
+public struct ReferencesContext: Codable, Hashable {
+  /// Whether to include the declaration in the list of symbols, or just the references.
+  public var includeDeclaration: Bool
+
+  public init(includeDeclaration: Bool) {
     self.includeDeclaration = includeDeclaration
   }
 }

Sources/SourceKit/SourceKitServer.swift

@@ -688,7 +688,7 @@ extension SourceKitServer {
       log("performing indexed jump-to-def with usr \(usr)")
 
       var roles: SymbolRole = [.reference]
-      if req.params.includeDeclaration != false {
+      if req.params.context.includeDeclaration {
         roles.formUnion([.declaration, .definition])
       }
 

Tests/SourceKitTests/SourceKitTests.swift

@@ -82,7 +82,8 @@ final class SKTests: XCTestCase {
 
     let refs = try ws.sk.sendSync(ReferencesRequest(
       textDocument: locDef.docIdentifier,
-      position: locDef.position))
+      position: locDef.position,
+      context: ReferencesContext(includeDeclaration: true)))
 
     XCTAssertEqual(Set(refs), [
       Location(locDef),

Tests/SourceKitTests/SwiftPMIntegration.swift

@@ -22,7 +22,7 @@ final class SwiftPMIntegrationTests: XCTestCase {
     let call = ws.testLoc("Lib.foo:call")
     let def = ws.testLoc("Lib.foo:def")
     try ws.openDocument(call.url, language: .swift)
-    let refs = try ws.sk.sendSync(ReferencesRequest(textDocument: call.docIdentifier, position: call.position))
+    let refs = try ws.sk.sendSync(ReferencesRequest(textDocument: call.docIdentifier, position: call.position, context: ReferencesContext(includeDeclaration: true)))
 
     XCTAssertEqual(Set(refs), [
       Location(call),