Merge pull request swiftlang#122 from krzyzanowskim/language-struct

Convert Language enum to struct

Author: benlangmuir

Sources/LanguageServerProtocol/Language.swift

@@ -11,23 +11,18 @@
 //===----------------------------------------------------------------------===//
 
 /// 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
-  case objective_c = "objective-c"
-  case objective_cpp = "objective-cpp"
-  case swift
+public struct Language: RawRepresentable, Codable, Equatable, Hashable {
+  public typealias LanguageId = String
 
-  case unknown
+  public static let c: Language = Language(rawValue: "c")
+  public static let cpp: Language = Language(rawValue: "cpp") // C++, not C preprocessor
+  public static let objective_c: Language = Language(rawValue: "objective-c")
+  public static let objective_cpp: Language = Language(rawValue: "objective-cpp")
+  public static let swift: Language = Language(rawValue: "swift")
 
-  public init(from decoder: Decoder) throws {
-    let container = try decoder.singleValueContainer()
-    let str = try container.decode(String.self)
-    if let value = Language(rawValue: str) {
-      self = value
-    } else {
-      self = .unknown
-    }
+  public let rawValue: LanguageId
+  public init(rawValue: LanguageId) {
+    self.rawValue = rawValue
   }
 
   /// Clang-compatible language name suitable for use with `-x <language>`.
@@ -38,7 +33,7 @@ public enum Language: String, Codable, Hashable {
       case .cpp: return "c++"
       case .objective_c: return "objective-c"
       case .objective_cpp: return "objective-c++"
-      case .unknown: return nil
+      default: return nil
     }
   }
 
@@ -47,3 +42,9 @@ public enum Language: String, Codable, Hashable {
     return xflag.map { "\($0)-header" }
   }
 }
+
+extension Language: CustomStringConvertible {
+  public var description: String {
+    return rawValue
+  }
+}

Tests/LanguageServerProtocolTests/CodingTests.swift

@@ -202,8 +202,7 @@ final class CodingTests: XCTestCase {
     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(Language(rawValue: "unknown"), json: "\"unknown\"")
 
     checkCoding(DiagnosticCode.number(123), json: "123")
     checkCoding(DiagnosticCode.string("hi"), json: "\"hi\"")

Tests/SKCoreTests/FallbackBuildSystemTests.swift

@@ -11,7 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 @testable import SKCore
-
+import LanguageServerProtocol
 import Basic
 import XCTest
 
@@ -100,6 +100,6 @@ final class FallbackBuildSystemTests: XCTestCase {
   func testUnknown() {
     let source = AbsolutePath("/my/source.mm")
     let bs = FallbackBuildSystem()
-    XCTAssertNil(bs.settings(for: source.asURL, .unknown))
+    XCTAssertNil(bs.settings(for: source.asURL, Language(rawValue: "unknown")))
   }
 }