[Python-checkins] cpython (3.3): Issue #18988: The "Tab" key now works when a word is already autocompleted.

Wed Sep 11 22:00:17 CEST 2013

http://hg.python.org/cpython/rev/c882395e8ed8
changeset: 85657:c882395e8ed8
branch: 3.3
parent: 85654:373907ca13e0
user: Serhiy Storchaka <storchaka at gmail.com>
date: Wed Sep 11 22:46:27 2013 +0300
summary:
 Issue #18988: The "Tab" key now works when a word is already autocompleted.
files:
 Lib/idlelib/AutoComplete.py | 9 +++------
 Lib/idlelib/AutoCompleteWindow.py | 3 ++-
 Misc/NEWS | 2 ++
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Lib/idlelib/AutoComplete.py b/Lib/idlelib/AutoComplete.py
--- a/Lib/idlelib/AutoComplete.py
+++ b/Lib/idlelib/AutoComplete.py
@@ -160,12 +160,9 @@
 if not comp_lists[0]:
 return
 self.autocompletewindow = self._make_autocomplete_window()
- self.autocompletewindow.show_window(comp_lists,
- "insert-%dc" % len(comp_start),
- complete,
- mode,
- userWantsWin)
- return True
+ return not self.autocompletewindow.show_window(
+ comp_lists, "insert-%dc" % len(comp_start),
+ complete, mode, userWantsWin)
 
 def fetch_completions(self, what, mode):
 """Return a pair of lists of completions for something. The first list
diff --git a/Lib/idlelib/AutoCompleteWindow.py b/Lib/idlelib/AutoCompleteWindow.py
--- a/Lib/idlelib/AutoCompleteWindow.py
+++ b/Lib/idlelib/AutoCompleteWindow.py
@@ -157,13 +157,14 @@
 self.start = self.widget.get(self.startindex, "insert")
 if complete:
 completed = self._complete_string(self.start)
+ start = self.start
 self._change_start(completed)
 i = self._binary_search(completed)
 if self.completions[i] == completed and \
 (i == len(self.completions)-1 or
 self.completions[i+1][:len(completed)] != completed):
 # There is exactly one matching completion
- return
+ return completed == start
 self.userwantswindow = userWantsWin
 self.lasttypedstart = self.start
 
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -293,6 +293,8 @@
 IDLE
 ----
 
+- Issue #18988: The "Tab" key now works when a word is already autocompleted.
+
 - Issue #18489: Add tests for SearchEngine. Original patch by Phil Webster.
 
 - Issue #18429: Format / Format Paragraph, now works when comment blocks
-- 
Repository URL: http://hg.python.org/cpython
