Editor: Don't insert quote if it's written after a escaped backslash

- This eases writing Windows paths.
- Add tests for this and also to check that we can correctly insert
escaped quotes.

Author: ccordoba12

spyder/plugins/editor/extensions/closequotes.py

@@ -3,8 +3,11 @@
 # Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
 # (see spyder/__init__.py for details)
+
 """This module contains the close quotes editor extension."""
 
+import re
+
 # Third party imports
 from qtpy.QtGui import QTextCursor
 
@@ -27,10 +30,14 @@ def unmatched_quotes_in_line(text):
 
     Distributed under the terms of the BSD License.
     """
+    # Remove escaped quotes from counting, but only if they are not to the
+    # right of a backslash because in that case the backslash is the char that
+    # is escaped.
+    text = re.sub(r"(?<!\\)\\'", '', text)
+    text = re.sub(r'(?<!\\)\\"', '', text)
+
     # We check " first, then ', so complex cases with nested quotes will
     # get the " to take precedence.
-    text = text.replace("\\'", "")
-    text = text.replace('\\"', '')
     if text.count('"') % 2:
         return '"'
     elif text.count("'") % 2:

spyder/plugins/editor/extensions/tests/test_closequotes.py

@@ -3,38 +3,44 @@
 # Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
 #
+
 """Tests for close quotes."""
 
 # Third party imports
 import pytest
 from qtpy.QtCore import Qt
-from qtpy.QtGui import QTextCursor
+from qtpy.QtGui import QFont, QTextCursor
 
 # Local imports
-from spyder.utils.qthelpers import qapplication
+from spyder.config.base import running_in_ci
 from spyder.plugins.editor.widgets.codeeditor import CodeEditor
 from spyder.plugins.editor.utils.editor import TextHelper
 from spyder.plugins.editor.extensions.closequotes import (
         CloseQuotesExtension)
 
 
-# --- Fixtures
+# ---- Fixtures
 # -----------------------------------------------------------------------------
 @pytest.fixture
-def editor_close_quotes():
+def editor_close_quotes(qtbot):
     """Set up Editor with close quotes activated."""
-    app = qapplication()
     editor = CodeEditor(parent=None)
-    kwargs = {}
-    kwargs['language'] = 'Python'
-    kwargs['close_quotes'] = True
-    editor.setup_editor(**kwargs)
-    return editor
+    editor.setup_editor(
+        color_scheme='spyder/dark',
+        font=QFont("Courier New", 10),
+        language='Python',
+        close_quotes=True
+    )
 
-# --- Tests
-# -----------------------------------------------------------------------------
+    editor.resize(480, 360)
+    editor.show()
+    qtbot.addWidget(editor)
+
+    return editor
 
 
+# ---- Tests
+# -----------------------------------------------------------------------------
 @pytest.mark.parametrize(
     'text, expected_text, cursor_column',
     [
@@ -48,13 +54,19 @@ def editor_close_quotes():
         ("''''", "''''''", 3),
         ('"some_string"', '"some_string"', 13),  # Write a string
         ("'some_string'", "'some_string'", 13),
+        (r'"\""', r'"\""', 4),  # Write escaped quotes
+        (r"'\''", r"'\''", 4),
+        (r'"\\"', r'"\\"', 4),  # Don't enter escaped quote if the previous
+        (r"'\\'", r"'\\'", 4),  # char is a backslash (for Windows paths)
     ])
 def test_close_quotes(qtbot, editor_close_quotes, text, expected_text,
                       cursor_column):
     """Test insertion of extra quotes."""
     editor = editor_close_quotes
 
     qtbot.keyClicks(editor, text)
+    if not running_in_ci():
+        qtbot.wait(1000)
     assert editor.toPlainText() == expected_text
 
     assert cursor_column == TextHelper(editor).current_column_nbr()