Clear search string after end of the search

contour-terminal · Dec 17, 2024 · 4442161 · 4442161
1 parent a494b24
commit 4442161
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 0 deletions.
diff --git a/metainfo.xml b/metainfo.xml
@@ -107,6 +107,7 @@
     <release version="0.5.2" urgency="medium" type="development">
       <description>
         <ul>
+          <li>Fixes search editor preservation bug on exit from search mode</li>
           <li>Expose current profile's name through env var `CONTOUR_PROFILE` (#1637)</li>
           <li>Add terminal tabs (#90)</li>
           <li>Add `SaveScreenshot` and `CopyScreenshot` action (#210)</li>

diff --git a/src/vtbackend/ViInputHandler.cpp b/src/vtbackend/ViInputHandler.cpp
@@ -325,6 +325,10 @@ void ViInputHandler::setMode(ViMode theMode)
     clearPendingInput();
 
     _executor->modeChanged(theMode);
+
+    // clear search term when switching to insert mode
+    if (_viMode == ViMode::Insert)
+        clearSearch();
 }
 
 Handled ViInputHandler::sendKeyPressEvent(Key key, Modifiers modifiers, KeyboardEventType eventType)
@@ -449,12 +453,14 @@ Handled ViInputHandler::handleSearchEditor(char32_t ch, Modifiers modifiers)
                 setMode(ViMode::Insert);
             _searchEditMode = SearchEditMode::Disabled;
             _executor->searchCancel();
+            _executor->updateSearchTerm(_searchTerm);
             break;
         case '\x0D'_key:
             if (_settings.fromSearchIntoInsertMode && _searchEditMode == SearchEditMode::ExternallyEnabled)
                 setMode(ViMode::Insert);
             _searchEditMode = SearchEditMode::Disabled;
             _executor->searchDone();
+            _executor->updateSearchTerm(_searchTerm);
             break;
         case '\x08'_key:
         case '\x7F'_key:
@@ -575,4 +581,10 @@ void ViInputHandler::setSearchModeSwitch(bool enabled)
     _settings.fromSearchIntoInsertMode = enabled;
 }
 
+void ViInputHandler::clearSearch()
+{
+    _searchTerm.clear();
+    _executor->updateSearchTerm(_searchTerm);
+}
+
 } // namespace vtbackend
diff --git a/src/vtbackend/ViInputHandler.h b/src/vtbackend/ViInputHandler.h
@@ -219,6 +219,7 @@ class ViInputHandler: public InputHandler
     void startSearchExternally();
 
     void setSearchModeSwitch(bool enabled);
+    void clearSearch();
 
   private:
     enum class ModeSelect : uint8_t