arnekeller/tmux-thumbs
1
0
Fork 0
mirror of https://github.com/FliegendeWurst/tmux-thumbs.git synced 2024-11-09 16:00:35 +00:00
Code Issues Projects Releases Wiki Activity

Better parsing

Browse Source
This commit is contained in:
Ferran Basora 2019-03-03 17:35:25 +00:00
parent eef3eb0774
commit 50b5c328d7
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/state.rs
View File

@ -1,12 +1,13 @@
use std::collections::HashMap; use std::collections::HashMap;
use regex::Regex; use regex::Regex;
use std::fmt;
const PATTERNS: [(&'static str, &'static str); 11] = [ const PATTERNS: [(&'static str, &'static str); 11] = [
("bash", r"[[:cntrl:]]\[([0-9]{1,2};)?([0-9]{1,2})m"), ("bash", r"[[:cntrl:]]\[([0-9]{1,2};)?([0-9]{1,2})?m"),
("url", r"((https?://|git@|git://|ssh://|ftp://|file:///)[\w?=%/_.:,;~@!#$&()*+-]*)"), ("url", r"((https?://|git@|git://|ssh://|ftp://|file:///)[\w?=%/_.:,;~@!#$&()*+-]*)"),
("diff_a", r"--- a/([^ ]+)"), ("diff_a", r"--- a/([^ ]+)"),
("diff_b", r"\+\+\+ b/([^ ]+)"), ("diff_b", r"\+\+\+ b/([^ ]+)"),
("path", r"[^ ]+/[^ ]+"), ("path", r"[^ ]+/[^ [[:cntrl:]]]+"),
("color", r"#[0-9a-fA-F]{6}"), ("color", r"#[0-9a-fA-F]{6}"),
("uid", r"[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}"), ("uid", r"[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}"),
("sha", r"[0-9a-f]{7,40}"), ("sha", r"[0-9a-f]{7,40}"),
@ -23,6 +24,12 @@ pub struct Match<'a> {
pub hint: Option<String> pub hint: Option<String>
} }
impl<'a> fmt::Debug for Match<'a> {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
write!(f, "Match {{ x: {}, y: {}, text: {}, hint: <{}> }}", self.x, self.y, self.text, self.hint.clone().unwrap_or("<undefined>".to_string()))
}
}
impl<'a> PartialEq for Match<'a> { impl<'a> PartialEq for Match<'a> {
fn eq(&self, other: &Match) -> bool { fn eq(&self, other: &Match) -> bool {
self.x == other.x && self.y == other.y self.x == other.x && self.y == other.y