Remove CancellationToken

This is no longer needed because we handle cancellation on the `Task` level.

Author: ahoppen

Sources/LSPTestSupport/TestJSONRPCConnection.swift

@@ -136,9 +136,7 @@ public final class TestClient: MessageHandler {
   }
 
   public func handle<R: RequestType>(_ params: R, id: RequestID, from clientID: ObjectIdentifier, reply: @escaping (LSPResult<R.Response>) -> Void) {
-    let cancellationToken = CancellationToken()
-
-    let request = Request(params, id: id, clientID: clientID, cancellation: cancellationToken, reply: reply)
+    let request = Request(params, id: id, clientID: clientID, reply: reply)
 
     guard !oneShotRequestHandlers.isEmpty else {
       fatalError("unexpected request \(request)")
@@ -228,15 +226,13 @@ public final class TestServer: MessageHandler {
   }
 
   public func handle<R: RequestType>(_ params: R, id: RequestID, from clientID: ObjectIdentifier, reply: @escaping (LSPResult<R.Response >) -> Void) {
-    let cancellationToken = CancellationToken()
-
     if let params = params as? EchoRequest {
-      let req = Request(params, id: id, clientID: clientID, cancellation: cancellationToken, reply: { result in
+      let req = Request(params, id: id, clientID: clientID, reply: { result in
         reply(result.map({ $0 as! R.Response }))
       })
       req.reply(req.params.string)
     } else if let params = params as? EchoError {
-      let req = Request(params, id: id, clientID: clientID, cancellation: cancellationToken, reply: { result in
+      let req = Request(params, id: id, clientID: clientID, reply: { result in
         reply(result.map({ $0 as! R.Response }))
       })
       if let code = req.params.code {

Sources/LanguageServerProtocol/CMakeLists.txt

@@ -1,6 +1,5 @@
 add_library(LanguageServerProtocol STATIC
   AsyncQueue.swift
-  Cancellation.swift
   Connection.swift
   CustomCodable.swift
   Error.swift

Sources/LanguageServerProtocol/Cancellation.swift

@@ -149,9 +149,9 @@ extension Connection {
   ///   use the version with a completion handler.
   public func send<R: RequestType>(_ request: R) async throws -> R.Response {
     let requestIDWrapper = ThreadSafeBox<RequestID?>(initialValue: nil)
-    try Task.checkCancellation()
     return try await withTaskCancellationHandler {
-      try await withCheckedThrowingContinuation { continuation in
+      try Task.checkCancellation()
+      return try await withCheckedThrowingContinuation { continuation in
         let requestID = self.send(request) { result in
           continuation.resume(with: result)
         }

Sources/LanguageServerProtocol/Connection.swift

@@ -35,14 +35,10 @@ public final class Request<R: RequestType> {
     }
   }
 
-  /// The request's cancellation state.
-  public let cancellationToken: CancellationToken
-
-  public init(_ request: Params, id: RequestID, clientID: ObjectIdentifier, cancellation: CancellationToken, reply: @escaping (LSPResult<Response>) -> Void) {
+  public init(_ request: Params, id: RequestID, clientID: ObjectIdentifier, reply: @escaping (LSPResult<Response>) -> Void) {
     self.id = id
     self.clientID = clientID
     self.params = request
-    self.cancellationToken = cancellation
     self.replyBlock = reply
   }
 
@@ -62,9 +58,6 @@ public final class Request<R: RequestType> {
   public func reply(_ result: Response) {
     reply(.success(result))
   }
-
-  /// Whether the result has been cancelled.
-  public var isCancelled: Bool { return cancellationToken.isCancelled }
 }
 
 /// A request object, wrapping the parameters of a `NotificationType`.

Sources/LanguageServerProtocol/Request.swift

@@ -285,7 +285,7 @@ actor ClangLanguageServerShim: ToolchainLanguageServer, MessageHandler {
     reply: @escaping (LSPResult<R.Response>) -> Void
   ) {
     clangdMessageHandlingQueue.async {
-      let request = Request(params, id: id, clientID: clientID, cancellation: CancellationToken(), reply: { result in
+      let request = Request(params, id: id, clientID: clientID, reply: { result in
         reply(result)
       })
       guard let sourceKitServer = await self.sourceKitServer else {

Sources/SourceKitLSP/Clang/ClangLanguageServer.swift

@@ -520,9 +520,7 @@ extension SourceKitServer: MessageHandler {
     //    more results for this completion session after it has received the
     //    initial results.
     let task = messageHandlingQueue.async(barrier: false) {
-      let cancellationToken = CancellationToken()
-
-      let request = Request(params, id: id, clientID: clientID, cancellation: cancellationToken, reply: { [weak self] result in
+      let request = Request(params, id: id, clientID: clientID, reply: { [weak self] result in
         reply(result)
         if let self {
           Task {