finishing cleanup transfering #file -> #filePath, cleaning up (file) refs

Author: heckj

Sources/SKSupport/Platform.swift

@@ -19,6 +19,7 @@ extension Platform {
     switch self {
     case .darwin: return ".dylib"
     case .linux, .android: return ".so"
+    case .windows: return "dll"
     }
   }
 }

Tests/LSPLoggingTests/SupportTests.swift

@@ -23,10 +23,10 @@ final class SupportTests: XCTestCase {
       messages.append((message, level))
     }
 
-    func check(expected: [(String, LogLevel)], file: StaticString = #file, line: UInt = #line) {
+    func check(expected: [(String, LogLevel)], file: StaticString = #filePath, line: UInt = #line) {
       testLogger.flush()
-        XCTAssert(messages.count == expected.count, "\(messages) does not match expected \(expected)", file: (file), line: line)
-        XCTAssert(zip(messages, expected).allSatisfy({ $0.0 == $0.1 }), "\(messages) does not match expected \(expected)", file: (file), line: line)
+        XCTAssert(messages.count == expected.count, "\(messages) does not match expected \(expected)", file: file, line: line)
+        XCTAssert(zip(messages, expected).allSatisfy({ $0.0 == $0.1 }), "\(messages) does not match expected \(expected)", file: file, line: line)
       messages.removeAll()
     }
 

Tests/LanguageServerProtocolJSONRPCTests/CodingTests.swift

@@ -210,7 +210,7 @@ final class CodingTests: XCTestCase {
 let defaultCodingInfo: [CodingUserInfoKey: Any] = [CodingUserInfoKey.messageRegistryKey:MessageRegistry.lspProtocol]
 
 private func checkMessageCoding<Request>(_ value: Request, id: RequestID, json: String, file: StaticString = #filePath, line: UInt = #line) where Request: RequestType & Equatable {
-    checkCoding(JSONRPCMessage.request(value, id: id), json: json, userInfo: defaultCodingInfo, file: (file), line: line) {
+    checkCoding(JSONRPCMessage.request(value, id: id), json: json, userInfo: defaultCodingInfo, file: file, line: line) {
 
     guard case JSONRPCMessage.request(let decodedValueOpaque, let decodedID) = $0, let decodedValue = decodedValueOpaque as? Request else {
       XCTFail("decodedValue \($0) does not match expected \(value)", file: file, line: line)
@@ -223,7 +223,7 @@ private func checkMessageCoding<Request>(_ value: Request, id: RequestID, json:
 }
 
 private func checkMessageCoding<Notification>(_ value: Notification, json: String, file: StaticString = #filePath, line: UInt = #line) where Notification: NotificationType & Equatable {
-    checkCoding(JSONRPCMessage.notification(value), json: json, userInfo: defaultCodingInfo, file: (file), line: line) {
+    checkCoding(JSONRPCMessage.notification(value), json: json, userInfo: defaultCodingInfo, file: file, line: line) {
 
     guard case JSONRPCMessage.notification(let decodedValueOpaque) = $0, let decodedValue = decodedValueOpaque as? Notification else {
       XCTFail("decodedValue \($0) does not match expected \(value)", file: file, line: line)
@@ -243,7 +243,7 @@ private func checkMessageCoding<Response>(_ value: Response, id: RequestID, json
   var codingInfo = defaultCodingInfo
   codingInfo[.responseTypeCallbackKey] = callback
 
-    checkCoding(JSONRPCMessage.response(value, id: id), json: json, userInfo: codingInfo, file: (file), line: line) {
+    checkCoding(JSONRPCMessage.response(value, id: id), json: json, userInfo: codingInfo, file: file, line: line) {
 
     guard case JSONRPCMessage.response(let decodedValueOpaque, let decodedID) = $0, let decodedValue = decodedValueOpaque as? Response else {
       XCTFail("decodedValue \($0) does not match expected \(value)", file: file, line: line)
@@ -256,7 +256,7 @@ private func checkMessageCoding<Response>(_ value: Response, id: RequestID, json
 }
 
 private func checkMessageCoding(_ value: ResponseError, id: RequestID, json: String, file: StaticString = #filePath, line: UInt = #line) {
-    checkCoding(JSONRPCMessage.errorResponse(value, id: id), json: json, userInfo: defaultCodingInfo, file: (file), line: line) {
+    checkCoding(JSONRPCMessage.errorResponse(value, id: id), json: json, userInfo: defaultCodingInfo, file: file, line: line) {
 
     guard case JSONRPCMessage.errorResponse(let decodedValue, let decodedID) = $0 else {
       XCTFail("decodedValue \($0) does not match expected \(value)", file: file, line: line)