Skip to content

Python Console: Fix handling of the tab key in the input pane (#11532) #11936

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
michaelDCurran merged 2 commits into from
Jan 21, 2021
Merged

Python Console: Fix handling of the tab key in the input pane (#11532) #11936

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9677bf8
Python Console: Fix handling of the tab key in the input pane (#11532)
JulienCochuyt Dec 13, 2020
fd6f158
Python Console: Tab-completion: Handle selection
JulienCochuyt Dec 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions source/pythonConsole.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,9 +306,11 @@ def historyMove(self, movement):
return True

RE_COMPLETE_UNIT = re.compile(r"[\w.]*$")

def complete(self):
textBeforeCursor = self.inputCtrl.GetRange(0, self.inputCtrl.GetSelection()[0])
try:
original = self.RE_COMPLETE_UNIT.search(self.inputCtrl.GetValue()).group(0)
original = self.RE_COMPLETE_UNIT.search(textBeforeCursor).group(0)
except AttributeError:
return False

Expand Down Expand Up @@ -373,16 +375,20 @@ def _insertCompletion(self, original, completed):
insert = completed[len(original):]
if not insert:
return
self.inputCtrl.SetValue(self.inputCtrl.GetValue() + insert)
inputCtrl = self.inputCtrl
selStartPos, selEndPos = inputCtrl.GetSelection()
prefix = inputCtrl.GetRange(0, selStartPos)
suffix = inputCtrl.GetRange(selEndPos, inputCtrl.GetLastPosition())
inputCtrl.SetValue(prefix + insert + suffix)
queueHandler.queueFunction(queueHandler.eventQueue, speech.speakText, insert)
self.inputCtrl.SetInsertionPointEnd()
inputCtrl.SetInsertionPoint(selStartPos + len(insert))

def onInputChar(self, evt):
key = evt.GetKeyCode()

if key == wx.WXK_TAB:
line = self.inputCtrl.GetValue()
if line and not line.isspace():
textBeforeCursor = self.inputCtrl.GetRange(0, self.inputCtrl.GetSelection()[0])
if textBeforeCursor and not textBeforeCursor.isspace():
if not self.complete():
wx.Bell()
return
Expand Down