From f3f52e6920dba1fef5f27d5740ac0dcc3d8861d6 Mon Sep 17 00:00:00 2001
From: Logan Ramos <lramos15@gmail.com>
Date: Wed, 24 Jul 2019 15:30:09 -0700
Subject: [PATCH] Changed default Search Addon behavior

---
 addons/xterm-addon-search/src/SearchAddon.ts | 23 ++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/addons/xterm-addon-search/src/SearchAddon.ts b/addons/xterm-addon-search/src/SearchAddon.ts
index 054b97cd..bd962ee5 100644
--- a/addons/xterm-addon-search/src/SearchAddon.ts
+++ b/addons/xterm-addon-search/src/SearchAddon.ts
@@ -82,7 +82,7 @@ export class SearchAddon implements ITerminalAddon {
     // Search from startRow + 1 to end
     if (!result) {
 
-      for (let y = startRow; y < this._terminal.buffer.baseY + this._terminal.rows; y++) {
+      for (let y = startRow + 1; y < this._terminal.buffer.baseY + this._terminal.rows; y++) {
 
         // If the current line is wrapped line, increase index of column to ignore the previous scan
         // Otherwise, reset beginning column index to zero with set new unwrapped line index
@@ -92,6 +92,15 @@ export class SearchAddon implements ITerminalAddon {
         }
       }
     }
+    // If we hit the bottom and didn't search from the very top wrap back up
+    if (!result && startRow !== 0) {
+      for (let y = 0; y < startRow; y++) {
+        result = this._findInLine(term, y, 0, searchOptions);
+        if (result) {
+          break;
+        }
+      }
+    }
 
     // Set selection and scroll if a result was found
     return this._selectResult(result);
@@ -132,7 +141,17 @@ export class SearchAddon implements ITerminalAddon {
 
     // Search from startRow - 1 to top
     if (!result) {
-      for (let y = startRow; y >= 0; y--) {
+      startCol = this._terminal.cols;
+      for (let y = startRow - 1; y >= 0; y--) {
+        result = this._findInLine(term, y, startCol, searchOptions, isReverseSearch);
+        if (result) {
+          break;
+        }
+      }
+    }
+    // If we hit the top and didn't search from the very bottom wrap back down
+    if (!result && startRow !== (this._terminal.buffer.baseY + this._terminal.rows)) {
+      for (let y = (this._terminal.buffer.baseY + this._terminal.rows); y > startRow; y--) {
         result = this._findInLine(term, y, startCol, searchOptions, isReverseSearch);
         if (result) {
           break;