From 876f0b30fc031d69d40d09f2eee28833da08a673 Mon Sep 17 00:00:00 2001
From: David <David@MacBook-Pro-de-David.local>
Date: Mon, 2 Sep 2019 08:02:49 -0500
Subject: [PATCH 1/3] Add matches search into code mirror

---
 client/utils/codemirror-search.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/client/utils/codemirror-search.js b/client/utils/codemirror-search.js
index 9c8b69e1..b680cf69 100644
--- a/client/utils/codemirror-search.js
+++ b/client/utils/codemirror-search.js
@@ -73,6 +73,8 @@ export default function(CodeMirror) {
       CodeMirror.on(searchField, "keyup", function (e) {
         if (e.keyCode !== 13 && searchField.value.length > 1) { // not enter and more than 1 character to search
           startSearch(cm, getSearchState(cm), searchField.value);
+        } else {
+          cm.display.wrapper.querySelector('.CodeMirror-search-results').innerText = '';
         }
       });
 
@@ -260,6 +262,7 @@ export default function(CodeMirror) {
         </button>
       </div>
       <div class="CodeMirror-search-nav">
+        <button class="CodeMirror-search-results"></button>
         <button
           title="Previous"
           aria-label="Previous"
@@ -292,6 +295,10 @@ export default function(CodeMirror) {
       if (state.annotate) { state.annotate.clear(); state.annotate = null; }
       state.annotate = cm.showMatchesOnScrollbar(state.query,  state.caseInsensitive);
     }
+    var num_match = cm.state.search.annotate.matches.length;
+    var text_match = 
+      'Results: ' + num_match;
+    cm.display.wrapper.querySelector('.CodeMirror-search-results').innerText = text_match;
   }
 
   function doSearch(cm, rev, persistent, immediate, ignoreQuery) {

From 22f958e50a83aa59da76b8fe89aca2e74126cc3f Mon Sep 17 00:00:00 2001
From: davidbmx <dmquito@hotmail.com>
Date: Tue, 10 Sep 2019 12:00:27 -0500
Subject: [PATCH 2/3] Add matches search into code mirror

---
 client/utils/codemirror-search.js | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/client/utils/codemirror-search.js b/client/utils/codemirror-search.js
index b680cf69..4a894320 100644
--- a/client/utils/codemirror-search.js
+++ b/client/utils/codemirror-search.js
@@ -73,7 +73,7 @@ export default function(CodeMirror) {
       CodeMirror.on(searchField, "keyup", function (e) {
         if (e.keyCode !== 13 && searchField.value.length > 1) { // not enter and more than 1 character to search
           startSearch(cm, getSearchState(cm), searchField.value);
-        } else {
+        } else if (searchField.value.length <= 1) {
           cm.display.wrapper.querySelector('.CodeMirror-search-results').innerText = '';
         }
       });
@@ -295,10 +295,9 @@ export default function(CodeMirror) {
       if (state.annotate) { state.annotate.clear(); state.annotate = null; }
       state.annotate = cm.showMatchesOnScrollbar(state.query,  state.caseInsensitive);
     }
-    var num_match = cm.state.search.annotate.matches.length;
-    var text_match = 
-      'Results: ' + num_match;
-    cm.display.wrapper.querySelector('.CodeMirror-search-results').innerText = text_match;
+    if (originalQuery) {
+      return findNext(cm, false);
+    }
   }
 
   function doSearch(cm, rev, persistent, immediate, ignoreQuery) {
@@ -362,6 +361,11 @@ export default function(CodeMirror) {
     cm.setSelection(cursor.from(), cursor.to());
     cm.scrollIntoView({from: cursor.from(), to: cursor.to()}, 60);
     state.posFrom = cursor.from(); state.posTo = cursor.to();
+    var num_match = cm.state.search.annotate.matches.length;
+    var next = cm.state.search.annotate.matches
+      .findIndex(s => s.from.ch === cursor.from().ch && s.from.line === cursor.from().line) + 1;
+    var text_match = next + '/' + num_match;
+    cm.display.wrapper.querySelector('.CodeMirror-search-results').innerText = text_match;
     if (callback) callback(cursor.from(), cursor.to())
   });}
 

From 6030b355ff6a8ac152bddf7e61c35c70c85435d7 Mon Sep 17 00:00:00 2001
From: davidbmx <dmquito@hotmail.com>
Date: Tue, 10 Sep 2019 12:38:12 -0500
Subject: [PATCH 3/3] Remove num results when don't match find

---
 client/utils/codemirror-search.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/client/utils/codemirror-search.js b/client/utils/codemirror-search.js
index 4a894320..6e904656 100644
--- a/client/utils/codemirror-search.js
+++ b/client/utils/codemirror-search.js
@@ -356,7 +356,10 @@ export default function(CodeMirror) {
     var cursor = getSearchCursor(cm, state.query, rev ? state.posFrom : state.posTo);
     if (!cursor.find(rev)) {
       cursor = getSearchCursor(cm, state.query, rev ? CodeMirror.Pos(cm.lastLine()) : CodeMirror.Pos(cm.firstLine(), 0));
-      if (!cursor.find(rev)) return;
+      if (!cursor.find(rev)) {
+        cm.display.wrapper.querySelector('.CodeMirror-search-results').innerText = '';
+        return;
+      }
     }
     cm.setSelection(cursor.from(), cursor.to());
     cm.scrollIntoView({from: cursor.from(), to: cursor.to()}, 60);