Add another example and make folding smarter

Author: Zibi Braniecki

examples/expected_type.rs

@@ -0,0 +1,38 @@
+extern crate annotate_snippets;
+
+use annotate_snippets::display_list::DisplayList;
+use annotate_snippets::snippet::{Annotation, AnnotationType, Slice, Snippet, SourceAnnotation};
+
+fn main() {
+    let snippet = Snippet {
+        title: Some(Annotation {
+            label: Some("expected type, found `22`".to_string()),
+            id: None,
+            annotation_type: AnnotationType::Error,
+        }),
+        footer: vec![],
+        slices: vec![Slice {
+            source: r#"                annotations: vec![SourceAnnotation {
+                label: "expected struct `annotate_snippets::snippet::Slice`, found reference"
+                    .to_string(),
+                range: <22, 25>,"#.to_string(),
+            line_start: 26,
+            origin: Some("examples/footer.rs".to_string()),
+            fold: true,
+            annotations: vec![
+                SourceAnnotation {
+                    label: "".to_string(),
+                    annotation_type: AnnotationType::Error,
+                    range: (209, 211),
+                },
+                SourceAnnotation {
+                    label: "while parsing this struct".to_string(),
+                    annotation_type: AnnotationType::Info,
+                    range: (35, 51),
+                },
+            ],
+        }],
+    };
+
+    println!("{}", DisplayList::from(snippet));
+}

examples/footer.rs

@@ -26,8 +26,8 @@ fn main() {
             annotations: vec![SourceAnnotation {
                 label: "expected struct `annotate_snippets::snippet::Slice`, found reference"
                     .to_string(),
-                annotation_type: AnnotationType::Error,
                 range: (22, 25),
+                annotation_type: AnnotationType::Error,
             }],
         }],
     };

src/display_list.rs

@@ -65,6 +65,7 @@ pub enum DisplayMark {
 pub enum DisplayAnnotationType {
     Error,
     Warning,
+    Info,
     Note,
     Help,
 }
@@ -185,16 +186,26 @@ fn fold_body(body: &[DisplayLine]) -> Vec<DisplayLine> {
             DisplayLine::SourceAnnotation {
                 ref inline_marks, ..
             } => {
-                if no_annotation_lines_counter > 10 {
+                if no_annotation_lines_counter > 2 {
                     let fold_start = idx - no_annotation_lines_counter;
                     let fold_end = idx;
-                    for i in fold_start..fold_start + 4 {
+                    let pre_len = if no_annotation_lines_counter > 8 {
+                        4
+                    } else {
+                        0
+                    };
+                    let post_len = if no_annotation_lines_counter > 8 {
+                        2
+                    } else {
+                        1
+                    };
+                    for i in fold_start..fold_start + pre_len {
                         new_body.push(body[i].clone());
                     }
                     new_body.push(DisplayLine::Fold {
                         inline_marks: inline_marks.clone(),
                     });
-                    for i in fold_end - 2..fold_end {
+                    for i in fold_end - post_len..fold_end {
                         new_body.push(body[i].clone());
                     }
                 } else {
@@ -376,6 +387,7 @@ impl From<AnnotationType> for DisplayAnnotationType {
         match at {
             AnnotationType::Error => DisplayAnnotationType::Error,
             AnnotationType::Warning => DisplayAnnotationType::Warning,
+            AnnotationType::Info => DisplayAnnotationType::Info,
             AnnotationType::Note => DisplayAnnotationType::Note,
             AnnotationType::Help => DisplayAnnotationType::Help,
         }

src/format.rs

@@ -10,6 +10,7 @@ impl DisplayListFormatting for Formatter {
         match annotation_type {
             DisplayAnnotationType::Error => "error".to_string(),
             DisplayAnnotationType::Warning => "warning".to_string(),
+            DisplayAnnotationType::Info => "info".to_string(),
             DisplayAnnotationType::Note => "note".to_string(),
             DisplayAnnotationType::Help => "help".to_string(),
         }
@@ -47,6 +48,7 @@ impl DisplayListFormatting for Formatter {
         let mark = match annotation_type {
             DisplayAnnotationType::Error => "^",
             DisplayAnnotationType::Warning => "-",
+            DisplayAnnotationType::Info => "-",
             DisplayAnnotationType::Note => "-",
             DisplayAnnotationType::Help => "-",
         };

src/format_color.rs

@@ -14,6 +14,7 @@ impl DisplayListFormatting for Formatter {
         match annotation_type {
             DisplayAnnotationType::Error => "error".to_string(),
             DisplayAnnotationType::Warning => "warning".to_string(),
+            DisplayAnnotationType::Info => "info".to_string(),
             DisplayAnnotationType::Note => "note".to_string(),
             DisplayAnnotationType::Help => "help".to_string(),
         }
@@ -51,12 +52,14 @@ impl DisplayListFormatting for Formatter {
         let mark = match annotation_type {
             DisplayAnnotationType::Error => "^",
             DisplayAnnotationType::Warning => "-",
+            DisplayAnnotationType::Info => "-",
             DisplayAnnotationType::Note => "-",
             DisplayAnnotationType::Help => "-",
         };
         let color = match annotation_type {
             DisplayAnnotationType::Error => Fixed(9).bold(),
             DisplayAnnotationType::Warning => Fixed(11).bold(),
+            DisplayAnnotationType::Info => Fixed(12).bold(),
             DisplayAnnotationType::Note => Style::new().bold(),
             DisplayAnnotationType::Help => Fixed(14).bold(),
         };
@@ -133,6 +136,7 @@ impl DisplayListFormatting for Formatter {
                 let color = match annotation_type {
                     DisplayAnnotationType::Error => Fixed(9).bold(),
                     DisplayAnnotationType::Warning => Fixed(11).bold(),
+                    DisplayAnnotationType::Info => Fixed(12).bold(),
                     DisplayAnnotationType::Note => Style::new().bold(),
                     DisplayAnnotationType::Help => Fixed(14).bold(),
                 };

src/snippet.rs

@@ -26,6 +26,7 @@ pub enum AnnotationType {
     Error,
     /// Warning annotations are displayed using blue color and "-" character.
     Warning,
+    Info,
     Note,
     Help,
 }

tests/snippet/mod.rs

@@ -101,6 +101,7 @@ pub struct AnnotationDef {
 enum AnnotationTypeDef {
     Error,
     Warning,
+    Info,
     Note,
     Help,
 }