Change server to render multiline hunks correctly

Author: rsdy

server/bleep/src/webserver/answer.rs

@@ -921,6 +921,7 @@ impl Conversation {
                     }
                     item
                 })
+                .flat_map(|v| v.expand())
                 .map(|s| s.substitute_path_alias(&self.paths))
                 .collect::<Vec<_>>();
 

server/bleep/src/webserver/answer/response.rs

@@ -139,6 +139,13 @@ impl SearchResult {
             s => s,
         }
     }
+
+    pub(crate) fn expand(self) -> Vec<Self> {
+        match self {
+            SearchResult::Modify(modify) => modify.expand(),
+            _ => vec![self],
+        }
+    }
 }
 
 #[derive(serde::Serialize, serde::Deserialize, Default, Debug, Clone)]
@@ -268,18 +275,11 @@ impl ModifyResult {
             .get(1)
             .and_then(serde_json::Value::as_str)
             .map(ToOwned::to_owned);
+
         let diff = v
             .get(3)
             .and_then(serde_json::Value::as_str)
-            .map(|raw_hunk| {
-                let header = raw_hunk.lines().next().and_then(|s| s.parse().ok());
-                let lines = raw_hunk
-                    .lines()
-                    .skip(1)
-                    .map(ToOwned::to_owned)
-                    .collect::<Vec<_>>();
-                ModifyResultHunk { header, lines }
-            });
+            .and_then(Self::parse_hunk);
 
         let raw = v
             .get(3)
@@ -320,6 +320,39 @@ impl ModifyResult {
         });
         self
     }
+
+    fn parse_hunk(raw_hunk: &str) -> Option<ModifyResultHunk> {
+        let mut raw = raw_hunk.lines();
+        let header = raw.next().and_then(|s| s.parse().ok());
+        let lines = raw.map(ToOwned::to_owned).collect::<Vec<_>>();
+
+        Some(ModifyResultHunk { header, lines })
+    }
+
+    fn expand(self) -> Vec<SearchResult> {
+        self.raw
+            .iter()
+            .flat_map(|raw_hunk| raw_hunk.split("\n@@"))
+            .map(|hunk| {
+                if hunk.starts_with("@@") {
+                    hunk.to_owned()
+                } else {
+                    format!("@@{hunk}")
+                }
+            })
+            .map(|raw| {
+                SearchResult::Modify(ModifyResult {
+                    diff: Self::parse_hunk(&raw),
+                    path_alias: self.path_alias,
+                    path: self.path.clone(),
+                    language: self.language.clone(),
+                    description: self.description.clone(),
+                    raw: Some(raw),
+                    new_file: self.new_file.clone(),
+                })
+            })
+            .collect::<Vec<_>>()
+    }
 }
 
 impl std::str::FromStr for ModifyResultHunkHeader {