Alternative fix for HTML diff entity split#13425
Merged
Merged
Conversation
This commit both reverts PR go-gitea#13357 and uses the exiting implementation alredy used for spans to fix the same issue. That PR duplicates most of logic that is already present elsewhere and still was failing for some cases. This should be simpler as it uses the existing logic that already works for <span>s being split apart. Added both test cases as well.
zeripath
reviewed
Nov 4, 2020
GiteaBot
added
the
lgtm/need 2
lafriks
approved these changes
Nov 4, 2020
GiteaBot
added
lgtm/need 1
zeripath
approved these changes
Nov 4, 2020
GiteaBot
added
lgtm/done
Member
|
🚀 |
mrsdizzie
added a commit
to mrsdizzie/gitea
that referenced
this pull request
Nov 5, 2020
* Alternative fix for HTML diff entity split This commit both reverts PR go-gitea#13357 and uses the exiting implementation alredy used for spans to fix the same issue. That PR duplicates most of logic that is already present elsewhere and still was failing for some cases. This should be simpler as it uses the existing logic that already works for <span>s being split apart. Added both test cases as well. * Update gitdiff_test.go * fmt * entity can have uppercase letter, also add detailed comment per @zeripath
techknowlogick
pushed a commit
that referenced
this pull request
Nov 5, 2020
* Alternative fix for HTML diff entity split This commit both reverts PR #13357 and uses the exiting implementation alredy used for spans to fix the same issue. That PR duplicates most of logic that is already present elsewhere and still was failing for some cases. This should be simpler as it uses the existing logic that already works for <span>s being split apart. Added both test cases as well. * Update gitdiff_test.go * fmt * entity can have uppercase letter, also add detailed comment per @zeripath
techknowlogick
added
the
backport/done
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This commit both reverts PR #13357 and uses the exiting implementation alredy used for spans to fix the same issue. That PR duplicates some of logic that is already present elsewhere and still was failing for some cases. This should much be simpler as it uses the existing logic that already works for s being split apart.
Added both the original test case and this new currently not working one as well.
I can't link to a line number in commit but see line 107 of
templates/repo/release/list.tmplhere for example of it not working with current code:https://try.gitea.io/mrsdizzie/gitea-mirror/commit/b687707014b31d0f388d1dfb60c09b5dcd48fc4c