cmark files and multiline fragments

.concourse.yml

@@ -289,9 +289,9 @@ jobs:
               export CARGO_HOME="$(pwd)/../cargo"
               sudo chown $(whoami): -Rf ${CARGO_HOME} .
               cargo +stable run -- --version
-              cargo +stable run -- spellcheck demo/Cargo.toml || echo "$?"
-              cargo +stable run -- spellcheck demo/src/main.rs || echo "$?"
-              cargo +stable run -- spellcheck demo/ || echo "$?"
+              cargo +stable run -- spellcheck demo/Cargo.toml
+              cargo +stable run -- spellcheck demo/src/main.rs
+              cargo +stable run -- spellcheck demo/
             dir: git-repo
           caches:
           - path: cargo

src/action/bandaid.rs

@@ -1,6 +1,6 @@
 use crate::span::Span;
 use crate::suggestion::Suggestion;
-use anyhow::{anyhow, Error, Result};
+use anyhow::{bail, Error, Result};
 use log::trace;
 use std::convert::TryFrom;
 
@@ -45,7 +45,7 @@ impl<'s> TryFrom<(&Suggestion<'s>, usize)> for BandAid {
         if let Some(replacement) = suggestion.replacements.iter().nth(pick_idx) {
             Ok(Self::new(replacement.as_str(), &suggestion.span))
         } else {
-            Err(anyhow!("Does not contain any replacements"))
+            bail!("Does not contain any replacements")
         }
     }
 }
@@ -67,9 +67,9 @@ impl From<(String, Span)> for BandAid {
 pub(crate) mod tests {
     use super::*;
     use crate::span::Span;
-    use anyhow::bail;
+    use anyhow::anyhow;
     use proc_macro2::LineColumn;
-    use std::io::BufRead;
+    use std::io::Read;
     use std::path::Path;
 
     /// Extract span from file as String
@@ -95,9 +95,9 @@ pub(crate) mod tests {
     /// Helpful to validate bandaids against what's actually in the string
     // @todo does not handle cross line spans @todo yet
     #[allow(unused)]
-    pub(crate) fn load_span_from<S>(mut source: S, span: Span) -> Result<String>
+    pub(crate) fn load_span_from<R>(mut source: R, span: Span) -> Result<String>
     where
-        S: BufRead,
+        R: Read,
     {
         log::trace!("Loading {:?} from source", &span);
         if span.start.line < 1 {
@@ -106,22 +106,47 @@ pub(crate) mod tests {
         if span.end.line < span.start.line {
             bail!("Line range would be negative, bail")
         }
-        if span.end.column < span.start.column {
+        if span.end.line == span.start.line && span.end.column < span.start.column {
             bail!("Column range would be negative, bail")
         }
-        let line = (&mut source)
-            .lines()
-            .skip(span.start.line - 1)
-            .filter_map(|line| line.ok())
-            .next()
-            .ok_or_else(|| anyhow!("Line not in buffer or invalid"))?;
-
-        let range = dbg!(span.start.column..(span.end.column + 1));
-        log::trace!("Loading {:?} from line >{}<", &range, &line);
-        dbg!(line)
-            .get(range.clone())
-            .map(|s| dbg!(s.to_owned()))
-            .ok_or_else(|| anyhow!("Columns not in line: {:?}", &range))
+        let mut s = String::with_capacity(256);
+        source
+            .read_to_string(&mut s)
+            .expect("Must read successfully");
+        let cursor = LineColumn { line: 1, column: 0 };
+        let extraction = s
+            .chars()
+            .enumerate()
+            .scan(cursor, |cursor, (idx, c)| {
+                let x = (idx, c, cursor.clone());
+                match c {
+                    '\n' => {
+                        cursor.line += 1;
+                        cursor.column = 0;
+                    }
+                    _ => cursor.column += 1,
+                }
+                Some(x)
+            })
+            .filter_map(|(idx, c, cursor)| {
+                if cursor.line < span.start.line {
+                    return None;
+                }
+                if cursor.line > span.end.line {
+                    return None;
+                }
+                // bounding lines
+                if cursor.line == span.start.line && cursor.column < span.start.column {
+                    return None;
+                }
+                if cursor.line == span.end.line && cursor.column > span.end.column {
+                    return None;
+                }
+                Some(c)
+            })
+            .collect::<String>();
+        // log::trace!("Loading {:?} from line >{}<", &range, &line);
+        Ok(extraction)
     }
 
     #[test]

src/checker/dummy.rs

@@ -44,7 +44,7 @@ impl Checker for DummyChecker {
                             chunk,
                             description: None,
                         };
-                        acc.add(origin.clone(), dbg!(suggestion));
+                        acc.add(origin.clone(), suggestion);
                     }
                 }
                 Ok(acc)

src/checker/hunspell.rs

@@ -12,7 +12,7 @@ use log::{debug, trace};
 
 use hunspell_rs::Hunspell;
 
-use anyhow::{anyhow, Result};
+use anyhow::{anyhow, bail, Result};
 
 pub struct HunspellChecker;
 
@@ -89,19 +89,14 @@ impl Checker for HunspellChecker {
         for extra_dic in config.extra_dictonaries().iter() {
             trace!("Adding extra hunspell dictionary {}", extra_dic.display());
             if !extra_dic.is_file() {
-                return Err(anyhow!(
-                    "Extra dictionary {} is not a file",
-                    extra_dic.display()
-                ));
+                bail!("Extra dictionary {} is not a file", extra_dic.display())
             }
             if let Some(extra_dic) = extra_dic.to_str() {
                 if !hunspell.add_dictionary(extra_dic) {
-                    return Err(anyhow!("Failed to add additional dict to hunspell"));
+                    bail!("Failed to add additional dict to hunspell")
                 }
             } else {
-                return Err(anyhow!(
-                    "Failed to convert one of the extra dictionaries to a str"
-                ));
+                bail!("Failed to convert one of the extra dictionaries to a str")
             }
         }
 

src/config.rs

@@ -6,7 +6,7 @@
 //! location by default. Default. Default default default.
 
 use crate::suggestion::Detector;
-use anyhow::{anyhow, Error, Result};
+use anyhow::{anyhow, bail, Error, Result};
 use log::trace;
 use serde::{Deserialize, Serialize};
 use std::fs::File;
@@ -133,9 +133,7 @@ impl Config {
                     .join("config.toml"),
             )
         } else {
-            Err(anyhow!(
-                "No idea where your config directory is located. XDG compliance would be nice."
-            ))
+            bail!("No idea where your config directory is located. XDG compliance would be nice.")
         }
     }
 
@@ -185,9 +183,7 @@ impl Config {
         {
             Ok(base.config_dir().join("config.toml"))
         } else {
-            Err(anyhow!(
-                "No idea where your config directory is located. `$HOME` must be set."
-            ))
+            bail!("No idea where your config directory is located. `$HOME` must be set.")
         }
     }