Merge pull request qualified#34 from qualified/fix-ser-unknown-message

kazk · web-flow · commit 1f33f5ad8834 · 2022-05-11T12:29:21.000-07:00
diff --git a/src/lsp/mod.rs b/src/lsp/mod.rs
@@ -107,13 +107,7 @@ impl Serialize for Message {
                 wrapped.serialize(serializer)
             }
 
-            Self::Unknown(unknown) => {
-                let wrapped = WithJsonRpc {
-                    jsonrpc: "2.0",
-                    msg: &unknown,
-                };
-                wrapped.serialize(serializer)
-            }
+            Self::Unknown(unknown) => unknown.serialize(serializer),
         }
     }
 }
@@ -155,4 +149,12 @@ mod tests {
         let from_value: Message = serde_json::from_value(v).unwrap();
         assert_eq!(from_str, from_value);
     }
+
+    #[test]
+    fn test_serialize_unknown_notification() {
+        let v = json!({"jsonrpc":"2.0","method":"language/status","params":{"message":""}});
+        let s = v.to_string();
+        let from_value: Message = serde_json::from_value(v).unwrap();
+        assert_eq!(serde_json::to_string(&from_value).unwrap(), s);
+    }
 }
diff --git a/src/lsp/types.rs b/src/lsp/types.rs
@@ -32,11 +32,4 @@ pub enum Params {
 
 /// Unknown message type.
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-pub struct Unknown {
-    #[serde(default)]
-    pub id: Option<Id>,
-    #[serde(default)]
-    pub method: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub params: Option<Params>,
-}
+pub struct Unknown(serde_json::Value);

Original file line number	Diff line number	Diff line change
`@@ -107,13 +107,7 @@ impl Serialize for Message {`
`107`	`107`	`wrapped.serialize(serializer)`
`108`	`108`	`}`
`109`	`109`
`110`		`- Self::Unknown(unknown) => {`
`111`		`- let wrapped = WithJsonRpc {`
`112`		`- jsonrpc: "2.0",`
`113`		`- msg: &unknown,`
`114`		`- };`
`115`		`- wrapped.serialize(serializer)`
`116`		`- }`
	`110`	`+ Self::Unknown(unknown) => unknown.serialize(serializer),`
`117`	`111`	`}`
`118`	`112`	`}`
`119`	`113`	`}`
`@@ -155,4 +149,12 @@ mod tests {`
`155`	`149`	`let from_value: Message = serde_json::from_value(v).unwrap();`
`156`	`150`	`assert_eq!(from_str, from_value);`
`157`	`151`	`}`
	`152`	`+`
	`153`	`+ #[test]`
	`154`	`+ fn test_serialize_unknown_notification() {`
	`155`	`+ let v = json!({"jsonrpc":"2.0","method":"language/status","params":{"message":""}});`
	`156`	`+ let s = v.to_string();`
	`157`	`+ let from_value: Message = serde_json::from_value(v).unwrap();`
	`158`	`+ assert_eq!(serde_json::to_string(&from_value).unwrap(), s);`
	`159`	`+ }`
`158`	`160`	`}`