Widgets: Show select row button icon for selected rows in Collections…

…Editor

spyder/plugins/variableexplorer/widgets/collectionsdelegate.py

@@ -499,8 +499,11 @@ def paint(self, painter, option, index):
         if (
             # Do this only for the last column
             index.column() == 3
-            # Do this when the row is hovered.
-            and index.row() == self.parent().hovered_row
+            # Do this when the row is hovered or if it's selected
+            and (
+                index.row() == self.parent().hovered_row
+                or index.row() in self.parent().selected_rows()
+            )
         ):
             # Paint regular contents
             super().paint(painter, option, index)
@@ -553,8 +556,14 @@ def editorEvent(self, event, model, option, index):
 
             # Select/deselect row when clicking on the button
             if click_x > x and (y < click_y < (y + SELECT_ROW_BUTTON_SIZE)):
+                current_selected_rows = self.parent().selected_rows()
+
+                # Clear cache of selected rows because either a selection or
+                # deselection is going to change it.
+                self.parent().selected_rows.cache_clear()
+
                 row = index.row()
-                if row in self.parent().selected_rows():
+                if row in current_selected_rows:
                     # Deselect row if selected
                     index_left = index.sibling(row, 0)
                     index_right = index.sibling(row, 3)

spyder/plugins/variableexplorer/widgets/objectexplorer/toggle_column_mixin.py

@@ -9,6 +9,7 @@
 # -----------------------------------------------------------------------------
 
 # Standard library imports
+from functools import lru_cache
 import logging
 from typing import Any, Callable, Optional
 
@@ -190,6 +191,7 @@ def resize_columns_to_contents(self):
         """Resize all the columns to its contents."""
         self._horizontal_header().resizeSections(QHeaderView.ResizeToContents)
 
+    @lru_cache(maxsize=1)
     def selected_rows(self):
         """Dummy method to be compatible with BaseTableView."""
         return set()

spyder/widgets/collectionseditor.py

@@ -20,6 +20,7 @@
 
 # Standard library imports
 import datetime
+from functools import lru_cache
 import io
 import re
 import sys
@@ -1504,6 +1505,7 @@ def paste(self):
             QMessageBox.warning(self, _( "Empty clipboard"),
                                 _("Nothing to be imported from clipboard."))
 
+    @lru_cache(maxsize=1)
     def selected_rows(self):
         """Get the rows currently selected."""
         return {