bpo-39781: Do not jump when select in IDLE codecontext (GH-18683)
Previously, the button-up part of selecting with a mouse was treated as a click
that meant 'jump' to this line, which modified the context and undid the selection
(cherry picked from commit c705fd1e89
)
Co-authored-by: Terry Jan Reedy <tjreedy@udel.edu>
This commit is contained in:
parent
3bf9de2fb9
commit
f4198aee4c
|
@ -3,6 +3,8 @@ Released on 2019-12-16?
|
|||
======================================
|
||||
|
||||
|
||||
bpo-39781: Selecting code context lines no longer causes a jump.
|
||||
|
||||
bpo-39663: Add tests for pyparse find_good_parse_start().
|
||||
|
||||
bpo-39600: Remove duplicate font names from configuration list.
|
||||
|
|
|
@ -7,7 +7,6 @@ the lines which contain the block opening keywords, e.g. 'if', for the
|
|||
enclosing block. The number of hint lines is determined by the maxlines
|
||||
variable in the codecontext section of config-extensions.def. Lines which do
|
||||
not open blocks are not shown in the context hints pane.
|
||||
|
||||
"""
|
||||
import re
|
||||
from sys import maxsize as INFINITY
|
||||
|
@ -17,8 +16,8 @@ from tkinter.constants import NSEW, SUNKEN
|
|||
|
||||
from idlelib.config import idleConf
|
||||
|
||||
BLOCKOPENERS = {"class", "def", "elif", "else", "except", "finally", "for",
|
||||
"if", "try", "while", "with", "async"}
|
||||
BLOCKOPENERS = {'class', 'def', 'if', 'elif', 'else', 'while', 'for',
|
||||
'try', 'except', 'finally', 'with', 'async'}
|
||||
|
||||
|
||||
def get_spaces_firstword(codeline, c=re.compile(r"^(\s*)(\w*)")):
|
||||
|
@ -84,7 +83,7 @@ class CodeContext:
|
|||
if self.t1 is not None:
|
||||
try:
|
||||
self.text.after_cancel(self.t1)
|
||||
except tkinter.TclError:
|
||||
except tkinter.TclError: # pragma: no cover
|
||||
pass
|
||||
self.t1 = None
|
||||
|
||||
|
@ -112,7 +111,7 @@ class CodeContext:
|
|||
padx += widget.tk.getint(info['padx'])
|
||||
padx += widget.tk.getint(widget.cget('padx'))
|
||||
border += widget.tk.getint(widget.cget('border'))
|
||||
self.context = tkinter.Text(
|
||||
context = self.context = tkinter.Text(
|
||||
self.editwin.text_frame,
|
||||
height=1,
|
||||
width=1, # Don't request more than we get.
|
||||
|
@ -120,11 +119,11 @@ class CodeContext:
|
|||
padx=padx, border=border, relief=SUNKEN, state='disabled')
|
||||
self.update_font()
|
||||
self.update_highlight_colors()
|
||||
self.context.bind('<ButtonRelease-1>', self.jumptoline)
|
||||
context.bind('<ButtonRelease-1>', self.jumptoline)
|
||||
# Get the current context and initiate the recurring update event.
|
||||
self.timer_event()
|
||||
# Grid the context widget above the text widget.
|
||||
self.context.grid(row=0, column=1, sticky=NSEW)
|
||||
context.grid(row=0, column=1, sticky=NSEW)
|
||||
|
||||
line_number_colors = idleConf.GetHighlight(idleConf.CurrentTheme(),
|
||||
'linenumber')
|
||||
|
@ -215,18 +214,25 @@ class CodeContext:
|
|||
self.context['state'] = 'disabled'
|
||||
|
||||
def jumptoline(self, event=None):
|
||||
"Show clicked context line at top of editor."
|
||||
lines = len(self.info)
|
||||
if lines == 1: # No context lines are showing.
|
||||
newtop = 1
|
||||
else:
|
||||
# Line number clicked.
|
||||
contextline = int(float(self.context.index('insert')))
|
||||
# Lines not displayed due to maxlines.
|
||||
offset = max(1, lines - self.context_depth) - 1
|
||||
newtop = self.info[offset + contextline][0]
|
||||
self.text.yview(f'{newtop}.0')
|
||||
self.update_code_context()
|
||||
""" Show clicked context line at top of editor.
|
||||
|
||||
If a selection was made, don't jump; allow copying.
|
||||
If no visible context, show the top line of the file.
|
||||
"""
|
||||
try:
|
||||
self.context.index("sel.first")
|
||||
except tkinter.TclError:
|
||||
lines = len(self.info)
|
||||
if lines == 1: # No context lines are showing.
|
||||
newtop = 1
|
||||
else:
|
||||
# Line number clicked.
|
||||
contextline = int(float(self.context.index('insert')))
|
||||
# Lines not displayed due to maxlines.
|
||||
offset = max(1, lines - self.context_depth) - 1
|
||||
newtop = self.info[offset + contextline][0]
|
||||
self.text.yview(f'{newtop}.0')
|
||||
self.update_code_context()
|
||||
|
||||
def timer_event(self):
|
||||
"Event on editor text widget triggered every UPDATEINTERVAL ms."
|
||||
|
|
|
@ -332,6 +332,14 @@ class CodeContextTest(unittest.TestCase):
|
|||
jump()
|
||||
eq(cc.topvisible, 8)
|
||||
|
||||
# Context selection stops jump.
|
||||
cc.text.yview('5.0')
|
||||
cc.update_code_context()
|
||||
cc.context.tag_add('sel', '1.0', '2.0')
|
||||
cc.context.mark_set('insert', '1.0')
|
||||
jump() # Without selection, to line 2.
|
||||
eq(cc.topvisible, 5)
|
||||
|
||||
@mock.patch.object(codecontext.CodeContext, 'update_code_context')
|
||||
def test_timer_event(self, mock_update):
|
||||
# Ensure code context is not active.
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
Selecting code context lines no longer causes a jump.
|
Loading…
Reference in New Issue