From 8c384d6f6135312c76b663dce893e7cfa69ec86a Mon Sep 17 00:00:00 2001 From: Terry Jan Reedy Date: Tue, 26 Mar 2019 03:53:05 -0400 Subject: [PATCH 01/10] Some edits and cover thru autocomplete_event. --- Lib/idlelib/autocomplete.py | 36 +++++------- Lib/idlelib/idle_test/test_autocomplete.py | 64 +++++++++++++--------- 2 files changed, 51 insertions(+), 49 deletions(-) diff --git a/Lib/idlelib/autocomplete.py b/Lib/idlelib/autocomplete.py index e20b757d871043..2e94f1a2d4bf8f 100644 --- a/Lib/idlelib/autocomplete.py +++ b/Lib/idlelib/autocomplete.py @@ -20,32 +20,27 @@ # TODO Update this here and elsewhere. ID_CHARS = string.ascii_letters + string.digits + "_" -SEPS = os.sep -if os.altsep: # e.g. '/' on Windows... - SEPS += os.altsep - +SEPS = f"{os.sep}{os.altsep if os.altsep else ''}" +TRIGGERS = f".{SEPS}" class AutoComplete: def __init__(self, editwin=None): self.editwin = editwin - if editwin is not None: # not in subprocess or test + if editwin is not None: # not in subprocess or no-gui test self.text = editwin.text - self.autocompletewindow = None - # id of delayed call, and the index of the text insert when - # the delayed call was issued. If _delayed_completion_id is - # None, there is no delayed call. - self._delayed_completion_id = None - self._delayed_completion_index = None + self.autocompletewindow = None + # id of delayed call, and the index of the text insert when + # the delayed call was issued. If _delayed_completion_id is + # None, there is no delayed call. + self._delayed_completion_id = None + self._delayed_completion_index = None @classmethod def reload(cls): cls.popupwait = idleConf.GetOption( "extensions", "AutoComplete", "popupwait", type="int", default=0) - def _make_autocomplete_window(self): - return autocomplete_w.AutoCompleteWindow(self.text) - def _remove_autocomplete_window(self, event=None): if self.autocompletewindow: self.autocompletewindow.hide_window() @@ -58,18 +53,15 @@ def force_open_completions_event(self, event): self.open_completions(True, False, True) return "break" - def try_open_completions_event(self, event): + def try_open_completions_event(self, event=None): """Happens when it would be nice to open a completion list, but not really necessary, for example after a dot, so function calls won't be made. """ lastchar = self.text.get("insert-1c") - if lastchar == ".": - self._open_completions_later(False, False, False, - COMPLETE_ATTRIBUTES) - elif lastchar in SEPS: - self._open_completions_later(False, False, False, - COMPLETE_FILES) + if lastchar in TRIGGERS: + mode = COMPLETE_ATTRIBUTES if lastchar == "." else COMPLETE_FILES + self._open_completions_later(False, False, False, mode) def autocomplete_event(self, event): """Happens when the user wants to complete his word, and if necessary, @@ -160,7 +152,7 @@ def open_completions(self, evalfuncs, complete, userWantsWin, mode=None): comp_lists = self.fetch_completions(comp_what, mode) if not comp_lists[0]: return None - self.autocompletewindow = self._make_autocomplete_window() + self.autocompletewindow = autocomplete_w.AutoCompleteWindow(self.text) return not self.autocompletewindow.show_window( comp_lists, "insert-%dc" % len(comp_start), complete, mode, userWantsWin) diff --git a/Lib/idlelib/idle_test/test_autocomplete.py b/Lib/idlelib/idle_test/test_autocomplete.py index 398cb359e0931f..c5274492c88850 100644 --- a/Lib/idlelib/idle_test/test_autocomplete.py +++ b/Lib/idlelib/idle_test/test_autocomplete.py @@ -45,16 +45,15 @@ def setUp(self): def test_init(self): self.assertEqual(self.autocomplete.editwin, self.editor) - - def test_make_autocomplete_window(self): - testwin = self.autocomplete._make_autocomplete_window() - self.assertIsInstance(testwin, acw.AutoCompleteWindow) + acac = ac.AutoComplete() + self.assertEqual(acac.editwin, None) def test_remove_autocomplete_window(self): - self.autocomplete.autocompletewindow = ( - self.autocomplete._make_autocomplete_window()) - self.autocomplete._remove_autocomplete_window() - self.assertIsNone(self.autocomplete.autocompletewindow) + acp = self.autocomplete + acp.autocompletewindow = m = Mock(spec=acw.AutoCompleteWindow) + acp._remove_autocomplete_window() + m.hide_window.assert_called_once() + self.assertIsNone(acp.autocompletewindow) def test_force_open_completions_event(self): # Test that force_open_completions_event calls _open_completions. @@ -70,50 +69,58 @@ def test_try_open_completions_event(self): o_c_l = Func() autocomplete._open_completions_later = o_c_l - # _open_completions_later should not be called with no text in editor. - trycompletions('event') + # if no text or trigger, _open_completions_later not called + # or if last character is not trigger char. + trycompletions() + Equal(o_c_l.args, None) + self.text.insert('1.0', 're') + trycompletions() Equal(o_c_l.args, None) - # _open_completions_later should be called with COMPLETE_ATTRIBUTES (1). - self.text.insert('1.0', 're.') - trycompletions('event') + # _open_completions_later called with COMPLETE_ATTRIBUTES (1). + self.text.insert('insert', '.') + trycompletions() Equal(o_c_l.args, (False, False, False, 1)) - # _open_completions_later should be called with COMPLETE_FILES (2). + # _open_completions_later called with COMPLETE_FILES (2). self.text.delete('1.0', 'end') self.text.insert('1.0', '"./Lib/') - trycompletions('event') + trycompletions() Equal(o_c_l.args, (False, False, False, 2)) def test_autocomplete_event(self): Equal = self.assertEqual - autocomplete = self.autocomplete + acp = self.autocomplete # Test that the autocomplete event is ignored if user is pressing a # modifier key in addition to the tab key. ev = Event(mc_state=True) - self.assertIsNone(autocomplete.autocomplete_event(ev)) + self.assertIsNone(acp.autocomplete_event(ev)) del ev.mc_state # Test that tab after whitespace is ignored. self.text.insert('1.0', ' """Docstring.\n ') - self.assertIsNone(autocomplete.autocomplete_event(ev)) + self.assertIsNone(acp.autocomplete_event(ev)) self.text.delete('1.0', 'end') # If autocomplete window is open, complete() method is called. self.text.insert('1.0', 're.') - # This must call autocomplete._make_autocomplete_window(). - Equal(self.autocomplete.autocomplete_event(ev), 'break') + acp.autocompletewindow = m = Mock(spec=acw.AutoCompleteWindow) + m.is_active = Mock(return_value=True) + Equal(acp.autocomplete_event(ev), 'break') + m.complete.assert_called_once() + m.is_active = Mock(return_value=False) + Equal(acp.autocomplete_event(ev), 'break') + acp.autocompletewindow = None # If autocomplete window is not active or does not exist, # open_completions is called. Return depends on its return. - autocomplete._remove_autocomplete_window() o_cs = Func() # .result = None. - autocomplete.open_completions = o_cs - Equal(self.autocomplete.autocomplete_event(ev), None) + acp.open_completions = o_cs + Equal(acp.autocomplete_event(ev), None) Equal(o_cs.args, (False, True, True)) o_cs.result = True - Equal(self.autocomplete.autocomplete_event(ev), 'break') + Equal(acp.autocomplete_event(ev), 'break') Equal(o_cs.args, (False, True, True)) def test_open_completions_later(self): @@ -151,8 +158,11 @@ def test_delayed_open_completions(self): def test_open_completions(self): # Test completions of files and attributes as well as non-completion # of errors. + acp = self.autocomplete self.text.insert('1.0', 'pr') - self.assertTrue(self.autocomplete.open_completions(False, True, True)) + self.assertIsNone(acp.autocompletewindow) + self.assertTrue(acp.open_completions(False, True, True)) + self.assertIsInstance(acp.autocompletewindow, acw.AutoCompleteWindow) self.text.delete('1.0', 'end') # Test files. @@ -161,11 +171,11 @@ def test_open_completions(self): self.text.delete('1.0', 'end') # Test with blank will fail. - self.assertFalse(self.autocomplete.open_completions(False, True, True)) + self.assertFalse(acp.open_completions(False, True, True)) # Test with only string quote will fail. self.text.insert('1.0', '"') - self.assertFalse(self.autocomplete.open_completions(False, True, True)) + self.assertFalse(acp.open_completions(False, True, True)) self.text.delete('1.0', 'end') def test_fetch_completions(self): From 48f2b54b3c388bc2553f149bd6adf6146b0119bb Mon Sep 17 00:00:00 2001 From: Terry Jan Reedy Date: Wed, 27 Mar 2019 02:32:35 -0400 Subject: [PATCH 02/10] Move autocomplete & test up, other changes. --- Lib/idlelib/autocomplete.py | 35 +++--- Lib/idlelib/idle_test/test_autocomplete.py | 118 ++++++++++++--------- 2 files changed, 79 insertions(+), 74 deletions(-) diff --git a/Lib/idlelib/autocomplete.py b/Lib/idlelib/autocomplete.py index 2e94f1a2d4bf8f..095efaab18acc4 100644 --- a/Lib/idlelib/autocomplete.py +++ b/Lib/idlelib/autocomplete.py @@ -47,27 +47,12 @@ def _remove_autocomplete_window(self, event=None): self.autocompletewindow = None def force_open_completions_event(self, event): - """Happens when the user really wants to open a completion list, even - if a function call is needed. - """ + "(^space) Open completion list, even if a function call is needed." self.open_completions(True, False, True) return "break" - def try_open_completions_event(self, event=None): - """Happens when it would be nice to open a completion list, but not - really necessary, for example after a dot, so function - calls won't be made. - """ - lastchar = self.text.get("insert-1c") - if lastchar in TRIGGERS: - mode = COMPLETE_ATTRIBUTES if lastchar == "." else COMPLETE_FILES - self._open_completions_later(False, False, False, mode) - def autocomplete_event(self, event): - """Happens when the user wants to complete his word, and if necessary, - open a completion list after that (if there is more than one - completion) - """ + "(tab) Complete word or open list if multiple options." if hasattr(event, "mc_state") and event.mc_state or\ not self.text.get("insert linestart", "insert").strip(): # A modifier was pressed along with the tab or @@ -80,15 +65,23 @@ def autocomplete_event(self, event): opened = self.open_completions(False, True, True) return "break" if opened else None - def _open_completions_later(self, *args): + def try_open_completions_event(self, event=None): + "(./) Open completion list after pause with no movement." + lastchar = self.text.get("insert-1c") + if lastchar in TRIGGERS: + mode = COMPLETE_ATTRIBUTES if lastchar == "." else COMPLETE_FILES + self._open_completions_later((False, False, False, mode)) + + def _open_completions_later(self, args): self._delayed_completion_index = self.text.index("insert") if self._delayed_completion_id is not None: self.text.after_cancel(self._delayed_completion_id) self._delayed_completion_id = \ self.text.after(self.popupwait, self._delayed_open_completions, - *args) + args) - def _delayed_open_completions(self, *args): + def _delayed_open_completions(self, args): + "Call open_completions if index unchanged." self._delayed_completion_id = None if self.text.index("insert") == self._delayed_completion_index: self.open_completions(*args) @@ -102,8 +95,8 @@ def open_completions(self, evalfuncs, complete, userWantsWin, mode=None): Action Function Eval Complete WantWin Mode ^space force_open_completions True, False, True no - . or / try_open_completions False, False, False yes tab autocomplete False, True, True no + . or / try_open_completions False, False, False yes """ # Cancel another delayed call, if it exists. if self._delayed_completion_id is not None: diff --git a/Lib/idlelib/idle_test/test_autocomplete.py b/Lib/idlelib/idle_test/test_autocomplete.py index c5274492c88850..73ab2f44c9b770 100644 --- a/Lib/idlelib/idle_test/test_autocomplete.py +++ b/Lib/idlelib/idle_test/test_autocomplete.py @@ -56,66 +56,37 @@ def test_remove_autocomplete_window(self): self.assertIsNone(acp.autocompletewindow) def test_force_open_completions_event(self): - # Test that force_open_completions_event calls _open_completions. + # Call _open_completions and break. + acp = self.autocomplete o_cs = Func() - self.autocomplete.open_completions = o_cs - self.autocomplete.force_open_completions_event('event') + acp.open_completions = o_cs + self.assertEqual(acp.force_open_completions_event('event'), 'break') self.assertEqual(o_cs.args, (True, False, True)) - def test_try_open_completions_event(self): - Equal = self.assertEqual - autocomplete = self.autocomplete - trycompletions = self.autocomplete.try_open_completions_event - o_c_l = Func() - autocomplete._open_completions_later = o_c_l - - # if no text or trigger, _open_completions_later not called - # or if last character is not trigger char. - trycompletions() - Equal(o_c_l.args, None) - self.text.insert('1.0', 're') - trycompletions() - Equal(o_c_l.args, None) - - # _open_completions_later called with COMPLETE_ATTRIBUTES (1). - self.text.insert('insert', '.') - trycompletions() - Equal(o_c_l.args, (False, False, False, 1)) - - # _open_completions_later called with COMPLETE_FILES (2). - self.text.delete('1.0', 'end') - self.text.insert('1.0', '"./Lib/') - trycompletions() - Equal(o_c_l.args, (False, False, False, 2)) - def test_autocomplete_event(self): Equal = self.assertEqual acp = self.autocomplete - # Test that the autocomplete event is ignored if user is pressing a - # modifier key in addition to the tab key. + # Result of autocomplete event: If modified tab, None. ev = Event(mc_state=True) self.assertIsNone(acp.autocomplete_event(ev)) del ev.mc_state - # Test that tab after whitespace is ignored. + # If tab after whitespace, None. self.text.insert('1.0', ' """Docstring.\n ') self.assertIsNone(acp.autocomplete_event(ev)) self.text.delete('1.0', 'end') - # If autocomplete window is open, complete() method is called. + # If active autocomplete window, complete() and 'break'. self.text.insert('1.0', 're.') acp.autocompletewindow = m = Mock(spec=acw.AutoCompleteWindow) m.is_active = Mock(return_value=True) Equal(acp.autocomplete_event(ev), 'break') m.complete.assert_called_once() - m.is_active = Mock(return_value=False) - Equal(acp.autocomplete_event(ev), 'break') acp.autocompletewindow = None - # If autocomplete window is not active or does not exist, - # open_completions is called. Return depends on its return. - o_cs = Func() # .result = None. + # If no active autocomplete window, open_completions(), None/break. + o_cs = Func(result=False) acp.open_completions = o_cs Equal(acp.autocomplete_event(ev), None) Equal(o_cs.args, (False, True, True)) @@ -123,41 +94,81 @@ def test_autocomplete_event(self): Equal(acp.autocomplete_event(ev), 'break') Equal(o_cs.args, (False, True, True)) + def test_try_open_completions_event(self): + Equal = self.assertEqual + acp = self.autocomplete + trycompletions = acp.try_open_completions_event + o_c_l = Func() + acp._open_completions_later = o_c_l + + # If no text or trigger, _open_completions_later not called. + trycompletions() + Equal(o_c_l.called, 0) + self.text.insert('1.0', 're') + trycompletions() + Equal(o_c_l.called, 0) + + # _open_completions_later called with COMPLETE_ATTRIBUTES (1). + self.text.insert('insert', 're.') + trycompletions() + Equal(o_c_l.args, ((False, False, False, 1),)) + + # _open_completions_later called with COMPLETE_FILES (2). + self.text.delete('1.0', 'end') + self.text.insert('1.0', '"./Lib/') + trycompletions() + Equal(o_c_l.args, ((False, False, False, 2),)) + def test_open_completions_later(self): - # Test that autocomplete._delayed_completion_id is set. + Equal = self.assertEqual + + # Test after call and autocomplete._delayed_completion_id. acp = self.autocomplete + after = Func(result='after1') + acp.text.after = after acp._delayed_completion_id = None - acp._open_completions_later(False, False, False, ac.COMPLETE_ATTRIBUTES) + acp._open_completions_later('dummy1') + Equal(after.args, + (acp.popupwait, acp._delayed_open_completions, 'dummy1')) cb1 = acp._delayed_completion_id - self.assertTrue(cb1.startswith('after')) + Equal(cb1, 'after1') # Test that cb1 is cancelled and cb2 is new. - acp._open_completions_later(False, False, False, ac.COMPLETE_FILES) - self.assertNotIn(cb1, self.root.tk.call('after', 'info')) + after.result = 'after2' + acp.text.after_cancel = Func() + acp._open_completions_later('dummy2') + Equal(after.args, + (acp.popupwait, acp._delayed_open_completions, 'dummy2')) + Equal(self.text.after_cancel.args, (cb1,)) cb2 = acp._delayed_completion_id - self.assertTrue(cb2.startswith('after') and cb2 != cb1) - self.text.after_cancel(cb2) + Equal(cb2, 'after2') def test_delayed_open_completions(self): - # Test that autocomplete._delayed_completion_id set to None - # and that open_completions is not called if the index is not - # equal to _delayed_completion_index. + Equal = self.assertEqual acp = self.autocomplete - acp.open_completions = Func() + o_c = Func() + acp.open_completions = o_c + self.text.delete('1.0', 'end') + self.text.insert('1.0', '"dict.') + + + # Set autocomplete._delayed_completion_id to None. + # Text index changed, don't call open_completions. acp._delayed_completion_id = 'after' acp._delayed_completion_index = self.text.index('insert+1c') - acp._delayed_open_completions(1, 2, 3) + acp._delayed_open_completions('dummy') self.assertIsNone(acp._delayed_completion_id) - self.assertEqual(acp.open_completions.called, 0) + Equal(acp.open_completions.called, 0) - # Test that open_completions is called if indexes match. + # Text index unchanged, call open_completions. acp._delayed_completion_index = self.text.index('insert') - acp._delayed_open_completions(1, 2, 3, ac.COMPLETE_FILES) + acp._delayed_open_completions((1, 2, 3, ac.COMPLETE_FILES)) self.assertEqual(acp.open_completions.args, (1, 2, 3, 2)) def test_open_completions(self): # Test completions of files and attributes as well as non-completion # of errors. + # add 're.', others to complete coverage acp = self.autocomplete self.text.insert('1.0', 'pr') self.assertIsNone(acp.autocompletewindow) @@ -167,6 +178,7 @@ def test_open_completions(self): # Test files. self.text.insert('1.0', '"t') + # When run under regrtest, not comp_lists[0] (small) #self.assertTrue(self.autocomplete.open_completions(False, True, True)) self.text.delete('1.0', 'end') From 9a17b9d1e5d41f428089230cabb29108f5ba4b14 Mon Sep 17 00:00:00 2001 From: Terry Jan Reedy Date: Thu, 28 Mar 2019 05:03:02 -0400 Subject: [PATCH 03/10] more edits --- Lib/idlelib/autocomplete.py | 9 ++-- Lib/idlelib/idle_test/test_autocomplete.py | 51 ++++++++++++++-------- 2 files changed, 38 insertions(+), 22 deletions(-) diff --git a/Lib/idlelib/autocomplete.py b/Lib/idlelib/autocomplete.py index 095efaab18acc4..c17d50fb6e5d22 100644 --- a/Lib/idlelib/autocomplete.py +++ b/Lib/idlelib/autocomplete.py @@ -41,6 +41,9 @@ def reload(cls): cls.popupwait = idleConf.GetOption( "extensions", "AutoComplete", "popupwait", type="int", default=0) + def _make_autocomplete_window(self): # Makes mocking easier. + return autocomplete_w.AutoCompleteWindow(self.text) + def _remove_autocomplete_window(self, event=None): if self.autocompletewindow: self.autocompletewindow.hide_window() @@ -86,7 +89,7 @@ def _delayed_open_completions(self, args): if self.text.index("insert") == self._delayed_completion_index: self.open_completions(*args) - def open_completions(self, evalfuncs, complete, userWantsWin, mode=None): + def open_completions(self, evalfuncs, complete, wantwin, mode=None): """Find the completions and create the AutoCompleteWindow. Return True if successful (no syntax error or so found). If complete is True, then if there's nothing to complete and no @@ -145,10 +148,10 @@ def open_completions(self, evalfuncs, complete, userWantsWin, mode=None): comp_lists = self.fetch_completions(comp_what, mode) if not comp_lists[0]: return None - self.autocompletewindow = autocomplete_w.AutoCompleteWindow(self.text) + self.autocompletewindow = self._make_autocomplete_window() return not self.autocompletewindow.show_window( comp_lists, "insert-%dc" % len(comp_start), - complete, mode, userWantsWin) + complete, mode, wantwin) def fetch_completions(self, what, mode): """Return a pair of lists of completions for something. The first list diff --git a/Lib/idlelib/idle_test/test_autocomplete.py b/Lib/idlelib/idle_test/test_autocomplete.py index 73ab2f44c9b770..d80ed7984c26e2 100644 --- a/Lib/idlelib/idle_test/test_autocomplete.py +++ b/Lib/idlelib/idle_test/test_autocomplete.py @@ -45,12 +45,15 @@ def setUp(self): def test_init(self): self.assertEqual(self.autocomplete.editwin, self.editor) - acac = ac.AutoComplete() - self.assertEqual(acac.editwin, None) + self.assertEqual(self.autocomplete.text, self.text) + + def test_make_autocomplete_window(self): + testwin = self.autocomplete._make_autocomplete_window() + self.assertIsInstance(testwin, acw.AutoCompleteWindow) def test_remove_autocomplete_window(self): acp = self.autocomplete - acp.autocompletewindow = m = Mock(spec=acw.AutoCompleteWindow) + acp.autocompletewindow = m = Mock() acp._remove_autocomplete_window() m.hide_window.assert_called_once() self.assertIsNone(acp.autocompletewindow) @@ -79,7 +82,7 @@ def test_autocomplete_event(self): # If active autocomplete window, complete() and 'break'. self.text.insert('1.0', 're.') - acp.autocompletewindow = m = Mock(spec=acw.AutoCompleteWindow) + acp.autocompletewindow = m = Mock() m.is_active = Mock(return_value=True) Equal(acp.autocomplete_event(ev), 'break') m.complete.assert_called_once() @@ -165,14 +168,24 @@ def test_delayed_open_completions(self): acp._delayed_open_completions((1, 2, 3, ac.COMPLETE_FILES)) self.assertEqual(acp.open_completions.args, (1, 2, 3, 2)) + def test_open_completions_none(self): + # Test 4 None returns and delayed id. + none = self.assertIsNone + acp = self.autocomplete + + self.text.insert('1.0', 'int()') + none(acp.open_completions(False, True, True)) + def test_open_completions(self): # Test completions of files and attributes as well as non-completion # of errors. # add 're.', others to complete coverage acp = self.autocomplete - self.text.insert('1.0', 'pr') - self.assertIsNone(acp.autocompletewindow) - self.assertTrue(acp.open_completions(False, True, True)) + def make(): return Mock(spec=acw.AutoCompleteWindow) + acp._make_autocomplete_window = make + + self.text.insert('1.0', 'int.') + acp.open_completions(False, True, True) self.assertIsInstance(acp.autocompletewindow, acw.AutoCompleteWindow) self.text.delete('1.0', 'end') @@ -196,21 +209,21 @@ def test_fetch_completions(self): # a small list containing non-private variables. # For file completion, a large list containing all files in the path, # and a small list containing files that do not start with '.'. - autocomplete = self.autocomplete - small, large = self.autocomplete.fetch_completions( + acp = self.autocomplete + small, large = acp.fetch_completions( '', ac.COMPLETE_ATTRIBUTES) if __main__.__file__ != ac.__file__: self.assertNotIn('AutoComplete', small) # See issue 36405. # Test attributes - s, b = autocomplete.fetch_completions('', ac.COMPLETE_ATTRIBUTES) + s, b = acp.fetch_completions('', ac.COMPLETE_ATTRIBUTES) self.assertLess(len(small), len(large)) self.assertTrue(all(filter(lambda x: x.startswith('_'), s))) self.assertTrue(any(filter(lambda x: x.startswith('_'), b))) # Test smalll should respect to __all__. with patch.dict('__main__.__dict__', {'__all__': ['a', 'b']}): - s, b = autocomplete.fetch_completions('', ac.COMPLETE_ATTRIBUTES) + s, b = acp.fetch_completions('', ac.COMPLETE_ATTRIBUTES) self.assertEqual(s, ['a', 'b']) self.assertIn('__name__', b) # From __main__.__dict__ self.assertIn('sum', b) # From __main__.__builtins__.__dict__ @@ -219,7 +232,7 @@ def test_fetch_completions(self): mock = Mock() mock._private = Mock() with patch.dict('__main__.__dict__', {'foo': mock}): - s, b = autocomplete.fetch_completions('foo', ac.COMPLETE_ATTRIBUTES) + s, b = acp.fetch_completions('foo', ac.COMPLETE_ATTRIBUTES) self.assertNotIn('_private', s) self.assertIn('_private', b) self.assertEqual(s, [i for i in sorted(dir(mock)) if i[:1] != '_']) @@ -233,36 +246,36 @@ def _listdir(path): return ['monty', 'python', '.hidden'] with patch.object(os, 'listdir', _listdir): - s, b = autocomplete.fetch_completions('', ac.COMPLETE_FILES) + s, b = acp.fetch_completions('', ac.COMPLETE_FILES) self.assertEqual(s, ['bar', 'foo']) self.assertEqual(b, ['.hidden', 'bar', 'foo']) - s, b = autocomplete.fetch_completions('~', ac.COMPLETE_FILES) + s, b = acp.fetch_completions('~', ac.COMPLETE_FILES) self.assertEqual(s, ['monty', 'python']) self.assertEqual(b, ['.hidden', 'monty', 'python']) def test_get_entity(self): # Test that a name is in the namespace of sys.modules and # __main__.__dict__. - autocomplete = self.autocomplete + acp = self.autocomplete Equal = self.assertEqual - Equal(self.autocomplete.get_entity('int'), int) + Equal(acp.get_entity('int'), int) # Test name from sys.modules. mock = Mock() with patch.dict('sys.modules', {'tempfile': mock}): - Equal(autocomplete.get_entity('tempfile'), mock) + Equal(acp.get_entity('tempfile'), mock) # Test name from __main__.__dict__. di = {'foo': 10, 'bar': 20} with patch.dict('__main__.__dict__', {'d': di}): - Equal(autocomplete.get_entity('d'), di) + Equal(acp.get_entity('d'), di) # Test name not in namespace. with patch.dict('__main__.__dict__', {}): with self.assertRaises(NameError): - autocomplete.get_entity('not_exist') + acp.get_entity('not_exist') if __name__ == '__main__': From ff8f6eaaf099385542080c8fce1c5ce56edaa560 Mon Sep 17 00:00:00 2001 From: Terry Jan Reedy Date: Thu, 28 Mar 2019 06:03:29 -0400 Subject: [PATCH 04/10] Define open_completion args as tuple constants. --- Lib/idlelib/autocomplete.py | 48 +++++++++++----------- Lib/idlelib/autocomplete_w.py | 32 ++++++++------- Lib/idlelib/idle_test/test_autocomplete.py | 38 ++++++++--------- 3 files changed, 61 insertions(+), 57 deletions(-) diff --git a/Lib/idlelib/autocomplete.py b/Lib/idlelib/autocomplete.py index c17d50fb6e5d22..8c4ca2383a2344 100644 --- a/Lib/idlelib/autocomplete.py +++ b/Lib/idlelib/autocomplete.py @@ -8,14 +8,19 @@ import string import sys -# These constants represent the two different types of completions. -# They must be defined here so autocomple_w can import them. -COMPLETE_ATTRIBUTES, COMPLETE_FILES = range(1, 2+1) - +# Two types of completions; defined here for autocomplete_w import below. +ATTRS, FILES = 0, 1 from idlelib import autocomplete_w from idlelib.config import idleConf from idlelib.hyperparser import HyperParser +# Tuples passed to open_completions. +# EvalFunc, Complete, WantWin, Mode +FORCE = True, False, True, None # Control-Space. +TAB = False, True, True, None # Tab. +TRY_A = False, False, False, ATTRS # '.' for attributes +TRY_F = False, False, False, FILES # '/' in quotes for file name. + # This string includes all chars that may be in an identifier. # TODO Update this here and elsewhere. ID_CHARS = string.ascii_letters + string.digits + "_" @@ -51,7 +56,7 @@ def _remove_autocomplete_window(self, event=None): def force_open_completions_event(self, event): "(^space) Open completion list, even if a function call is needed." - self.open_completions(True, False, True) + self.open_completions(FORCE) return "break" def autocomplete_event(self, event): @@ -65,42 +70,37 @@ def autocomplete_event(self, event): self.autocompletewindow.complete() return "break" else: - opened = self.open_completions(False, True, True) + opened = self.open_completions(TAB) return "break" if opened else None def try_open_completions_event(self, event=None): "(./) Open completion list after pause with no movement." lastchar = self.text.get("insert-1c") if lastchar in TRIGGERS: - mode = COMPLETE_ATTRIBUTES if lastchar == "." else COMPLETE_FILES - self._open_completions_later((False, False, False, mode)) + self._open_completions_later( + TRY_A if lastchar == "." else TRY_F) def _open_completions_later(self, args): self._delayed_completion_index = self.text.index("insert") if self._delayed_completion_id is not None: self.text.after_cancel(self._delayed_completion_id) - self._delayed_completion_id = \ - self.text.after(self.popupwait, self._delayed_open_completions, - args) + self._delayed_completion_id = self.text.after( + self.popupwait, self._delayed_open_completions, args) def _delayed_open_completions(self, args): "Call open_completions if index unchanged." self._delayed_completion_id = None if self.text.index("insert") == self._delayed_completion_index: - self.open_completions(*args) + self.open_completions(args) - def open_completions(self, evalfuncs, complete, wantwin, mode=None): + def open_completions(self, args): """Find the completions and create the AutoCompleteWindow. Return True if successful (no syntax error or so found). If complete is True, then if there's nothing to complete and no start of completion, won't open completions and return False. If mode is given, will open a completion list only in this mode. - - Action Function Eval Complete WantWin Mode - ^space force_open_completions True, False, True no - tab autocomplete False, True, True no - . or / try_open_completions False, False, False yes """ + evalfuncs, complete, wantwin, mode = args # Cancel another delayed call, if it exists. if self._delayed_completion_id is not None: self.text.after_cancel(self._delayed_completion_id) @@ -109,14 +109,14 @@ def open_completions(self, evalfuncs, complete, wantwin, mode=None): hp = HyperParser(self.editwin, "insert") curline = self.text.get("insert linestart", "insert") i = j = len(curline) - if hp.is_in_string() and (not mode or mode==COMPLETE_FILES): + if hp.is_in_string() and (not mode or mode==FILES): # Find the beginning of the string. # fetch_completions will look at the file system to determine # whether the string value constitutes an actual file name # XXX could consider raw strings here and unescape the string # value if it's not raw. self._remove_autocomplete_window() - mode = COMPLETE_FILES + mode = FILES # Find last separator or string start while i and curline[i-1] not in "'\"" + SEPS: i -= 1 @@ -126,9 +126,9 @@ def open_completions(self, evalfuncs, complete, wantwin, mode=None): while i and curline[i-1] not in "'\"": i -= 1 comp_what = curline[i:j] - elif hp.is_in_code() and (not mode or mode==COMPLETE_ATTRIBUTES): + elif hp.is_in_code() and (not mode or mode==ATTRS): self._remove_autocomplete_window() - mode = COMPLETE_ATTRIBUTES + mode = ATTRS while i and (curline[i-1] in ID_CHARS or ord(curline[i-1]) > 127): i -= 1 comp_start = curline[i:j] @@ -173,7 +173,7 @@ def fetch_completions(self, what, mode): return rpcclt.remotecall("exec", "get_the_completion_list", (what, mode), {}) else: - if mode == COMPLETE_ATTRIBUTES: + if mode == ATTRS: if what == "": namespace = {**__main__.__builtins__.__dict__, **__main__.__dict__} @@ -195,7 +195,7 @@ def fetch_completions(self, what, mode): except: return [], [] - elif mode == COMPLETE_FILES: + elif mode == FILES: if what == "": what = "." try: diff --git a/Lib/idlelib/autocomplete_w.py b/Lib/idlelib/autocomplete_w.py index c249625277369f..c69ab4a3683630 100644 --- a/Lib/idlelib/autocomplete_w.py +++ b/Lib/idlelib/autocomplete_w.py @@ -6,7 +6,7 @@ from tkinter import * from tkinter.ttk import Frame, Scrollbar -from idlelib.autocomplete import COMPLETE_FILES, COMPLETE_ATTRIBUTES +from idlelib.autocomplete import FILES, ATTRS from idlelib.multicall import MC_SHIFT HIDE_VIRTUAL_EVENT_NAME = "<>" @@ -39,8 +39,7 @@ def __init__(self, widget): self.completions = None # A list with more completions, or None self.morecompletions = None - # The completion mode. Either autocomplete.COMPLETE_ATTRIBUTES or - # autocomplete.COMPLETE_FILES + # The completion mode, either autocomplete.ATTRS or .FILES. self.mode = None # The current completion start, on the text box (a string) self.start = None @@ -73,8 +72,8 @@ def _change_start(self, newstart): def _binary_search(self, s): """Find the first index in self.completions where completions[i] is - greater or equal to s, or the last index if there is no such - one.""" + greater or equal to s, or the last index if there is no such. + """ i = 0; j = len(self.completions) while j > i: m = (i + j) // 2 @@ -87,7 +86,8 @@ def _binary_search(self, s): def _complete_string(self, s): """Assuming that s is the prefix of a string in self.completions, return the longest string which is a prefix of all the strings which - s is a prefix of them. If s is not a prefix of a string, return s.""" + s is a prefix of them. If s is not a prefix of a string, return s. + """ first = self._binary_search(s) if self.completions[first][:len(s)] != s: # There is not even one completion which s is a prefix of. @@ -116,8 +116,10 @@ def _complete_string(self, s): return first_comp[:i] def _selection_changed(self): - """Should be called when the selection of the Listbox has changed. - Updates the Listbox display and calls _change_start.""" + """Call when the selection of the Listbox has changed. + + Updates the Listbox display and calls _change_start. + """ cursel = int(self.listbox.curselection()[0]) self.listbox.see(cursel) @@ -153,8 +155,10 @@ def _selection_changed(self): def show_window(self, comp_lists, index, complete, mode, userWantsWin): """Show the autocomplete list, bind events. - If complete is True, complete the text, and if there is exactly one - matching completion, don't open a list.""" + + If complete is True, complete the text, and if there is exactly + one matching completion, don't open a list. + """ # Handle the start we already have self.completions, self.morecompletions = comp_lists self.mode = mode @@ -300,7 +304,7 @@ def keypress_event(self, event): if keysym != "Tab": self.lastkey_was_tab = False if (len(keysym) == 1 or keysym in ("underscore", "BackSpace") - or (self.mode == COMPLETE_FILES and keysym in + or (self.mode == FILES and keysym in ("period", "minus"))) \ and not (state & ~MC_SHIFT): # Normal editing of text @@ -329,10 +333,10 @@ def keypress_event(self, event): self.hide_window() return 'break' - elif (self.mode == COMPLETE_ATTRIBUTES and keysym in + elif (self.mode == ATTRS and keysym in ("period", "space", "parenleft", "parenright", "bracketleft", "bracketright")) or \ - (self.mode == COMPLETE_FILES and keysym in + (self.mode == FILES and keysym in ("slash", "backslash", "quotedbl", "apostrophe")) \ and not (state & ~MC_SHIFT): # If start is a prefix of the selection, but is not '' when @@ -340,7 +344,7 @@ def keypress_event(self, event): # selected completion. Anyway, close the list. cursel = int(self.listbox.curselection()[0]) if self.completions[cursel][:len(self.start)] == self.start \ - and (self.mode == COMPLETE_ATTRIBUTES or self.start): + and (self.mode == ATTRS or self.start): self._change_start(self.completions[cursel]) self.hide_window() return None diff --git a/Lib/idlelib/idle_test/test_autocomplete.py b/Lib/idlelib/idle_test/test_autocomplete.py index d80ed7984c26e2..cc1148b4b4b47f 100644 --- a/Lib/idlelib/idle_test/test_autocomplete.py +++ b/Lib/idlelib/idle_test/test_autocomplete.py @@ -64,7 +64,7 @@ def test_force_open_completions_event(self): o_cs = Func() acp.open_completions = o_cs self.assertEqual(acp.force_open_completions_event('event'), 'break') - self.assertEqual(o_cs.args, (True, False, True)) + self.assertEqual(o_cs.args[0], ac.FORCE) def test_autocomplete_event(self): Equal = self.assertEqual @@ -92,10 +92,10 @@ def test_autocomplete_event(self): o_cs = Func(result=False) acp.open_completions = o_cs Equal(acp.autocomplete_event(ev), None) - Equal(o_cs.args, (False, True, True)) + Equal(o_cs.args[0], ac.TAB) o_cs.result = True Equal(acp.autocomplete_event(ev), 'break') - Equal(o_cs.args, (False, True, True)) + Equal(o_cs.args[0], ac.TAB) def test_try_open_completions_event(self): Equal = self.assertEqual @@ -111,16 +111,16 @@ def test_try_open_completions_event(self): trycompletions() Equal(o_c_l.called, 0) - # _open_completions_later called with COMPLETE_ATTRIBUTES (1). + # _open_completions_later called with ATTRS. self.text.insert('insert', 're.') trycompletions() - Equal(o_c_l.args, ((False, False, False, 1),)) + Equal(o_c_l.args[0], ac.TRY_A) - # _open_completions_later called with COMPLETE_FILES (2). + # _open_completions_later called with FILES. self.text.delete('1.0', 'end') self.text.insert('1.0', '"./Lib/') trycompletions() - Equal(o_c_l.args, ((False, False, False, 2),)) + Equal(o_c_l.args[0], ac.TRY_F) def test_open_completions_later(self): Equal = self.assertEqual @@ -165,8 +165,8 @@ def test_delayed_open_completions(self): # Text index unchanged, call open_completions. acp._delayed_completion_index = self.text.index('insert') - acp._delayed_open_completions((1, 2, 3, ac.COMPLETE_FILES)) - self.assertEqual(acp.open_completions.args, (1, 2, 3, 2)) + acp._delayed_open_completions((1, 2, 3, ac.FILES)) + self.assertEqual(acp.open_completions.args[0], (1, 2, 3, ac.FILES)) def test_open_completions_none(self): # Test 4 None returns and delayed id. @@ -174,7 +174,7 @@ def test_open_completions_none(self): acp = self.autocomplete self.text.insert('1.0', 'int()') - none(acp.open_completions(False, True, True)) + none(acp.open_completions(ac.TAB)) def test_open_completions(self): # Test completions of files and attributes as well as non-completion @@ -185,7 +185,7 @@ def make(): return Mock(spec=acw.AutoCompleteWindow) acp._make_autocomplete_window = make self.text.insert('1.0', 'int.') - acp.open_completions(False, True, True) + acp.open_completions(ac.TAB) self.assertIsInstance(acp.autocompletewindow, acw.AutoCompleteWindow) self.text.delete('1.0', 'end') @@ -196,11 +196,11 @@ def make(): return Mock(spec=acw.AutoCompleteWindow) self.text.delete('1.0', 'end') # Test with blank will fail. - self.assertFalse(acp.open_completions(False, True, True)) + self.assertFalse(acp.open_completions(ac.TAB)) # Test with only string quote will fail. self.text.insert('1.0', '"') - self.assertFalse(acp.open_completions(False, True, True)) + self.assertFalse(acp.open_completions(ac.TAB)) self.text.delete('1.0', 'end') def test_fetch_completions(self): @@ -211,19 +211,19 @@ def test_fetch_completions(self): # and a small list containing files that do not start with '.'. acp = self.autocomplete small, large = acp.fetch_completions( - '', ac.COMPLETE_ATTRIBUTES) + '', ac.ATTRS) if __main__.__file__ != ac.__file__: self.assertNotIn('AutoComplete', small) # See issue 36405. # Test attributes - s, b = acp.fetch_completions('', ac.COMPLETE_ATTRIBUTES) + s, b = acp.fetch_completions('', ac.ATTRS) self.assertLess(len(small), len(large)) self.assertTrue(all(filter(lambda x: x.startswith('_'), s))) self.assertTrue(any(filter(lambda x: x.startswith('_'), b))) # Test smalll should respect to __all__. with patch.dict('__main__.__dict__', {'__all__': ['a', 'b']}): - s, b = acp.fetch_completions('', ac.COMPLETE_ATTRIBUTES) + s, b = acp.fetch_completions('', ac.ATTRS) self.assertEqual(s, ['a', 'b']) self.assertIn('__name__', b) # From __main__.__dict__ self.assertIn('sum', b) # From __main__.__builtins__.__dict__ @@ -232,7 +232,7 @@ def test_fetch_completions(self): mock = Mock() mock._private = Mock() with patch.dict('__main__.__dict__', {'foo': mock}): - s, b = acp.fetch_completions('foo', ac.COMPLETE_ATTRIBUTES) + s, b = acp.fetch_completions('foo', ac.ATTRS) self.assertNotIn('_private', s) self.assertIn('_private', b) self.assertEqual(s, [i for i in sorted(dir(mock)) if i[:1] != '_']) @@ -246,11 +246,11 @@ def _listdir(path): return ['monty', 'python', '.hidden'] with patch.object(os, 'listdir', _listdir): - s, b = acp.fetch_completions('', ac.COMPLETE_FILES) + s, b = acp.fetch_completions('', ac.FILES) self.assertEqual(s, ['bar', 'foo']) self.assertEqual(b, ['.hidden', 'bar', 'foo']) - s, b = acp.fetch_completions('~', ac.COMPLETE_FILES) + s, b = acp.fetch_completions('~', ac.FILES) self.assertEqual(s, ['monty', 'python']) self.assertEqual(b, ['.hidden', 'monty', 'python']) From 8c1e8a4fb649c71c676946251c25b34e01b5e4fc Mon Sep 17 00:00:00 2001 From: Terry Jan Reedy Date: Tue, 2 Apr 2019 01:32:04 -0400 Subject: [PATCH 05/10] Increase coverage to 93% More open_completions. --- Lib/idlelib/autocomplete.py | 6 +- Lib/idlelib/idle_test/test_autocomplete.py | 68 +++++++++++++++------- 2 files changed, 51 insertions(+), 23 deletions(-) diff --git a/Lib/idlelib/autocomplete.py b/Lib/idlelib/autocomplete.py index 8c4ca2383a2344..c08ebed770ba49 100644 --- a/Lib/idlelib/autocomplete.py +++ b/Lib/idlelib/autocomplete.py @@ -132,11 +132,11 @@ def open_completions(self, args): while i and (curline[i-1] in ID_CHARS or ord(curline[i-1]) > 127): i -= 1 comp_start = curline[i:j] - if i and curline[i-1] == '.': + if i and curline[i-1] == '.': # Need object with attributes. hp.set_index("insert-%dc" % (len(curline)-(i-1))) comp_what = hp.get_expression() - if not comp_what or \ - (not evalfuncs and comp_what.find('(') != -1): + if (not comp_what or + (not evalfuncs and comp_what.find('(') != -1)): return None else: comp_what = "" diff --git a/Lib/idlelib/idle_test/test_autocomplete.py b/Lib/idlelib/idle_test/test_autocomplete.py index cc1148b4b4b47f..d67a3e92e1323f 100644 --- a/Lib/idlelib/idle_test/test_autocomplete.py +++ b/Lib/idlelib/idle_test/test_autocomplete.py @@ -1,4 +1,4 @@ -"Test autocomplete, coverage 87%." +"Test autocomplete, coverage 93%." import unittest from unittest.mock import Mock, patch @@ -151,10 +151,8 @@ def test_delayed_open_completions(self): acp = self.autocomplete o_c = Func() acp.open_completions = o_c - self.text.delete('1.0', 'end') self.text.insert('1.0', '"dict.') - # Set autocomplete._delayed_completion_id to None. # Text index changed, don't call open_completions. acp._delayed_completion_id = 'after' @@ -168,39 +166,69 @@ def test_delayed_open_completions(self): acp._delayed_open_completions((1, 2, 3, ac.FILES)) self.assertEqual(acp.open_completions.args[0], (1, 2, 3, ac.FILES)) + def test_oc_cancel_comment(self): + none = self.assertIsNone + acp = self.autocomplete + + # Comment is in neither code or string. + acp._delayed_completion_id = 'after' + after = Func(result='after') + acp.text.after_cancel = after + self.text.insert(1.0, '# comment') + none(acp.open_completions(ac.TAB)) # From 'else' after 'elif'. + none(acp._delayed_completion_id) + + def test_oc_no_list(self): + acp = self.autocomplete + fetch = Func(result=([],[])) + acp.fetch_completions = fetch + self.text.insert('1.0', 'object') + self.assertIsNone(acp.open_completions(ac.TAB)) + self.text.insert('insert', '.') + self.assertIsNone(acp.open_completions(ac.TAB)) + self.assertEqual(fetch.called, 2) + + def test_open_completions_none(self): - # Test 4 None returns and delayed id. + # Test other two None returns. none = self.assertIsNone acp = self.autocomplete - self.text.insert('1.0', 'int()') + # No object for attributes or need call not allowed. + self.text.insert(1.0, '.') + none(acp.open_completions(ac.TAB)) + self.text.insert('insert', ' int().') none(acp.open_completions(ac.TAB)) + # Blank or quote trigger 'if complete ...'. + self.text.delete(1.0, 'end') + self.assertFalse(acp.open_completions(ac.TAB)) + self.text.insert('1.0', '"') + self.assertFalse(acp.open_completions(ac.TAB)) + self.text.delete('1.0', 'end') + + class dummy_acw(): + __init__ = Func() + show_window = Func(result=False) + hide_window = Func() + def test_open_completions(self): - # Test completions of files and attributes as well as non-completion - # of errors. - # add 're.', others to complete coverage + # Test completions of files and attributes. acp = self.autocomplete - def make(): return Mock(spec=acw.AutoCompleteWindow) - acp._make_autocomplete_window = make + fetch = Func(result=(['tem'],['tem', '_tem'])) + acp.fetch_completions = fetch + def make_acw(): return self.dummy_acw() + acp._make_autocomplete_window = make_acw self.text.insert('1.0', 'int.') acp.open_completions(ac.TAB) - self.assertIsInstance(acp.autocompletewindow, acw.AutoCompleteWindow) + self.assertIsInstance(acp.autocompletewindow, self.dummy_acw) self.text.delete('1.0', 'end') # Test files. self.text.insert('1.0', '"t') # When run under regrtest, not comp_lists[0] (small) - #self.assertTrue(self.autocomplete.open_completions(False, True, True)) - self.text.delete('1.0', 'end') - - # Test with blank will fail. - self.assertFalse(acp.open_completions(ac.TAB)) - - # Test with only string quote will fail. - self.text.insert('1.0', '"') - self.assertFalse(acp.open_completions(ac.TAB)) + self.assertTrue(acp.open_completions(ac.TAB)) self.text.delete('1.0', 'end') def test_fetch_completions(self): From 155bc39576cc1fdf6cac6ab738e5246eaf4e25b6 Mon Sep 17 00:00:00 2001 From: Terry Jan Reedy Date: Wed, 3 Apr 2019 02:43:06 -0400 Subject: [PATCH 06/10] Merge try_open_completions_event and _open_completions_later. Then merge tests. --- Lib/idlelib/autocomplete.py | 15 +++--- Lib/idlelib/idle_test/test_autocomplete.py | 54 +++++++++------------- 2 files changed, 27 insertions(+), 42 deletions(-) diff --git a/Lib/idlelib/autocomplete.py b/Lib/idlelib/autocomplete.py index c08ebed770ba49..c623d45a153423 100644 --- a/Lib/idlelib/autocomplete.py +++ b/Lib/idlelib/autocomplete.py @@ -18,7 +18,7 @@ # EvalFunc, Complete, WantWin, Mode FORCE = True, False, True, None # Control-Space. TAB = False, True, True, None # Tab. -TRY_A = False, False, False, ATTRS # '.' for attributes +TRY_A = False, False, False, ATTRS # '.' for attributes. TRY_F = False, False, False, FILES # '/' in quotes for file name. # This string includes all chars that may be in an identifier. @@ -77,14 +77,11 @@ def try_open_completions_event(self, event=None): "(./) Open completion list after pause with no movement." lastchar = self.text.get("insert-1c") if lastchar in TRIGGERS: - self._open_completions_later( - TRY_A if lastchar == "." else TRY_F) - - def _open_completions_later(self, args): - self._delayed_completion_index = self.text.index("insert") - if self._delayed_completion_id is not None: - self.text.after_cancel(self._delayed_completion_id) - self._delayed_completion_id = self.text.after( + args = TRY_A if lastchar == "." else TRY_F + self._delayed_completion_index = self.text.index("insert") + if self._delayed_completion_id is not None: + self.text.after_cancel(self._delayed_completion_id) + self._delayed_completion_id = self.text.after( self.popupwait, self._delayed_open_completions, args) def _delayed_open_completions(self, args): diff --git a/Lib/idlelib/idle_test/test_autocomplete.py b/Lib/idlelib/idle_test/test_autocomplete.py index d67a3e92e1323f..3534a910611d9d 100644 --- a/Lib/idlelib/idle_test/test_autocomplete.py +++ b/Lib/idlelib/idle_test/test_autocomplete.py @@ -99,52 +99,40 @@ def test_autocomplete_event(self): def test_try_open_completions_event(self): Equal = self.assertEqual + text = self.text acp = self.autocomplete trycompletions = acp.try_open_completions_event - o_c_l = Func() - acp._open_completions_later = o_c_l - - # If no text or trigger, _open_completions_later not called. - trycompletions() - Equal(o_c_l.called, 0) - self.text.insert('1.0', 're') - trycompletions() - Equal(o_c_l.called, 0) + after = Func(result='after1') + acp.text.after = after - # _open_completions_later called with ATTRS. - self.text.insert('insert', 're.') + # If no text or trigger, after not called. trycompletions() - Equal(o_c_l.args[0], ac.TRY_A) - - # _open_completions_later called with FILES. - self.text.delete('1.0', 'end') - self.text.insert('1.0', '"./Lib/') + Equal(after.called, 0) + text.insert('1.0', 're') trycompletions() - Equal(o_c_l.args[0], ac.TRY_F) + Equal(after.called, 0) - def test_open_completions_later(self): - Equal = self.assertEqual - - # Test after call and autocomplete._delayed_completion_id. - acp = self.autocomplete - after = Func(result='after1') - acp.text.after = after + # Attribute needed, no existing callback. + text.insert('insert', ' re.') acp._delayed_completion_id = None - acp._open_completions_later('dummy1') + trycompletions() + Equal(acp._delayed_completion_index, text.index('insert')) Equal(after.args, - (acp.popupwait, acp._delayed_open_completions, 'dummy1')) + (acp.popupwait, acp._delayed_open_completions, ac.TRY_A)) cb1 = acp._delayed_completion_id Equal(cb1, 'after1') - # Test that cb1 is cancelled and cb2 is new. + # File needed, existing callback cancelled. + text.insert('insert', ' "./Lib/') after.result = 'after2' - acp.text.after_cancel = Func() - acp._open_completions_later('dummy2') + cancel = Func() + acp.text.after_cancel = cancel + trycompletions() + Equal(acp._delayed_completion_index, text.index('insert')) + Equal(cancel.args, (cb1,)) Equal(after.args, - (acp.popupwait, acp._delayed_open_completions, 'dummy2')) - Equal(self.text.after_cancel.args, (cb1,)) - cb2 = acp._delayed_completion_id - Equal(cb2, 'after2') + (acp.popupwait, acp._delayed_open_completions, ac.TRY_F)) + Equal(acp._delayed_completion_id, 'after2') def test_delayed_open_completions(self): Equal = self.assertEqual From d5cf07aee0284c512f8d613b9800c9e1b0526b0b Mon Sep 17 00:00:00 2001 From: Terry Jan Reedy Date: Sun, 4 Aug 2019 17:25:48 -0400 Subject: [PATCH 07/10] blurb --- Misc/NEWS.d/next/IDLE/2019-08-04-17-10-01.bpo-36419.TJZqOc.rst | 1 + 1 file changed, 1 insertion(+) create mode 100644 Misc/NEWS.d/next/IDLE/2019-08-04-17-10-01.bpo-36419.TJZqOc.rst diff --git a/Misc/NEWS.d/next/IDLE/2019-08-04-17-10-01.bpo-36419.TJZqOc.rst b/Misc/NEWS.d/next/IDLE/2019-08-04-17-10-01.bpo-36419.TJZqOc.rst new file mode 100644 index 00000000000000..a44fd3b59b4f9f --- /dev/null +++ b/Misc/NEWS.d/next/IDLE/2019-08-04-17-10-01.bpo-36419.TJZqOc.rst @@ -0,0 +1 @@ +IDLE - Refactor autocompete and improve testing. From d60abaa30f0b8c26fb33c060f1669526c9c5587d Mon Sep 17 00:00:00 2001 From: Terry Jan Reedy Date: Sun, 4 Aug 2019 17:33:12 -0400 Subject: [PATCH 08/10] Remove comment I no longer understand. Appears unneeded as test passed with regrtest and comment marker was already removed. --- Lib/idlelib/idle_test/test_autocomplete.py | 1 - 1 file changed, 1 deletion(-) diff --git a/Lib/idlelib/idle_test/test_autocomplete.py b/Lib/idlelib/idle_test/test_autocomplete.py index e2e581faf19f09..07046b20868e9b 100644 --- a/Lib/idlelib/idle_test/test_autocomplete.py +++ b/Lib/idlelib/idle_test/test_autocomplete.py @@ -215,7 +215,6 @@ def make_acw(): return self.dummy_acw() # Test files. self.text.insert('1.0', '"t') - # When run under regrtest, not comp_lists[0] (small) self.assertTrue(acp.open_completions(ac.TAB)) self.text.delete('1.0', 'end') From 09c6b05f8958a11b9a2da62349f37a1b07bf0d74 Mon Sep 17 00:00:00 2001 From: Terry Jan Reedy Date: Sun, 4 Aug 2019 17:40:45 -0400 Subject: [PATCH 09/10] Better and more consistent abbreviations. --- Lib/idlelib/idle_test/test_autocomplete.py | 30 +++++++++++----------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/Lib/idlelib/idle_test/test_autocomplete.py b/Lib/idlelib/idle_test/test_autocomplete.py index 07046b20868e9b..bc50555e7424ff 100644 --- a/Lib/idlelib/idle_test/test_autocomplete.py +++ b/Lib/idlelib/idle_test/test_autocomplete.py @@ -61,10 +61,10 @@ def test_remove_autocomplete_window(self): def test_force_open_completions_event(self): # Call _open_completions and break. acp = self.autocomplete - o_cs = Func() - acp.open_completions = o_cs + open_c = Func() + acp.open_completions = open_c self.assertEqual(acp.force_open_completions_event('event'), 'break') - self.assertEqual(o_cs.args[0], ac.FORCE) + self.assertEqual(open_c.args[0], ac.FORCE) def test_autocomplete_event(self): Equal = self.assertEqual @@ -82,20 +82,20 @@ def test_autocomplete_event(self): # If active autocomplete window, complete() and 'break'. self.text.insert('1.0', 're.') - acp.autocompletewindow = m = Mock() - m.is_active = Mock(return_value=True) + acp.autocompletewindow = mock = Mock() + mock.is_active = Mock(return_value=True) Equal(acp.autocomplete_event(ev), 'break') - m.complete.assert_called_once() + mock.complete.assert_called_once() acp.autocompletewindow = None # If no active autocomplete window, open_completions(), None/break. - o_cs = Func(result=False) - acp.open_completions = o_cs + open_c = Func(result=False) + acp.open_completions = open_c Equal(acp.autocomplete_event(ev), None) - Equal(o_cs.args[0], ac.TAB) - o_cs.result = True + Equal(open_c.args[0], ac.TAB) + open_c.result = True Equal(acp.autocomplete_event(ev), 'break') - Equal(o_cs.args[0], ac.TAB) + Equal(open_c.args[0], ac.TAB) def test_try_open_completions_event(self): Equal = self.assertEqual @@ -137,8 +137,8 @@ def test_try_open_completions_event(self): def test_delayed_open_completions(self): Equal = self.assertEqual acp = self.autocomplete - o_c = Func() - acp.open_completions = o_c + open_c = Func() + acp.open_completions = open_c self.text.insert('1.0', '"dict.') # Set autocomplete._delayed_completion_id to None. @@ -147,12 +147,12 @@ def test_delayed_open_completions(self): acp._delayed_completion_index = self.text.index('insert+1c') acp._delayed_open_completions('dummy') self.assertIsNone(acp._delayed_completion_id) - Equal(acp.open_completions.called, 0) + Equal(open_c.called, 0) # Text index unchanged, call open_completions. acp._delayed_completion_index = self.text.index('insert') acp._delayed_open_completions((1, 2, 3, ac.FILES)) - self.assertEqual(acp.open_completions.args[0], (1, 2, 3, ac.FILES)) + self.assertEqual(open_c.args[0], (1, 2, 3, ac.FILES)) def test_oc_cancel_comment(self): none = self.assertIsNone From 019ae8958ab97ec6dba108df2b0807d69b89c95c Mon Sep 17 00:00:00 2001 From: Terry Jan Reedy Date: Sun, 4 Aug 2019 18:04:16 -0400 Subject: [PATCH 10/10] whitespace --- Lib/idlelib/idle_test/test_autocomplete.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lib/idlelib/idle_test/test_autocomplete.py b/Lib/idlelib/idle_test/test_autocomplete.py index bc50555e7424ff..2c478cd5c2a146 100644 --- a/Lib/idlelib/idle_test/test_autocomplete.py +++ b/Lib/idlelib/idle_test/test_autocomplete.py @@ -129,7 +129,7 @@ def test_try_open_completions_event(self): acp.text.after_cancel = cancel trycompletions() Equal(acp._delayed_completion_index, text.index('insert')) - Equal(cancel.args, (cb1,)) + Equal(cancel.args, (cb1,)) Equal(after.args, (acp.popupwait, acp._delayed_open_completions, ac.TRY_F)) Equal(acp._delayed_completion_id, 'after2')