When creating line diffs do not split within an html entity #13357
Conversation
This file contains 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
Fix go-gitea#13342 Signed-off-by: Andrew Thornton <art27@cantab.net>
Codecov Report
@@ Coverage Diff @@
## master #13357 +/- ##
==========================================
+ Coverage 42.09% 42.11% +0.01%
==========================================
Files 689 689
Lines 75856 75903 +47
==========================================
+ Hits 31935 31968 +33
- Misses 38687 38697 +10
- Partials 5234 5238 +4
Continue to review full report at Codecov.
|
GiteaBot
added
the
lgtm/need 2
Signed-off-by: Andrew Thornton <art27@cantab.net>
|
I've uploaded a simple test for this |
Signed-off-by: Andrew Thornton <art27@cantab.net>
techknowlogick
approved these changes
Oct 30, 2020
GiteaBot
added
lgtm/need 1
silverwind
approved these changes
Oct 31, 2020
GiteaBot
added
lgtm/done
lafriks
approved these changes
Oct 31, 2020
|
🚀 |
zeripath
added a commit
to zeripath/gitea
that referenced
this pull request
Oct 31, 2020
…#13357) Backport go-gitea#13357 * When creating line diffs do not split within an html entity Fix go-gitea#13342 Signed-off-by: Andrew Thornton <art27@cantab.net> * Add test case Signed-off-by: Andrew Thornton <art27@cantab.net> * improve test Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: techknowlogick <techknowlogick@gitea.io>
lafriks
pushed a commit
that referenced
this pull request
Oct 31, 2020
…13375) Backport #13357 * When creating line diffs do not split within an html entity Fix #13342 Signed-off-by: Andrew Thornton <art27@cantab.net> * Add test case Signed-off-by: Andrew Thornton <art27@cantab.net> * improve test Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: techknowlogick <techknowlogick@gitea.io> Co-authored-by: techknowlogick <techknowlogick@gitea.io>
mrsdizzie
added a commit
to mrsdizzie/gitea
that referenced
this pull request
Nov 4, 2020
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.
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
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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Fix #13342
Signed-off-by: Andrew Thornton art27@cantab.net