Editor: Fix dot completions and preserve file ones that start with numbers

Author: ccordoba12

spyder/plugins/editor/widgets/base.py

@@ -909,7 +909,8 @@ def select_completion_list(self):
         self.completion_widget.item_selected()
 
     def insert_completion(self, completion, completion_position):
-        """Insert a completion into the editor.
+        """
+        Insert a completion into the editor.
 
         completion_position is where the completion was generated.
 
@@ -944,15 +945,18 @@ def insert_completion(self, completion, completion_position):
                 text = completion['insertText']
             text = to_text_string(text)
 
-            # Get word on the left of the cursor.
-            result = self.get_current_word_and_position(completion=True)
+            # Get word to the left of the cursor.
+            result = self.get_current_word_and_position(
+                completion=True, valid_python_variable=False)
             if result is not None:
                 current_text, start_position = result
                 end_position = start_position + len(current_text)
+
                 # Check if the completion position is in the expected range
                 if not start_position <= completion_position <= end_position:
                     return
                 cursor.setPosition(start_position)
+
                 # Remove the word under the cursor
                 cursor.setPosition(end_position,
                                    QTextCursor.KeepAnchor)

spyder/plugins/editor/widgets/tests/test_introspection.py

@@ -23,6 +23,10 @@
 # Local imports
 from spyder.config.base import running_in_ci, running_in_ci_with_conda
 from spyder.config.utils import is_anaconda
+from spyder.plugins.completion.api import (
+    CompletionRequestTypes, CompletionItemKind)
+from spyder.plugins.completion.providers.languageserver.providers.utils import (
+    path_as_uri)
 from spyder.plugins.completion.providers.kite.utils.status import (
     check_if_kite_installed, check_if_kite_running)
 from spyder.py3compat import PY2
@@ -1178,5 +1182,75 @@ def test_completions_environment(completions_codeeditor, qtbot, tmpdir):
     completion_plugin.after_configuration_update([])
 
 
+@pytest.mark.slow
+@pytest.mark.order(1)
+@flaky(max_runs=5)
+def test_dot_completions(completions_codeeditor, qtbot):
+    """
+    Test that completions after a dot are working as expected.
+
+    This is a regression test for issue spyder-ide/spyder#20285
+    """
+    code_editor, _ = completions_codeeditor
+    completion = code_editor.completion_widget
+
+    # Import module and check completions are shown for it after writing a dot
+    # after it
+    qtbot.keyClicks(code_editor, "import math")
+    qtbot.keyPress(code_editor, Qt.Key_Enter)
+
+    qtbot.wait(500)
+    assert not completion.isVisible()
+
+    with qtbot.waitSignal(completion.sig_show_completions, timeout=10000):
+        qtbot.keyClicks(code_editor, "math.")
+
+    qtbot.wait(500)
+    assert completion.isVisible()
+
+
+@pytest.mark.slow
+@pytest.mark.order(1)
+def test_completions_for_files_that_start_with_numbers(
+        mock_completions_codeeditor, qtbot):
+    """
+    Test that completions for files that start with numbers are handled as
+    expected.
+
+    This is a regression test for issue spyder-ide/spyder#20156
+    """
+    code_editor, mock_response = mock_completions_codeeditor
+    completion = code_editor.completion_widget
+    file_name = '000_testing.txt'
+
+    # Set text to complete and move cursor to the position we want to ask for
+    # completions.
+    qtbot.keyClicks(code_editor, "'0'")
+    code_editor.moveCursor(QTextCursor.PreviousCharacter)
+    qtbot.wait(500)
+
+    # Complete '0' -> '000_testing.txt'
+    mock_response.side_effect = lambda lang, method, params: {'params': [{
+        'label': f'{file_name}',
+        'kind': CompletionItemKind.FILE,
+        'sortText': (0, f'a{file_name}'),
+        'insertText': f'{file_name}',
+        'data': {'doc_uri': path_as_uri(__file__)},
+        'detail': '',
+        'documentation': '',
+        'filterText': f'{file_name}',
+        'insertTextFormat': 1,
+        'provider': 'LSP',
+        'resolve': True
+    }]} if method == CompletionRequestTypes.DOCUMENT_COMPLETION else None
+
+    with qtbot.waitSignal(completion.sig_show_completions,
+                          timeout=10000):
+        qtbot.keyPress(code_editor, Qt.Key_Tab, delay=300)
+
+    qtbot.wait(500)
+    assert code_editor.get_text_with_eol() == f"'{file_name}'"
+
+
 if __name__ == '__main__':
     pytest.main(['test_introspection.py', '--run-slow'])

spyder/widgets/mixins.py

@@ -1083,7 +1083,7 @@ def is_special_character(move):
         startpos = cursor.selectionStart()
 
         # Find a valid Python variable name
-        if valid_python_variable and not completion:
+        if valid_python_variable:
             match = re.findall(r'([^\d\W]\w*)', text, re.UNICODE)
             if not match:
                 # This is assumed in several places of our codebase,