Passing all zsh-syntax-highlighting tests, a few more bugs to fix yet

Author: Aaron1011

Cargo.toml

@@ -5,6 +5,7 @@ authors = ["Aaron Hill <[email protected]>"]
 
 [dependencies]
 lazy_static = "0.2"
+clippy = {version = "*", optional = true}
 
 [build-dependencies]
 bindgen = "0.26.3"

src/brackets.rs

@@ -4,10 +4,10 @@ use linkroot;
 use std::os::raw::{c_char, c_void};
 use {getshfunc, doshfunc, newlinklist, insertlinknode, linknode};
 
-pub fn brackets_paint(buf: &str, widget: &str, cursor: usize) {
-    let mut style: String;
+pub fn brackets_paint(bracket_color_size: usize, buf: &str, cursor: usize, widget: &str) {
+    let mut style: String = "".to_owned();
     let mut level: usize = 0;
-    let bracket_color_size: usize = 5; // TODO
+    //let bracket_color_size: usize = 5; // TODO
     let pos;
 
     let mut level_pos: HashMap<usize, usize> = HashMap::new();
@@ -25,12 +25,9 @@ pub fn brackets_paint(buf: &str, widget: &str, cursor: usize) {
                 last_of_level.insert(level, i);
             },
             ')' | ']' | '}' => {
-                let matching_pos = match last_of_level.get(&level) {
-                    Some(val) => *val,
-                    None => continue
-                };
+                let matching_pos = *last_of_level.get(&level).unwrap_or(&0);
                 level_pos.insert(i, level);
-                level -= 1;
+                level = level.saturating_sub(1);
 
                 if brackets_match(*chars.get(matching_pos).unwrap_or(&' '), chars[i]) {
                     matching.insert(matching_pos, i);
@@ -42,6 +39,7 @@ pub fn brackets_paint(buf: &str, widget: &str, cursor: usize) {
                     if val.1 != chr {
                         continue;
                     }
+                    break;
                 }
                 //it = Box::new(it.skip(chars[(pos+1)..].iter().position(|c| c == chr).unwrap_or(chars.len() + 1)));
             },
@@ -51,7 +49,9 @@ pub fn brackets_paint(buf: &str, widget: &str, cursor: usize) {
 
     for pos in level_pos.keys() {
        if matching.contains_key(pos) {
-           style = format!("bracket-level-{}", ((level_pos[pos] - 1) % bracket_color_size) + 1);
+           if bracket_color_size != 0 {
+               style = format!("bracket-level-{}", (level_pos[pos] - 1) % bracket_color_size + 1);
+           }
        } else {
            style = "bracket-error".to_owned();
        }
@@ -60,10 +60,10 @@ pub fn brackets_paint(buf: &str, widget: &str, cursor: usize) {
     }
 
     if widget != "zle-line-finish" {
-        pos = cursor + 1;
+        pos = cursor; // cursor is already zero-based
         if level_pos.get(&pos).is_some() && matching.get(&pos).is_some() {
             let other_pos = matching[&pos];
-            do_highlight(other_pos, other_pos + 1, "standout");
+            do_highlight(other_pos, other_pos + 1, "cursor-matchingbracket");
         }
     }
 

src/lib.rs

@@ -1,5 +1,8 @@
 #![feature(const_fn)]
 
+#![cfg_attr(feature="clippy", feature(plugin))]
+#![cfg_attr(feature="clippy", plugin(clippy))]
+
 #![allow(non_upper_case_globals)]
 #![allow(non_camel_case_types)]
 #![allow(non_snake_case)]
@@ -39,8 +42,8 @@ pub static mut bintab: BinWrapper<'static> = BinWrapper(&mut [builtin {
         flags: 0
     },
     handlerfunc: Some(bin_fastbrackets),
-    minargs: 2,
-    maxargs: 3,
+    minargs: 3,
+    maxargs: 4,
     funcid: 0,
     optstr: null_mut(),
     defopts: null_mut()
@@ -121,18 +124,24 @@ pub extern fn bin_fastbrackets(name: *mut c_char, mut raw_args: *mut *mut c_char
         }
     }
 
-    let cursor = if args.len() == 2 {
-        0
-    } else {
-        match args[2].parse::<usize>() {
-            Ok(s) => s,
-            Err(e) => {
-                unsafe { zwarnnam(name, CString::new(format!("Invalid cursor argument: {:?}", e)).unwrap().into_raw()) } ;
-                return 1
-            }
+    let cursor = match args[2].parse::<usize>() {
+        Ok(s) => s,
+        Err(e) => {
+            unsafe { zwarnnam(name, CString::new(format!("Invalid cursor argument: {:?} {:?}", args[2], e)).unwrap().into_raw()) } ;
+            return 1
+        }
+    };
+
+    let bracket_color_size = match args[0].parse::<usize>() {
+        Ok(s) => s,
+        Err(e) => {
+            unsafe { zwarnnam(name, CString::new(format!("Bad bracket color size (should be impossible): {:?} {:?}", args[0], e)).unwrap().into_raw()) } ;
+            return 1
+
         }
     };
-    brackets_paint(&args[0], &args[1], cursor);
+
+    brackets_paint(bracket_color_size, &args[1], cursor, &args.get(3).unwrap_or(&"".to_owned()));
 
     0
 }
@@ -144,7 +153,12 @@ mod tests {
 
     #[test]
     fn simple_bracket() {
-        brackets_paint("[]", "lol", 0);
+        brackets_paint(8, "[]", "lol", 0);
+    }
+
+    #[test]
+    fn cursor_bracket() {
+        brackets_paint(3, ": ((( )))", "no", 2);
     }
 
     /*#[test]