Skip to content

gh-104719: IDLE - test existence of all tokenize references. #104767

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
terryjreedy merged 14 commits into from
May 24, 2023
Merged

gh-104719: IDLE - test existence of all tokenize references. #104767

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
446ddc4
gh-104719: IDLE - test editor.IndentSearcher
terryjreedy May 22, 2023
cb348d8
Add IndentSearcher test.
terryjreedy May 22, 2023
1338a2a
Add new coverage and generate TokenError.
terryjreedy May 22, 2023
d3bac6c
Add minimal test for other tokenize names.
terryjreedy May 22, 2023
7828a83
Merge branch 'main' into toktest
Yhg1s May 22, 2023
c6f59fb
Update Lib/idlelib/editor.py
terryjreedy May 23, 2023
0a99cf0
Update Lib/idlelib/idle_test/test_iomenu.py
terryjreedy May 23, 2023
ec7388e
Add blurb and IDLE news.
terryjreedy May 23, 2023
77f66be
Merge remote-tracking branch 'upstream/main' into toktest
terryjreedy May 23, 2023
7eb9e3c
Update merge.
terryjreedy May 23, 2023
698d55d
Merge branch 'toktest' of https://github.com/terryjreedy/cpython into…
terryjreedy May 23, 2023
bc197be
Revert "Update merge."
terryjreedy May 23, 2023
1d616cc
Merge branch 'main' into toktest
terryjreedy May 23, 2023
d13b811
Merge branch 'main' into toktest
AlexWaygood May 24, 2023
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
Prev Previous commit
Next Next commit
Add IndentSearcher test.
  • Loading branch information
@terryjreedy
terryjreedy committed May 22, 2023
commit cb348d8eb8d2258885452283eee55ec691efca51
3 changes: 1 addition & 2 deletions Lib/idlelib/editor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1613,7 +1613,6 @@ class IndentSearcher:

def __init__(self, text):
self.text = text
self.tabwidth = tabwidth
self.i = self.finished = 0
self.blkopenline = self.indentedline = None

Expand Down Expand Up @@ -1642,7 +1641,7 @@ def tokeneater(self, type, token, start, end, line,
def run(self):
"""Return 2 lines containing block opener and and indent.

Either or both may instead be None.
Either the indent line or both may be None.
"""
try:
tokens = tokenize.generate_tokens(self.readline)
Expand Down
33 changes: 31 additions & 2 deletions Lib/idlelib/idle_test/test_editor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import unittest
from collections import namedtuple
from test.support import requires
from tkinter import Tk
from tkinter import Tk, Text

Editor = editor.EditorWindow

Expand All @@ -31,7 +31,7 @@ def test_init(self):
e._close()


class TestGetLineIndent(unittest.TestCase):
class GetLineIndentTest(unittest.TestCase):
def test_empty_lines(self):
for tabwidth in [1, 2, 4, 6, 8]:
for line in ['', '\n']:
Expand Down Expand Up @@ -181,6 +181,35 @@ def test_indent_and_newline_event(self):
eq(get('1.0', 'end'), ' def f1(self, a,\n \n return a + b\n')


class IndentSearcherTest(unittest.TestCase):

@classmethod
def setUpClass(cls):
requires('gui')
cls.root = Tk()
cls.root.withdraw()
cls.text = Text(cls.root)

@classmethod
def tearDownClass(cls):
cls.root.destroy()
del cls.root

def test_searcher(self):
text = self.text
searcher = (self.text)
test_info = (# text, (block, indent))
("", (None, None)),
("if 1:\n", ('if 1:\n', None)),
("if 1:\n 2\n 3\n", ('if 1:\n', ' 2\n')),
)
for code, expected_pair in test_info:
with self.subTest(code=code):
insert(text, code)
actual_pair = editor.IndentSearcher(text).run()
self.assertEqual(actual_pair, expected_pair)


class RMenuTest(unittest.TestCase):

@classmethod
Expand Down