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.

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

Towards word diffing #75

Merged
merged 32 commits into from
Aug 5, 2024
Merged

Towards word diffing #75

merged 32 commits into from
Aug 5, 2024

Conversation

panglesd
Copy link
Owner

This PR adds a skeleton of functions and types that will be useful to implement word diffing.

panglesd and others added 5 commits July 22, 2024 16:51
Allows the Patch.t type to contain richer data for lines than strings.

Signed-off-by: Paul-Elliot <[email protected]>
Co-authored-by: Jules Aguillon <[email protected]>
Signed-off-by: Paul-Elliot <[email protected]>
Co-authored-by: Jules Aguillon <[email protected]>
This module contains an alternative representation of changes that is more
suitable for the split view and the word diffing.

Signed-off-by: Paul-Elliot <[email protected]>
Co-authored-by: Jules Aguillon <[email protected]>
This module is used to add word level information in diffs.

Signed-off-by: Paul-Elliot <[email protected]>
Co-authored-by: Jules Aguillon <[email protected]>
Copy link
Owner Author

@panglesd panglesd left a comment

Choose a reason for hiding this comment

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

Nice !

Could you add a test? Also, you decide to represent the mine and their lines of a block in the reverse order, which is in my opinion counter-intuitive!

We might want to change the interface a little bit, to avoid the mine_startfield.

yokurang and others added 24 commits July 25, 2024 17:40
* first draft

* forgot to format

* matching implementation

* matching implementation

* matching implementation

* forward and backward function

* implement midpoint and find path

* rough and dirty draft -> to discuss algorithm for word-diff

* some refactoring and implementation:

* something that barely works

* word level diff, TODO refactoring:

* abstract out process line for plug-and-pull later if necessary

* refactoring complete

* progress

* progress

* progres

* some cleaning

* cleaned

* updated tests

* added more tests

* added more tests

* modify api

* cleaned

* added logging:

* moved new tests

* cleaned up

* cleaned up

* cleaned up

* cleaned up

* cleaned up

* clean up

* added tests
Allows the Patch.t type to contain richer data for lines than strings.

Signed-off-by: Paul-Elliot <[email protected]>
Co-authored-by: Jules Aguillon <[email protected]>
Signed-off-by: Paul-Elliot <[email protected]>
Co-authored-by: Jules Aguillon <[email protected]>
This module contains an alternative representation of changes that is more
suitable for the split view and the word diffing.

Signed-off-by: Paul-Elliot <[email protected]>
Co-authored-by: Jules Aguillon <[email protected]>
This module is used to add word level information in diffs.

Signed-off-by: Paul-Elliot <[email protected]>
Co-authored-by: Jules Aguillon <[email protected]>
@yokurang yokurang merged commit a74873f into main Aug 5, 2024
2 checks passed
@yokurang yokurang deleted the polymorphic-hunk branch August 20, 2024 08:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants