Merge from 5.x: PR #20971

Fixes #20964

spyder/plugins/findinfiles/widgets/results_browser.py

@@ -79,9 +79,17 @@ def __init__(self, parent, path, filename, sorting, text_color):
 
         # Get relative dirname according to the path we're searching in.
         dirname = osp.dirname(filename)
-        rel_dirname = dirname.split(path)[1]
-        if rel_dirname.startswith(osp.sep):
-            rel_dirname = rel_dirname[1:]
+
+        # Catch errors when it's not possible to get the relative directory
+        # name. This happens when the user is searching in a single file.
+        # Fixes spyder-ide/spyder#17443 and spyder-ide/spyder#20964
+        try:
+            rel_dirname = dirname.split(path)[1]
+            if rel_dirname.startswith(osp.sep):
+                rel_dirname = rel_dirname[1:]
+        except IndexError:
+            rel_dirname = dirname
+
         self.rel_dirname = rel_dirname
 
         title = (
@@ -257,18 +265,13 @@ def clear_title(self, search_text):
     def append_file_result(self, filename):
         """Real-time update of file items."""
         if len(self.data) < self.max_results:
-            # Catch any error while creating file items.
-            # Fixes spyder-ide/spyder#17443
-            try:
-                item = FileMatchItem(
-                    self,
-                    self.path,
-                    filename,
-                    self.sorting,
-                    self.text_color
-                )
-            except Exception:
-                return
+            item = FileMatchItem(
+                self,
+                self.path,
+                filename,
+                self.sorting,
+                self.text_color
+            )
 
             self.files[filename] = item
 

spyder/plugins/findinfiles/widgets/search_thread.py

@@ -263,11 +263,14 @@ def find_string_in_file(self, fname):
                             found = line.find(text, found + 1)
                             if found > -1:
                                 break
-
         except IOError as xxx_todo_changeme:
             (_errno, _strerror) = xxx_todo_changeme.args
             self.error_flag = _("permission denied errors were encountered")
 
+        # Process any pending results
+        if self.is_file and self.partial_results:
+            self.process_results()
+
         self.completed = True
 
     def process_results(self):

spyder/plugins/findinfiles/widgets/tests/test_widgets.py

@@ -649,5 +649,25 @@ def test_max_results(findinfiles, qtbot):
     findinfiles.set_max_results(1000)
 
 
+@flaky(max_runs=5)
+def test_find_in_single_file(findinfiles, qtbot):
+    """
+    Test that find in files works for a single file.
+
+    This a regression test for issues spyder-ide/spyder#17443 and
+    spyder-ide/spyder#20964.
+    """
+    findinfiles.set_search_text("spam")
+    findinfiles.set_file_path(osp.join(LOCATION, "data", 'spam.txt'))
+    findinfiles.path_selection_combo.setCurrentIndex(FILE_PATH)
+
+    with qtbot.waitSignal(findinfiles.sig_finished):
+        findinfiles.find()
+
+    matches = process_search_results(findinfiles.result_browser.data)
+    assert list(matches.keys()) == ['spam.txt']
+    assert expected_results()['spam.txt'] == matches['spam.txt']
+
+
 if __name__ == "__main__":
     pytest.main(['-x', osp.basename(__file__), '-v', '-rw'])