Scroll current search hit into view

lib/terminal/terminal.dart

@@ -739,14 +739,15 @@ class Terminal with Observable implements TerminalUiInteraction {
   TerminalSearchResult get userSearchResult => _userSearchTask.searchResult;
 
   @override
-  int get numberOfSearchHits => userSearchResult.allHits.length;
+  int get numberOfSearchHits => _userSearchTask.numberOfSearchHits;
 
   @override
-  int get currentSearchHit => userSearchResult.currentSearchHit;
+  int get currentSearchHit => _userSearchTask.currentSearchHit;
 
   @override
   void set currentSearchHit(int currentSearchHit) {
-    userSearchResult.currentSearchHit = currentSearchHit;
+    _userSearchTask.currentSearchHit = currentSearchHit;
+    _scrollCurrentHitIntoView();
     refresh();
   }
 
@@ -756,6 +757,7 @@ class Terminal with Observable implements TerminalUiInteraction {
   @override
   void set userSearchOptions(TerminalSearchOptions options) {
     _userSearchTask.options = options;
+    _scrollCurrentHitIntoView();
     refresh();
   }
 
@@ -765,6 +767,7 @@ class Terminal with Observable implements TerminalUiInteraction {
   @override
   void set userSearchPattern(String? newValue) {
     _userSearchTask.pattern = newValue;
+    _scrollCurrentHitIntoView();
     refresh();
   }
 
@@ -774,5 +777,20 @@ class Terminal with Observable implements TerminalUiInteraction {
   @override
   void set isUserSearchActive(bool isUserSearchActive) {
     _userSearchTask.isActive = isUserSearchActive;
+    _scrollCurrentHitIntoView();
+    refresh();
+  }
+
+  void _scrollCurrentHitIntoView() {
+    if (!_userSearchTask.isActive) {
+      return;
+    }
+    final currentHit = _userSearchTask.currentSearchHitObject;
+
+    if (currentHit != null) {
+      final desiredScrollOffsetFromTop =
+          currentHit.startLineIndex + (terminalHeight / 2).floor();
+      setScrollOffsetFromBottom(buffer.height - desiredScrollOffsetFromTop);
+    }
   }
 }

lib/terminal/terminal_search.dart

@@ -25,7 +25,7 @@ class TerminalSearchResult {
       }
     }
     if (_allHits.length > 0) {
-      _currentSearchHit = 1;
+      _currentSearchHit = _allHits.length;
     } else {
       _currentSearchHit = 0;
     }
@@ -192,9 +192,24 @@ class TerminalSearchTask {
     _invalidate();
   }
 
+  TerminalSearchHit? get currentSearchHitObject {
+    if (searchResult.allHits.length >= searchResult.currentSearchHit &&
+        searchResult.currentSearchHit > 0) {
+      return searchResult.allHits[searchResult.currentSearchHit - 1];
+    }
+    return null;
+  }
+
+  int get numberOfSearchHits => searchResult.allHits.length;
+  int get currentSearchHit => searchResult.currentSearchHit;
+  void set currentSearchHit(int currentSearchHit) {
+    searchResult.currentSearchHit = currentSearchHit;
+  }
+
   void _invalidate() {
     _isPatternDirty = true;
     _searchRegexp = null;
+    _lastSearchResult = null;
   }
 
   TerminalSearchResult get searchResult {