Improve JSON-RPC layer

.gitignore

@@ -1,3 +1,3 @@
-/target
+target/
 **/*.rs.bk
 /.idea

Cargo.toml

@@ -7,11 +7,14 @@ authors = [
     "Patrick Förster <[email protected]>"]
 edition = "2018"
 
+[workspace]
+members = ["./jsonrpc", "./jsonrpc_derive"]
+
 [dependencies]
+jsonrpc = { path = "jsonrpc" }
+jsonrpc-derive = { path = "jsonrpc_derive" }
 lsp-types = "0.56.0"
-futures-preview = { version = "0.3.0-alpha.14", features = ["compat"] }
-jsonrpc-core = "11.0.0"
-jsonrpc-core-client = "11.0.0"
+futures-preview = { version = "0.3.0-alpha.15", features = ["compat"] }
 serde = { version = "1.0.90", features = ["derive", "rc"] }
 serde_json = "1.0.39"
 tokio = "0.1"

jsonrpc/Cargo.toml

@@ -0,0 +1,13 @@
+[package]
+name = "jsonrpc"
+version = "0.1.0"
+authors = [
+    "Eric Förster <[email protected]>",
+    "Patrick Förster <[email protected]>"]
+edition = "2018"
+
+[dependencies]
+futures-preview = { version = "0.3.0-alpha.15", features = ["compat"] }
+serde = { version = "1.0", features = ["derive"] }
+serde_json = "1.0"
+serde_repr = "0.1"

jsonrpc/src/lib.rs

@@ -0,0 +1,36 @@
+#![feature(await_macro, async_await)]
+
+mod server;
+mod types;
+
+pub use self::server::*;
+pub use self::types::*;
+
+#[macro_export]
+macro_rules! handle_message {
+    ($message:ident, $server:ident) => {{
+        use jsonrpc::*;
+
+        let handle = async move |message| {
+            let message: Message = serde_json::from_str(message).map_err(|_| Error {
+                code: ErrorCode::ParseError,
+                message: "Could not parse the input".to_owned(),
+                data: serde_json::Value::Null,
+            })?;
+
+            match message {
+                Message::Request(request) => Ok(Some(await!($server.handle_request(request)))),
+                Message::Notification(notification) => {
+                    await!($server.handle_notification(notification));
+                    Ok(None)
+                }
+                Message::Response(_) => panic!("Unexpected client response"),
+            }
+        };
+
+        match await!(handle(&$message)) {
+            Ok(response) => response,
+            Err(error) => Some(Response::new(serde_json::Value::Null, Some(error), None)),
+        }
+    }};
+}