Diff syntax highlighting HTML spilling into content #12235
Comments
mrsdizzie
added a commit
to mrsdizzie/gitea
that referenced
this issue
Jul 13, 2020
For diffs we first syntax highlight the before and after line then use a 3rd party diff library to find the difference in them and create a substring based on that, which we then highlight a 2nd time to show the specific difference within a line that has changed. In a specific case if the diffrence also changes the chroma class it will split in the middle of the attr and cause broken HTML: ``` <span class="nx">oldtext<span> <span class="k">var newtext<span> ``` Will then split on ``` <span class=" ``` Where the difference starts, and produce something broken like: ``` <span class="<span class="removed-code">nx"oldtext</span></span ``` Fix that by detecting when it happens and putting the HTML back together properly before highlighting the added/deleted code. Fixes go-gitea#12235
|
Good catch, this is side effect from #12205 Made a PR that should fix this if you could please test |
lafriks
added a commit
that referenced
this issue
Jul 16, 2020
* Fix Syntax highlight for token change in added/deleted code For diffs we first syntax highlight the before and after line then use a 3rd party diff library to find the difference in them and create a substring based on that, which we then highlight a 2nd time to show the specific difference within a line that has changed. In a specific case if the diffrence also changes the chroma class it will split in the middle of the attr and cause broken HTML: ``` <span class="nx">oldtext<span> <span class="k">var newtext<span> ``` Will then split on ``` <span class=" ``` Where the difference starts, and produce something broken like: ``` <span class="<span class="removed-code">nx"oldtext</span></span ``` Fix that by detecting when it happens and putting the HTML back together properly before highlighting the added/deleted code. Fixes #12235 * fix lint * apply fix to all diff sections. Also handle case where insert/remove starts with a closing span * Add a test for this new code * remove comment Co-authored-by: Lauris BH <lauris@nix.lv>
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
https://try.gitea.io/silverwind/updates/commit/9f342114d7a6bb087ff777a983d0e03b41873b07
silverwind/updates@9f34211
On Line 88 of
test.jsthe partsnx">andk">related to syntax highlighting markup should not be visible. Source HTML:cc: @mrsdizzie
The text was updated successfully, but these errors were encountered: