Skip to content

bpo-38862: IDLE Strip Trailing Whitespace fixes end newlines #17366

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 9 commits into from
Nov 24, 2019
Merged

bpo-38862: IDLE Strip Trailing Whitespace fixes end newlines #17366

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
45b6e3a
bpo-38862: IDLE Strip Trailing Whitespace fixes end newlines
terryjreedy Nov 24, 2019
db5d873
Add text parameter to mock Editor so a tk Text can be passed in.
terryjreedy Nov 24, 2019
f4dcabc
Add new code and test for fixing endlines.
terryjreedy Nov 24, 2019
9a4d241
idlelib NEWS.txt entry
terryjreedy Nov 24, 2019
fff243b
Update IDLE doc and help.html.
terryjreedy Nov 24, 2019
b2b32f4
Merge remote-tracking branch 'upstream/master' into endlines
terryjreedy Nov 24, 2019
3fc2659
Be explicit on slice bounds.
terryjreedy Nov 24, 2019
d13fc65
Remove newline addition.
terryjreedy Nov 24, 2019
636c15f
Change doc and news.
terryjreedy Nov 24, 2019
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
Remove newline addition.
  • Loading branch information
@terryjreedy
terryjreedy committed Nov 24, 2019
commit d13fc65b9c34ceae9ced6f8735ee9aab5db252b1
22 changes: 9 additions & 13 deletions Lib/idlelib/format.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,19 +408,15 @@ def do_rstrip(self, event=None):
if cut < raw:
text.delete('%i.%i' % (cur, cut), '%i.end' % cur)

# 'Empty' file has tk guard newline at index 'end-1c' = '1.0'.
# Only adjust ending newlines for non-empty non-shell window.
if (text.index('end-1c') > '1.0'
and not hasattr(self.editwin, 'interp')):
if text.get('end-2c') != '\n': # No user endline, add one.
text.insert('end-1c', '\n')
else: # Delete extra user endlines.
while (text.index('end-1c') > '1.0' # Stop when empty.
and text.get('end-3c') == '\n'):
text.delete('end-3c')
# Because tk indexes are slice indexes and never raise,
# a file with only newlines will be emptied.
# patchcheck.py does the same.
if (text.get('end-2c') == '\n' # File ends with at least 1 newline;
and not hasattr(self.editwin, 'interp')): # & is not Shell.
# Delete extra user endlines.
while (text.index('end-1c') > '1.0' # Stop if file empty.
and text.get('end-3c') == '\n'):
text.delete('end-3c')
# Because tk indexes are slice indexes and never raise,
# a file with only newlines will be emptied.
# patchcheck.py does the same.

undo.undo_block_stop()

Expand Down
14 changes: 7 additions & 7 deletions Lib/idlelib/idle_test/test_format.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -651,15 +651,15 @@ def test_rstrip_lines(self):

def test_rstrip_end(self):
text = self.text
for t in ('', '\n', '\n\n\n'):
with self.subTest(t=t):
text.insert('1.0', t)
for code in ('', '\n', '\n\n\n'):
with self.subTest(code=code):
text.insert('1.0', code)
self.do_rstrip()
self.assertEqual(text.get('1.0','end-1c'), '')
for t in ('a', 'a\n', 'a\n\n', 'a\n\n\n'):
with self.subTest(t=t):
text.delete('1.0', 'end')
text.insert('1.0', t)
for code in ('a\n', 'a\n\n', 'a\n\n\n'):
with self.subTest(code=code):
text.delete('1.0', 'end-1c')
text.insert('1.0', code)
self.do_rstrip()
self.assertEqual(text.get('1.0','end-1c'), 'a\n')

Expand Down