feat: try to reslove ^ match issues

上级 ee7ec9a0
...@@ -749,8 +749,8 @@ hellomake: $(OBJ) ...@@ -749,8 +749,8 @@ hellomake: $(OBJ)
#[test] #[test]
fn should_resolve_make_file_error_issues() { fn should_resolve_make_file_error_issues() {
let code = "%.o: %.c $(DEPS)"; let _code = "%.o: %.c $(DEPS)";
let mut grammar = to_grammar_for_test("scie-grammar/test-cases/first-mate/fixtures/makefile.json"); let mut grammar = to_grammar_for_test("test-cases/first-mate/fixtures/makefile.json");
let result = grammar.tokenize_line(String::from("%.o: %.c $(DEPS)"), &mut None); let result = grammar.tokenize_line(String::from("%.o: %.c $(DEPS)"), &mut None);
let tokens = result.tokens.clone(); let tokens = result.tokens.clone();
assert_eq!(7, tokens.len()); assert_eq!(7, tokens.len());
......
...@@ -9,7 +9,6 @@ pub struct CompiledRule { ...@@ -9,7 +9,6 @@ pub struct CompiledRule {
impl CompiledRule { impl CompiledRule {
pub fn new(debug_reg_exps: Vec<String>, rules: Vec<i32>) -> Self { pub fn new(debug_reg_exps: Vec<String>, rules: Vec<i32>) -> Self {
// println!("{:?}", rules);
let scanner = Scanner::new(debug_reg_exps.clone()); let scanner = Scanner::new(debug_reg_exps.clone());
CompiledRule { CompiledRule {
debug_reg_exps, debug_reg_exps,
......
...@@ -38,10 +38,6 @@ impl Scanner { ...@@ -38,10 +38,6 @@ impl Scanner {
self.index = 0; self.index = 0;
return None; return None;
} }
//
// if origin_str.clone().len() <= start_position.clone() as usize {
// return None;
// }
let mut all_results: Vec<IOnigMatch> = vec![]; let mut all_results: Vec<IOnigMatch> = vec![];
for (index, pattern) in self.patterns.iter().enumerate() { for (index, pattern) in self.patterns.iter().enumerate() {
...@@ -99,6 +95,7 @@ impl Scanner { ...@@ -99,6 +95,7 @@ impl Scanner {
} }
} }
println!("{:?}", all_results.clone());
if all_results.len() > 0 { if all_results.len() > 0 {
let mut best_match = all_results[0].clone(); let mut best_match = all_results[0].clone();
for i in 1..all_results.len().clone() { for i in 1..all_results.len().clone() {
...@@ -290,7 +287,7 @@ mod tests { ...@@ -290,7 +287,7 @@ mod tests {
); );
let result2 = scanner.find_next_match_sync(String::from("X💻X"), 10000); let result2 = scanner.find_next_match_sync(String::from("X💻X"), 10000);
assert_eq!(format!("{:?}", result2), "None"); assert!(result2.is_none());
} }
#[test] #[test]
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册