Merge pull request swiftlang#43 from benlangmuir/test-lsp-layer

[lsp] Fill in some test coverage gaps

Author: benlangmuir

Sources/LanguageServerProtocol/Diagnostic.swift

@@ -10,18 +10,21 @@
 //
 //===----------------------------------------------------------------------===//
 
+/// The serverity level of a Diagnostic, between hint and error.
 public enum DiagnosticSeverity: Int, Codable, Hashable {
   case error = 1
   case warning = 2
   case information = 3
   case hint = 4
 }
 
+/// A unique diagnostic code, which may be used identifier the diagnostic in e.g. documentation.
 public enum DiagnosticCode: Hashable {
   case number(Int)
   case string(String)
 }
 
+/// A diagnostic message such a compiler error or warning.
 public struct Diagnostic: Codable, Hashable {
 
   /// The primary position/range of the diagnostic.
@@ -30,7 +33,8 @@ public struct Diagnostic: Codable, Hashable {
   /// Whether this is a warning, error, etc.
   public var severity: DiagnosticSeverity?
 
-  /// The "code" of the diagnostice, which might be a number or string, typically providing a unique way to reference the diagnostic in e.g. documentation.
+  /// The "code" of the diagnostice, which might be a number or string, typically providing a unique
+  /// way to reference the diagnostic in e.g. documentation.
   public var code: DiagnosticCode?
 
   /// A human-readable description of the source of this diagnostic, e.g. "sourcekitd"
@@ -42,7 +46,14 @@ public struct Diagnostic: Codable, Hashable {
   /// Related diagnostic notes.
   public var relatedInformation: [DiagnosticRelatedInformation]?
 
-  public init(range: Range<Position>, severity: DiagnosticSeverity?, code: DiagnosticCode? = nil, source: String?, message: String, relatedInformation: [DiagnosticRelatedInformation]? = nil) {
+  public init(
+    range: Range<Position>,
+    severity: DiagnosticSeverity?,
+    code: DiagnosticCode? = nil,
+    source: String?,
+    message: String,
+    relatedInformation: [DiagnosticRelatedInformation]? = nil)
+  {
     self.range = PositionRange(range)
     self.severity = severity
     self.code = code

Sources/LanguageServerProtocol/Error.swift

@@ -95,19 +95,6 @@ public struct MessageDecodingError: Error, Hashable {
     self.id = id
     self.messageKind = messageKind
   }
-
-  public init(code: ErrorCode, message: String, requestID: RequestID? = nil, responseID: RequestID? = nil) {
-    self.code = code
-    self.message = message
-    self.id = requestID ?? responseID
-
-    switch (requestID, responseID) {
-    case (nil, nil): self.messageKind = .unknown
-    case (nil, _): self.messageKind = .response
-    case (_, nil): self.messageKind = .request
-    case (_, _): preconditionFailure("cannot be both a request and response")
-    }
-  }
 }
 
 extension MessageDecodingError {

Sources/LanguageServerProtocol/Language.swift

@@ -10,6 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+/// A source code language identifier, such as "swift", or "objective-c".
 public enum Language: String, Codable, Hashable {
   case c
   case cpp // C++, not C preprocessor
@@ -29,6 +30,7 @@ public enum Language: String, Codable, Hashable {
     }
   }
 
+  /// Clang-compatible language name suitable for use with `-x <language>`.
   public var xflag: String? {
     switch self {
       case .swift: return "swift"
@@ -40,6 +42,7 @@ public enum Language: String, Codable, Hashable {
     }
   }
 
+  /// Clang-compatible language name for a header file. See `xflag`.
   public var xflagHeader: String? {
     return xflag.map { "\($0)-header" }
   }

Tests/LanguageServerProtocolTests/CodingTests.swift

@@ -196,6 +196,17 @@ final class CodingTests: XCTestCase {
 
     checkCoding(RequestID.number(100), json: "100")
     checkCoding(RequestID.string("100"), json: "\"100\"")
+
+    checkCoding(Language.c, json: "\"c\"")
+    checkCoding(Language.cpp, json: "\"cpp\"")
+    checkCoding(Language.objective_c, json: "\"objective-c\"")
+    checkCoding(Language.objective_cpp, json: "\"objective-cpp\"")
+    checkCoding(Language.swift, json: "\"swift\"")
+    checkCoding(Language.unknown, json: "\"unknown\"")
+    checkDecoding(json: "\"asdfAF\"", expected: Language.unknown)
+
+    checkCoding(DiagnosticCode.number(123), json: "123")
+    checkCoding(DiagnosticCode.string("hi"), json: "\"hi\"")
   }
 }
 

Tests/LanguageServerProtocolTests/LanguageServerProtocolTests.swift

@@ -0,0 +1,29 @@
+//===----------------------------------------------------------------------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 2018 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
+//
+//===----------------------------------------------------------------------===//
+
+@testable import LanguageServerProtocol
+
+import XCTest
+
+final class LanguageServerProtocolTests: XCTestCase {
+
+  func testLanguageXFlag() {
+    XCTAssertEqual(Language.c.xflag, "c")
+    XCTAssertEqual(Language.c.xflagHeader, "c-header")
+    XCTAssertEqual(Language.cpp.xflag, "c++")
+    XCTAssertEqual(Language.cpp.xflagHeader, "c++-header")
+    XCTAssertEqual(Language.objective_c.xflag, "objective-c")
+    XCTAssertEqual(Language.objective_c.xflagHeader, "objective-c-header")
+    XCTAssertEqual(Language.objective_cpp.xflag, "objective-c++")
+    XCTAssertEqual(Language.objective_cpp.xflagHeader, "objective-c++-header")
+  }
+}

Tests/LanguageServerProtocolTests/XCTestManifests.swift

@@ -21,10 +21,20 @@ extension ConnectionTests {
     ]
 }
 
+extension LanguageServerProtocolTests {
+    // DO NOT MODIFY: This is autogenerated, use: 
+    //   `swift test --generate-linuxmain`
+    // to regenerate.
+    static let __allTests__LanguageServerProtocolTests = [
+        ("testLanguageXFlag", testLanguageXFlag),
+    ]
+}
+
 public func __allTests() -> [XCTestCaseEntry] {
     return [
         testCase(CodingTests.__allTests__CodingTests),
         testCase(ConnectionTests.__allTests__ConnectionTests),
+        testCase(LanguageServerProtocolTests.__allTests__LanguageServerProtocolTests),
     ]
 }
 #endif