PR: Improve cells support in the Editor

spyder/plugins/editor/panels/codefolding.py

@@ -34,6 +34,8 @@
 from spyder.api.panel import Panel
 from spyder.plugins.editor.utils.editor import (TextHelper, DelayJobRunner,
                                                 drift_color)
+from spyder.plugins.outlineexplorer.api import (OutlineExplorerData as OED,
+                                                is_cell_header)
 from spyder.utils.icon_manager import ima
 from spyder.utils.palette import QStylePalette
 
@@ -239,6 +241,14 @@ def paintEvent(self, event):
         # on the folding panel.
         super(FoldingPanel, self).paintEvent(event)
         painter = QPainter(self)
+        cell_line_color = QColor(Qt.darkGray)
+        pen = painter.pen()
+        pen.setStyle(Qt.SolidLine)
+        pen.setBrush(cell_line_color)
+        painter.setPen(pen)
+        for top_position, line_number, block in self.editor.visible_blocks:
+            if is_cell_header(block):
+                painter.drawLine(0, top_position, self.width(), top_position)
 
         if not self._display_folding and not self._key_pressed:
             if any(self.folding_status.values()):
@@ -247,13 +257,20 @@ def paintEvent(self, event):
                     self._draw_collapsed_indicator(
                         line_number, top_position, block,
                         painter, mouse_hover=True)
+                    if is_cell_header(block):
+                        painter.drawLine(0, top_position, self.width(),
+                                         top_position)
             return
+
         # Draw background over the selected non collapsed fold region
         if self._mouse_over_line is not None:
             block = self.editor.document().findBlockByNumber(
                 self._mouse_over_line)
             try:
                 self._draw_fold_region_background(block, painter)
+                if is_cell_header(block):
+                    painter.drawLine(0, top_position, self.width(),
+                                     top_position)
             except (ValueError, KeyError):
                 # Catching the KeyError above is necessary to avoid
                 # issue spyder-ide/spyder#10918.
@@ -263,6 +280,8 @@ def paintEvent(self, event):
                 pass
         # Draw fold triggers
         for top_position, line_number, block in self.editor.visible_blocks:
+            if is_cell_header(block):
+                painter.drawLine(0, top_position, self.width(), top_position)
             self._draw_collapsed_indicator(
                 line_number, top_position, block, painter, mouse_hover=False)
 

spyder/plugins/editor/panels/linenumber.py

@@ -20,6 +20,8 @@
 from spyder.utils.icon_manager import ima
 from spyder.api.panel import Panel
 from spyder.plugins.completion.api import DiagnosticSeverity
+from spyder.plugins.outlineexplorer.api import (OutlineExplorerData as OED,
+                                                is_cell_header)
 
 
 class LineNumberArea(Panel):
@@ -69,7 +71,7 @@ def paintEvent(self, event):
 
         Painting line number area
         """
-        painter = QPainter(self)
+        painter = QPainter(self)        
         painter.fillRect(event.rect(), self.editor.sideareas_color)
         font_height = self.editor.fontMetrics().height()
 
@@ -98,6 +100,14 @@ def draw_pixmap(xleft, ytop, pixmap):
         for top, line_number, block in self.editor.visible_blocks:
             data = block.userData()
             if self._markers_margin and data:
+                if is_cell_header(block):
+                    cell_line_color = QColor(Qt.darkGray)
+                    pen = painter.pen()
+                    pen.setStyle(Qt.SolidLine)
+                    pen.setBrush(cell_line_color)
+                    painter.setPen(pen)
+                    painter.drawLine(0, top, self.width(), top)
+
                 if data.code_analysis:
                     errors = 0
                     warnings = 0

spyder/plugins/editor/plugin.py

@@ -644,12 +644,12 @@ def get_plugin_actions(self):
 
         re_run_action = create_action(self, _("Re-run &last script"),
                                       icon=ima.icon('run_again'),
-                            tip=_("Run again last file"),
-                            triggered=self.re_run_file)
+                                      tip=_("Run again last file"),
+                                      triggered=self.re_run_file)
         self.register_shortcut(re_run_action, context="_",
                                name="Re-run last script",
                                add_shortcut_to_tip=True)
-
+        
         run_selected_action = create_action(self, _("Run &selection or "
                                                     "current line"),
                                             icon=ima.icon('run_selection'),
@@ -774,6 +774,14 @@ def get_plugin_actions(self):
                                add_shortcut_to_tip=True)
 
         # --- Edit Toolbar ---
+        create_new_cell = create_action(self, _("Create new Cell at "
+                                                "current line"),
+                                        icon=ima.icon('run_selection'),
+                                        tip=_("Create new Cell"),
+                                        triggered=self.create_cell,
+                                        context=Qt.WidgetShortcut)
+        self.register_shortcut(create_new_cell, context="Editor",
+                               name="create_new_cell")
         self.toggle_comment_action = create_action(self,
                 _("Comment")+"/"+_("Uncomment"), icon=ima.icon('comment'),
                 tip=_("Comment current line or selection"),
@@ -1074,7 +1082,8 @@ def get_plugin_actions(self):
         self.main.run_menu_actions = (
             run_menu_actions + self.main.run_menu_actions)
         run_toolbar_actions = [run_action, run_cell_action,
-                               run_cell_advance_action, run_selected_action]
+                               run_cell_advance_action, run_selected_action,
+                               create_new_cell]
         self.main.run_toolbar_actions += run_toolbar_actions
 
         # ---- Source menu/toolbar construction ----
@@ -2895,6 +2904,12 @@ def run_selection(self, prefix=None):
         editorstack = self.get_current_editorstack()
         editorstack.run_selection(prefix)
 
+    @Slot()
+    def create_cell(self, prefix=None):
+        editor = self.get_current_editor()
+        if editor is not None:
+            editor.create_new_cell()
+
     @Slot()
     def run_to_line(self):
         """Run all lines from beginning up to current line"""

spyder/plugins/editor/widgets/codeeditor.py

@@ -705,6 +705,7 @@ def create_shortcuts(self):
             ('editor', 'go to definition', self.go_to_definition_from_cursor),
             ('editor', 'toggle comment', self.toggle_comment),
             ('editor', 'blockcomment', self.blockcomment),
+            ('editor', 'create_new_cell', self.create_new_cell),
             ('editor', 'unblockcomment', self.unblockcomment),
             ('editor', 'transform to uppercase', self.transform_to_uppercase),
             ('editor', 'transform to lowercase', self.transform_to_lowercase),
@@ -4212,6 +4213,28 @@ def __in_block_comment(cursor):
         cursor3.endEditBlock()
         return True
 
+    def create_new_cell(self):
+        firstline = '#%% Start Cell \r\n'
+        endline = '\r\n'
+        cursor = self.textCursor()
+        if self.has_selected_text():
+            self.extend_selection_to_complete_lines()
+            start_pos, end_pos = cursor.selectionStart(), cursor.selectionEnd()
+            endline = '\r\n#%% End Cell'
+        else:
+            start_pos = end_pos = cursor.position()
+        cursor.beginEditBlock()
+        cursor.setPosition(start_pos)
+        cursor.movePosition(QTextCursor.StartOfBlock)
+        cursor.setPosition(end_pos)
+        cursor.movePosition(QTextCursor.EndOfBlock)
+        cursor.insertText(endline)
+        cursor.setPosition(start_pos)
+        cursor.movePosition(QTextCursor.StartOfBlock)
+        cursor.insertText(firstline)
+        cursor.endEditBlock()
+
+        return None
     # ---- Kill ring handlers
     # Taken from Jupyter's QtConsole
     # Copyright (c) 2001-2015, IPython Development Team
@@ -5540,7 +5563,7 @@ def _draw_editor_cell_divider(self):
 
             for top, line_number, block in self.visible_blocks:
                 if is_cell_header(block):
-                    painter.drawLine(4, top, self.width(), top)
+                    painter.drawLine(0, top, self.width(), top)
 
     @property
     def visible_blocks(self):