summaryrefslogtreecommitdiffstats
path: root/Lib/idlelib
diff options
context:
space:
mode:
authorCheryl Sabella <cheryl.sabella@gmail.com>2018-06-08 05:21:15 (GMT)
committerTerry Jan Reedy <tjreedy@udel.edu>2018-06-08 05:21:15 (GMT)
commit041272b657867f5bec925b19aabf23944125d49b (patch)
tree37076943947e50fa8d30193e208b94d12a2cfa59 /Lib/idlelib
parent4aa3006619392438b0775a2f488bbe9e7a22c468 (diff)
downloadcpython-041272b657867f5bec925b19aabf23944125d49b.zip
cpython-041272b657867f5bec925b19aabf23944125d49b.tar.gz
cpython-041272b657867f5bec925b19aabf23944125d49b.tar.bz2
bpo-33768: IDLE: Clicking on code context line moves it to top of editor (GH-7411)
Diffstat (limited to 'Lib/idlelib')
-rw-r--r--Lib/idlelib/codecontext.py15
-rw-r--r--Lib/idlelib/idle_test/test_codecontext.py34
2 files changed, 49 insertions, 0 deletions
diff --git a/Lib/idlelib/codecontext.py b/Lib/idlelib/codecontext.py
index 73d3ba6..8b378bc 100644
--- a/Lib/idlelib/codecontext.py
+++ b/Lib/idlelib/codecontext.py
@@ -117,6 +117,7 @@ class CodeContext:
height=1,
width=1, # Don't request more than we get.
padx=padx, border=border, relief=SUNKEN, state='disabled')
+ self.context.bind('<ButtonRelease-1>', self.jumptoline)
# Pack the context widget before and above the text_frame widget,
# thus ensuring that it will appear directly above text_frame.
self.context.pack(side=TOP, fill=X, expand=False,
@@ -196,6 +197,20 @@ class CodeContext:
self.context.insert('end', '\n'.join(context_strings[showfirst:]))
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()
+
def timer_event(self):
"Event on editor text widget triggered every UPDATEINTERVAL ms."
if self.context:
diff --git a/Lib/idlelib/idle_test/test_codecontext.py b/Lib/idlelib/idle_test/test_codecontext.py
index 07e10b6..2e59b85 100644
--- a/Lib/idlelib/idle_test/test_codecontext.py
+++ b/Lib/idlelib/idle_test/test_codecontext.py
@@ -72,6 +72,7 @@ class CodeContextTest(unittest.TestCase):
del cls.root
def setUp(self):
+ self.text.yview(0)
self.cc = codecontext.CodeContext(self.editor)
def tearDown(self):
@@ -264,6 +265,39 @@ class CodeContextTest(unittest.TestCase):
# context_depth is 1.
eq(cc.context.get('1.0', 'end-1c'), ' def __init__(self, a, b):')
+ def test_jumptoline(self):
+ eq = self.assertEqual
+ cc = self.cc
+ jump = cc.jumptoline
+
+ if not cc.context:
+ cc.toggle_code_context_event()
+
+ # Empty context.
+ cc.text.yview(f'{2}.0')
+ cc.update_code_context()
+ eq(cc.topvisible, 2)
+ cc.context.mark_set('insert', '1.5')
+ jump()
+ eq(cc.topvisible, 1)
+
+ # 4 lines of context showing.
+ cc.text.yview(f'{12}.0')
+ cc.update_code_context()
+ eq(cc.topvisible, 12)
+ cc.context.mark_set('insert', '3.0')
+ jump()
+ eq(cc.topvisible, 8)
+
+ # More context lines than limit.
+ cc.context_depth = 2
+ cc.text.yview(f'{12}.0')
+ cc.update_code_context()
+ eq(cc.topvisible, 12)
+ cc.context.mark_set('insert', '1.0')
+ jump()
+ eq(cc.topvisible, 8)
+
@mock.patch.object(codecontext.CodeContext, 'update_code_context')
def test_timer_event(self, mock_update):
# Ensure code context is not active.