Merge from 5.x: PR #21085

spyder-ide · Jun 29, 2023 · 63f448f · 63f448f
2 parents 3b23899 + 70f3065
commit 63f448f
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 6 deletions.
diff --git a/.github/workflows/test-linux.yml b/.github/workflows/test-linux.yml
@@ -58,7 +58,7 @@ jobs:
         INSTALL_TYPE: ['pip', 'conda']
         PYTHON_VERSION: ['3.8', '3.10']
         TEST_TYPE: ['fast', 'slow']
-    timeout-minutes: 120
+    timeout-minutes: 90
     steps:
       - name: Checkout Pull Requests
         if: github.event_name == 'pull_request'

diff --git a/.github/workflows/test-mac.yml b/.github/workflows/test-mac.yml
@@ -57,7 +57,7 @@ jobs:
         INSTALL_TYPE: ['conda']
         PYTHON_VERSION: ['3.9']
         TEST_TYPE: ['fast', 'slow']
-    timeout-minutes: 120
+    timeout-minutes: 90
     steps:
       - name: Checkout Pull Requests
         if: github.event_name == 'pull_request'

diff --git a/.github/workflows/test-win.yml b/.github/workflows/test-win.yml
@@ -57,7 +57,7 @@ jobs:
         INSTALL_TYPE: ['pip', 'conda']
         PYTHON_VERSION: ['3.9']
         TEST_TYPE: ['fast', 'slow']
-    timeout-minutes: 120
+    timeout-minutes: 90
     steps:
       - name: Checkout Pull Requests
         if: github.event_name == 'pull_request'

diff --git a/spyder/plugins/editor/widgets/editor.py b/spyder/plugins/editor/widgets/editor.py
@@ -2029,7 +2029,8 @@ def current_changed(self, index):
         # See spyder-ide/spyder#9688.
         self.find_widget.set_editor(editor, refresh=False)
 
-        # Update total number of matches when switching files.
+        # Update highlighted matches and its total number when switching files.
+        self.find_widget.highlight_matches()
         self.find_widget.update_matches()
 
         if editor is not None:

diff --git a/spyder/plugins/editor/widgets/tests/test_editor.py b/spyder/plugins/editor/widgets/tests/test_editor.py
@@ -681,13 +681,18 @@ def test_update_matches_in_find_replace(editor_find_replace_bot, qtbot):
     # Open a new file and only write "spam" on it
     editor_stack.new('foo.py', 'utf-8', 'spam')
 
-    # Focus new file and check the number of matches was updated
+    # Focus new file and check the number of matches and highlights was updated
     editor_stack.set_stack_index(1)
+    codeeditor = editor_stack.get_current_editor()
     assert finder.number_matches_text.text() == '1 matches'
+    assert len(codeeditor.decorations._decorations['find']) == 1
     qtbot.wait(500)
 
-    # Focus initial file and check the number of matches was updated
+    # Focus initial file and check the number of matches and highlights was
+    # updated
     editor_stack.set_stack_index(0)
+    codeeditor = editor_stack.get_current_editor()
+    assert len(codeeditor.decorations._decorations['find']) == 3
     qtbot.wait(500)
     assert finder.number_matches_text.text() == '3 matches'