Include some context with search results

Author: nrc

src/file_controller/mod.rs

@@ -30,7 +30,8 @@ use file_controller::results::{
     FileResult,
     LineResult,
     FindResult,
-    SymbolResult
+    SymbolResult,
+    CONTEXT_SIZE,
 };
 
 pub struct Cache {
@@ -131,15 +132,6 @@ impl Cache {
         }))
     }
 
-    pub fn get_highlighted_line(
-        &self,
-        file_name: &Path,
-        line: span::Row<span::ZeroIndexed>,
-    ) -> Result<String, String> {
-        let lines = self.get_highlighted(file_name)?;
-        Ok(lines[line.0 as usize].clone())
-    }
-
     pub fn update_analysis(&self) {
         println!("Processing analysis...");
         let workspace_root = self
@@ -275,11 +267,26 @@ impl Cache {
     }
 
     fn make_line_result(&self, file_path: &Path, span: &Span) -> Result<LineResult, String> {
-        let text = match self.get_highlighted_line(file_path, span.range.row_start) {
-            Ok(t) => t,
+        let (text, context) = match self.get_highlighted(file_path) {
+            Ok(lines) => {
+                let line = span.range.row_start.0 as i32;
+                let text = lines[line as usize].clone();
+
+                let mut ctx_start = line - CONTEXT_SIZE;
+                if ctx_start < 0 {
+                    ctx_start = 0;
+                }
+                let mut ctx_end = line + CONTEXT_SIZE;
+                if ctx_end >= lines.len() as i32 {
+                    ctx_end = lines.len() as i32 - 1;
+                }
+                let context = lines[ctx_start as usize..=ctx_end as usize].join("\n");
+
+                (text, context)
+            }
             Err(_) => return Err(format!("Error finding text for {:?}", span)),
         };
-        Ok(LineResult::new(span, text))
+        Ok(LineResult::new(span, text, context))
     }
 
     // Sorts a set of search results into buckets by file.

src/file_controller/results.rs

@@ -8,6 +8,9 @@
 
 use super::Span;
 
+// The number of lines before and after a result line to use as context.
+pub const CONTEXT_SIZE: i32 = 3;
+
 #[derive(Serialize, Debug, Clone)]
 pub struct SearchResult {
     pub defs: Vec<DefResult>,
@@ -32,15 +35,17 @@ pub struct LineResult {
     pub column_start: u32,
     pub column_end: u32,
     pub line: String,
+    pub context: String,
 }
 
 impl LineResult {
-    pub fn new(span: &Span, line: String) -> LineResult {
+    pub fn new(span: &Span, line: String, context: String) -> LineResult {
         LineResult {
             line_start: span.range.row_start.one_indexed().0,
             column_start: span.range.col_start.one_indexed().0,
             column_end: span.range.col_end.one_indexed().0,
-            line: line,
+            line,
+            context,
         }
     }
 }