Enable syntax highlighting on diff view #2528
Conversation
| @@ -830,6 +830,10 @@ $(document).ready(function () { | |||
|
|
|||
| // Highlight JS | |||
| if (typeof hljs != 'undefined') { | |||
| // creating aliases for languages | |||
There was a problem hiding this comment.
Why this is needed?
Highlight.js tries to detect the language automatically. But in this particular case, it didn't work as expected. So, I'm explicity setting the language to Highlight.js, as a language-{{language-extension}} class. Unfortunally, not all languages are being reconized by its file extension (see). So I manually created aliases to two cases I found, but for most languages it isn't necessary.
There was a problem hiding this comment.
Maybe you can use of this? https://github.com/gogits/gogs/blob/master/modules/template/highlight.go
There was a problem hiding this comment.
I didn't know that it was already implemented. ¯_(ツ)_/¯ Updated to use that package, much better.
I also did this patch to Highlight.js, so futures version will have these alises by default: https://github.com/isagalaev/highlight.js/pull/1069/files
There was just a little gotcha: I had to move highlight.go to its own package, because we got a cycle import, which isn't allowed in Go, on importing template in models since models also import template.
|
Any screenshots? |
Sure. Before: Before: |
|
Takes a bit more time to review |
unknwon
changed the title
| @@ -7,9 +7,9 @@ github.com style (c) Vasily Polovnyov <vast@whiteants.net> | |||
| .hljs { | |||
| display: block; | |||
| overflow-x: auto; | |||
| padding: 0.5em; | |||
| /*padding: 0.5em;*/ | |||
There was a problem hiding this comment.
I think overwrite this value in _base.less is better as we can't care very well when upgrading the plugins.
There was a problem hiding this comment.
@unknwon Makes sense. Done!
|
Thanks! |
Enable syntax highlighting on diff view
Closes #733