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

Text area undo redo #4124

Merged
merged 49 commits into from
Feb 14, 2024
Merged

Text area undo redo #4124

merged 49 commits into from
Feb 14, 2024

Conversation

darrenburns
Copy link
Member

@darrenburns darrenburns commented Feb 5, 2024 •
edited
Loading

Marking this as ready to review, but still two things remaining that I know of: updating the changelog, and adding bindings for undo/redo.

darrenburns and others added 30 commits February 1, 2024 11:20
@darrenburns
Initial undo related machinery added to TextArea
4b87dd9
@darrenburns
Initial undo implementation
d548b8d
@darrenburns
Basic undo and redo
4513b15
@darrenburns
Some more fleshing out of undo and redo
e31e49f
@darrenburns
Skeleton code for managing TextArea history
98bb0e4
@darrenburns
Initial implementation of undo & redo checkpointing in TextArea
a9698ab
@darrenburns
Increase checkpoint characters
4d02523
@darrenburns
Restoring the selection in the TextArea and then restoring it on undo
8c66e44
@darrenburns
Adding docstrings to undo_batch and redo_batch in the TextArea
9c7d99b
@darrenburns
Batching edits of the same type
c25f215
@darrenburns
Batching edits of the same type
7d4344d
@darrenburns
Keeping edits containing newlines in their own batch
2512f28
@darrenburns
Checking for newline characters in insertion or replacement during un…
89c5143 
…do checkpoint creation. Updating docstrings in history.py
@darrenburns
Fix mypy warning
630f479
@darrenburns
Performance improvement
4f7eb06
@darrenburns
Merge branch 'main' of github.com:Textualize/textual into text-area-u…
03425dc 
…ndo-redo
@darrenburns
Merge branch 'main' of github.com:Textualize/textual into text-area-u…
fecfa67 
…ndo-redo
@darrenburns
Add history checkpoint on cursor movement
340497a
@darrenburns
Merge branch 'main' into text-area-undo-redo
2c22aa7
@darrenburns
Fixing merge conflict in Edit class
33a4d34
@darrenburns
Merge branch 'main' of github.com:Textualize/textual into text-area-u…
eb60809 
…ndo-redo
@darrenburns
Fixing error in merge conflict resolution
be4dc7b
@darrenburns
Remove unused test file
5577596
@darrenburns
Remove unused test file
1fe16be
@darrenburns
Initial testing of undo and redo
b74e8f9
@darrenburns
Testing for undo redo
31255b5
@darrenburns
Updating lockfile
d35bbbc
@darrenburns
Add an extra test
da20744
@darrenburns
Fix: setting the text property programmatically should invalidate t…
c4fe944 
…he edit history
@darrenburns
Improving docstrings
a9e0cd5
@darrenburns darrenburns marked this pull request as ready for review February 8, 2024 17:29
rodrigogiraoserrao
rodrigogiraoserrao reviewed Feb 12, 2024
View reviewed changes
src/textual/document/_edit.py Show resolved Hide resolved
src/textual/document/_history.py Show resolved Hide resolved
src/textual/document/_history.py Show resolved Hide resolved
src/textual/widgets/_text_area.py Outdated Show resolved Hide resolved
src/textual/widgets/_text_area.py Show resolved Hide resolved
tests/text_area/test_history.py Outdated Show resolved Hide resolved
willmcgugan
willmcgugan approved these changes Feb 13, 2024
View reviewed changes
Copy link
Collaborator

@willmcgugan willmcgugan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good! Just one docstring request.

src/textual/widgets/_text_area.py Show resolved Hide resolved
@darrenburns darrenburns merged commit fa4f75f into main Feb 14, 2024
20 checks passed
@darrenburns darrenburns deleted the text-area-undo-redo branch February 14, 2024 13:11
@rodrigogiraoserrao rodrigogiraoserrao mentioned this pull request Feb 15, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@willmcgugan willmcgugan willmcgugan approved these changes

@davep davep Awaiting requested review from davep

@rodrigogiraoserrao rodrigogiraoserrao Awaiting requested review from rodrigogiraoserrao

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@darrenburns @willmcgugan @rodrigogiraoserrao