Merge pull request #920 from ahoppen/ahoppen/more-test-migration

Migrate the remaining TIBS tests to the new testing infrastructure that defines sources inline

Author: ahoppen

Sources/LanguageServerProtocol/CMakeLists.txt

@@ -27,6 +27,7 @@ add_library(LanguageServerProtocol STATIC
   Notifications/WorkDoneProgress.swift
 
   Requests/ApplyEditRequest.swift
+  Requests/BarrierRequest.swift
   Requests/CallHierarchyIncomingCallsRequest.swift
   Requests/CallHierarchyOutgoingCallsRequest.swift
   Requests/CallHierarchyPrepareRequest.swift

Sources/LanguageServerProtocol/Messages.swift

@@ -17,6 +17,7 @@
 /// `MessageRegistry._register()` which allows you to avoid bloating the real server implementation.
 public let builtinRequests: [_RequestType.Type] = [
   ApplyEditRequest.self,
+  BarrierRequest.self,
   CallHierarchyIncomingCallsRequest.self,
   CallHierarchyOutgoingCallsRequest.self,
   CallHierarchyPrepareRequest.self,

Sources/LanguageServerProtocol/Requests/BarrierRequest.swift

@@ -0,0 +1,20 @@
+//===----------------------------------------------------------------------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 2019 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See https://swift.org/LICENSE.txt for license information
+// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//===----------------------------------------------------------------------===//
+
+/// A no-op request that ensures all previous notifications and requests have been handled before any message
+/// after the barrier request is handled.
+public struct BarrierRequest: RequestType {
+  public static var method: String = "workspace/_barrier"
+  public typealias Response = VoidResponse
+
+  public init() {}
+}

Sources/LanguageServerProtocol/SupportTypes/Location.swift

@@ -13,7 +13,7 @@
 /// Range within a particular document.
 ///
 /// For a location where the document is implied, use `Position` or `Range<Position>`.
-public struct Location: ResponseType, Hashable, Codable {
+public struct Location: ResponseType, Hashable, Codable, CustomDebugStringConvertible {
 
   public var uri: DocumentURI
 
@@ -24,4 +24,8 @@ public struct Location: ResponseType, Hashable, Codable {
     self.uri = uri
     self._range = CustomCodable<PositionRange>(wrappedValue: range)
   }
+
+  public var debugDescription: String {
+    return "\(uri):\(range.lowerBound)-\(range.upperBound)"
+  }
 }