Skip to content
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

Jump to bottom

fix completer deletting newline #2101

Merged
merged 1 commit into from
Jul 5, 2012
Merged

fix completer deletting newline #2101

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 9 additions & 8 deletions IPython/frontend/qt/console/console_widget.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -884,15 +884,16 @@ def _clear_temporary_buffer(self):
the prompt region.
"""
# Select and remove all text below the input buffer.
_temp_buffer_filled = False
cursor = self._get_prompt_cursor()
prompt = self._continuation_prompt.lstrip()
while cursor.movePosition(QtGui.QTextCursor.NextBlock):
temp_cursor = QtGui.QTextCursor(cursor)
temp_cursor.select(QtGui.QTextCursor.BlockUnderCursor)
text = temp_cursor.selection().toPlainText().lstrip()
if not text.startswith(prompt):
break
if(self._temp_buffer_filled):
self._temp_buffer_filled = False
while cursor.movePosition(QtGui.QTextCursor.NextBlock):
temp_cursor = QtGui.QTextCursor(cursor)
temp_cursor.select(QtGui.QTextCursor.BlockUnderCursor)
text = temp_cursor.selection().toPlainText().lstrip()
if not text.startswith(prompt):
break
else:
# We've reached the end of the input buffer and no text follows.
return
Expand Down Expand Up @@ -945,7 +946,7 @@ def _fill_temporary_buffer(self, cursor, text, html=False):
self._control.moveCursor(QtGui.QTextCursor.End)
self._control.setTextCursor(cursor)

_temp_buffer_filled = True
self._temp_buffer_filled = True


def _context_menu_make(self, pos):
Expand Down