From 3912207145be7383525d0cdbd4df7a048942f214 Mon Sep 17 00:00:00 2001
From: Phodal Huang <h@phodal.com>
Date: Wed, 9 Sep 2020 21:38:25 +0800
Subject: [PATCH] refactor: fix first id match error issue

---
 scie-scanner/src/scanner/scanner.rs | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/scie-scanner/src/scanner/scanner.rs b/scie-scanner/src/scanner/scanner.rs
index 4f365f2..b14d1e5 100644
--- a/scie-scanner/src/scanner/scanner.rs
+++ b/scie-scanner/src/scanner/scanner.rs
@@ -97,12 +97,16 @@ impl Scanner {
 
         if all_results.len() > 0 {
             let mut best_match = all_results[0].clone();
-            for x in all_results {
-                // todo: maybe have multiple captures
-                if x.capture_indices[0].start <= best_match.capture_indices[0].start {
-                    best_match = x;
+            if all_results.len() > 1 {
+                best_match = all_results[1].clone();
+                for i in 1..all_results.len().clone() {
+                    let current = all_results[i].capture_indices[0].clone();
+                    if current.start <= best_match.capture_indices[0].start {
+                        best_match = all_results[i].clone();
+                    }
                 }
             }
+
             Some(best_match.clone())
         } else {
             None
-- 
GitLab