PR: Fix folding and make some performance improvements (Editor)

spyder/plugins/completion/providers/languageserver/providers/document.py

@@ -251,15 +251,10 @@ def folding_range_request(self, params):
 
     @handles(CompletionRequestTypes.DOCUMENT_FOLDING_RANGE)
     def process_folding_range(self, result, req_id):
-        results = []
-        for folding_range in result:
-            start_line = folding_range['startLine']
-            end_line = folding_range['endLine']
-            results.append((start_line, end_line))
         if req_id in self.req_reply:
             self.req_reply[req_id](
                 CompletionRequestTypes.DOCUMENT_FOLDING_RANGE,
-                {'params': results})
+                {'params': result})
 
     @send_notification(method=CompletionRequestTypes.DOCUMENT_WILL_SAVE)
     def document_will_save_notification(self, params):

spyder/plugins/debugger/utils/breakpointsmanager.py

@@ -81,7 +81,7 @@ def __init__(self, editor):
         # Debugger panel (Breakpoints)
         self.debugger_panel = DebuggerPanel(self)
         editor.panels.register(self.debugger_panel)
-        self.debugger_panel.order_in_zone = -1
+        self.debugger_panel.order_in_zone = 1
         self.update_panel_visibility()
 
         # Load breakpoints

spyder/plugins/editor/api/decoration.py

@@ -23,7 +23,7 @@
                         QTextCharFormat)
 
 # Local imports
-from spyder.utils.palette import QStylePalette, SpyderPalette
+from spyder.utils.palette import SpyderPalette
 
 
 # DRAW_ORDERS are used for make some decorations appear in top of others,
@@ -37,9 +37,10 @@
 
 DRAW_ORDERS = {'on_bottom': 0,
                'current_cell': 1,
-               'codefolding': 2,
+               'folding_areas': 2,
                'current_line': 3,
-               'on_top': 4}
+               'folded_regions': 4,
+               'on_top': 5}
 
 
 class TextDecoration(QTextEdit.ExtraSelection):

spyder/plugins/editor/api/editorextension.py

@@ -16,11 +16,6 @@
 <https://github.com/pyQode/pyqode.core/blob/master/pyqode/core/api/mode.py>
 """
 
-import logging
-
-
-logger = logging.getLogger(__name__)
-
 
 class EditorExtension(object):
     """
@@ -87,9 +82,6 @@ def __init__(self):
         self._editor = None
         self._on_close = False
 
-    def __del__(self):
-        logger.debug('%s.__del__', type(self))
-
     def on_install(self, editor):
         """
         Installs the extension on the editor.

spyder/plugins/editor/extensions/snippets.py

@@ -11,9 +11,10 @@
 import functools
 
 # Third party imports
-from qtpy.QtGui import QTextCursor, QColor
-from qtpy.QtCore import Qt, QMutex, QMutexLocker
 from diff_match_patch import diff_match_patch
+from qtpy.QtCore import QMutex, QMutexLocker, Qt
+from qtpy.QtGui import QTextCursor, QColor
+from superqt.utils import qdebounced
 
 try:
     from rtree import index
@@ -89,7 +90,6 @@ def __init__(self):
         self.starting_position = None
         self.modification_lock = QMutex()
         self.event_lock = QMutex()
-        self.update_lock = QMutex()
         self.node_position = {}
         self.snippets_map = {}
         self.undo_stack = []
@@ -98,7 +98,7 @@ def __init__(self):
             self.index = index.Index()
 
     def on_state_changed(self, state):
-        """Connect/disconnect sig_key_pressed signal."""
+        """Connect/disconnect editor signals."""
         if state:
             self.editor.sig_key_pressed.connect(self._on_key_pressed)
             self.editor.sig_insert_completion.connect(self.insert_snippet)
@@ -589,7 +589,8 @@ def _find_lowest_common_ancestor(self, start_node, end_node):
 
     @lock
     def remove_selection(self, selection_start, selection_end):
-        self._remove_selection(selection_start, selection_end)
+        if self.is_snippet_active:
+            self._remove_selection(selection_start, selection_end)
 
     def _remove_selection(self, selection_start, selection_end):
         start_node, _, _ = self._find_node_by_position(*selection_start)
@@ -712,8 +713,10 @@ def _find_node_by_position(self, line, col):
             text_ids = set([id(token) for token in nearest_text.tokens])
             if node_id not in text_ids:
                 current_node = nearest_text.tokens[-1]
+
         return current_node, nearest_snippet, nearest_text
 
+    @qdebounced(timeout=20)
     def cursor_changed(self, line, col):
         if not rtree_available:
             return
@@ -722,14 +725,16 @@ def cursor_changed(self, line, col):
             self.inserting_snippet = False
             return
 
-        node, nearest_snippet, _ = self._find_node_by_position(line, col)
-        if node is None:
-            ignore = self.editor.is_undoing or self.editor.is_redoing
-            if not ignore:
-                self.reset()
-        else:
-            if nearest_snippet is not None:
-                self.active_snippet = nearest_snippet.number
+        if self.is_snippet_active:
+            node, nearest_snippet, _ = self._find_node_by_position(line, col)
+
+            if node is None:
+                ignore = self.editor.is_undoing or self.editor.is_redoing
+                if not ignore:
+                    self.reset()
+            else:
+                if nearest_snippet is not None:
+                    self.active_snippet = nearest_snippet.number
 
     def reset(self, partial_reset=False):
         self.node_number = 0