Remove explicit dependency on Yams

Author: RLovelett

Package.pins

@@ -30,12 +30,6 @@
       "reason": null,
       "repositoryURL": "https://github.com/RLovelett/SourceKit.git",
       "version": "1.0.2"
-    },
-    {
-      "package": "Yams",
-      "reason": null,
-      "repositoryURL": "https://github.com/jpsim/Yams.git",
-      "version": "0.1.4"
     }
   ],
   "version": 1

Package.swift

@@ -5,13 +5,11 @@ let package = Package(
     targets: [
         Target(name: "BaseProtocol"),
         Target(name: "SourceKitter"),
-        Target(name: "YamlConvertable"),
-        Target(name: "LanguageServerProtocol", dependencies: ["YamlConvertable", "BaseProtocol", "SourceKitter"]),
+        Target(name: "LanguageServerProtocol", dependencies: ["BaseProtocol", "SourceKitter"]),
         Target(name: "LanguageServer", dependencies: ["LanguageServerProtocol", "BaseProtocol"])
     ],
     dependencies: [
         .Package(url: "https://github.com/RLovelett/SourceKit.git", majorVersion: 1),
-        .Package(url: "https://github.com/jpsim/Yams.git", Version(0, 1, 4)),
         .Package(url: "https://github.com/thoughtbot/Argo.git", majorVersion: 4),
         .Package(url: "https://github.com/edwardaux/Ogra.git", majorVersion: 4),
         .Package(url: "https://github.com/thoughtbot/Curry.git", majorVersion: 3)

Sources/LanguageServerProtocol/Types/SwiftModule.swift

@@ -10,8 +10,6 @@ import Argo
 import Curry
 import Foundation
 import Runes
-import YamlConvertable
-import Yams
 
 /// A module, typically defined and managed by [SwiftPM](), that manages the sources and the compiler arguments
 /// that should be sent to SourceKit.
@@ -89,30 +87,3 @@ extension SwiftModule : Equatable {
     }
 
 }
-
-extension SwiftModule : YamlConvertable {
-
-    /// - TODO: This really should really be part of `YamlConvertable`. Unfortunately the generic version of this
-    /// causes the compiler to die.
-    /// e.g., this signature
-    /// static func decodeAndFilterFailed<T: YamlConvertable>(_ yaml: Node) -> Decoded<[T]> where T == T.DecodedType {
-    static func decodeAndFilterFailed(_ yaml: Node) -> Decoded<[SwiftModule]> {
-        switch yaml {
-        case .mapping(let o):
-            //        return .typeMismatch(expected: "Array", actual: "")
-            return pure(o.flatMap({ SwiftModule.decode($0.1).value }))
-        default:
-            return .typeMismatch(expected: "Array", actual: "")
-        }
-    }
-
-
-    static func decode(_ yaml: Node) -> Decoded<SwiftModule> {
-        let name = flatReduce(["module-name"], initial: yaml, combine: convertedYAML).flatMap(String.decode)
-        let sources = flatReduce(["sources"], initial: yaml, combine: convertedYAML).flatMap(Array<URL>.decode)
-        let otherArguments = flatReduce(["other-args"], initial: yaml, combine: convertedYAML).flatMap(Array<String>.decode)
-
-        return curry(SwiftModule.init) <^> name <*> sources <*> otherArguments
-    }
-
-}

Sources/LanguageServerProtocol/Types/Workspace.swift

@@ -10,8 +10,6 @@ import Argo
 import Foundation
 import os.log
 import SourceKitter
-import YamlConvertable
-import Yams
 
 @available(macOS 10.12, *)
 private let log = OSLog(subsystem: "me.lovelett.langserver-swift", category: "Workspace")
@@ -46,21 +44,7 @@ public struct Workspace {
     init(inDirectory: URL) {
         sourceKitSession = SourceKit.Session()
         root = inDirectory
-        let llbuild = root.appendingPathComponent(".build", isDirectory: true)
-            .appendingPathComponent("debug", isDirectory: false)
-            .appendingPathExtension("yaml")
-        let yamlModules: Decoded<[SwiftModule]> = Decoded<Node>.fromOptional(
-                (try? String(contentsOf: llbuild, encoding: .utf8))
-                    .flatMap({ try? Node(string: $0) }))
-            .flatMap({ flatReduce(["commands"], initial: $0, combine: convertedYAML) })
-            .flatMap(SwiftModule.decodeAndFilterFailed)
-
-        switch yamlModules {
-        case .success(let a) where !a.isEmpty:
-            modules = Set(a)
-        default:
-            modules = [SwiftModule(root)]
-        }
+        modules = []
     }
 
     /// A description to the client of the types of services this language server provides.
@@ -102,25 +86,7 @@ public struct Workspace {
     // MARK: - Language Server Protocol methods
 
     public mutating func receive(notification parameters: DidChangeWatchedFilesParams) {
-        let x: [SwiftModule] = parameters.changes
-            .filter({ $0.uri.pathExtension == "yaml" })
-            .flatMap({ try? String(contentsOf: $0.uri) })
-            .flatMap({ try? Node(string: $0) })
-            .flatMap({ flatReduce(["commands"], initial: $0, combine: convertedYAML).flatMap(SwiftModule.decodeAndFilterFailed).value })
-            .flatMap({ $0 })
-        let moduleChanges = Set<SwiftModule>(x)
-
-        // Remove any missing modules
-        modules = modules.intersection(moduleChanges)
-
-//        for changedModule in moduleChanges {
-//            if let index = modules.index(of: changedModule) {
-//                var oldModule = modules[index]
-//                oldModule
-//            } else {
-//                modules
-//            }
-//        }
+
     }
 
     /// Notify the `Workspace` that the client has opened a document in the workspace.

Sources/YamlConvertable/Extensions/StandardTypesRyan.swift

@@ -8,24 +8,8 @@
 
 import Argo
 @testable import LanguageServerProtocol
-@testable import YamlConvertable
-import Yams
 import XCTest
 
 class SwiftModuleTests: XCTestCase {
 
-    func testYamlLoading() {
-        let fixture = getFixture("debug.yaml", in: "ValidLayouts/Simple/.build")!
-        let str = try! String(contentsOf: fixture, encoding: .utf8)
-        let yaml = try! Node(string: str)
-        let foo: Decoded<Node> = flatReduce(["commands"], initial: yaml, combine: convertedYAML)
-        let bar: Decoded<[SwiftModule]> = foo.flatMap(SwiftModule.decodeAndFilterFailed)
-        switch bar {
-        case .success(let modules):
-            XCTAssertEqual(modules.count, 1)
-        case .failure(let error):
-            XCTFail(error.description)
-        }
-    }
-
 }