diff options
| author | mrsdizzie <info@mrsdizzie.com> | 2020-06-30 17:34:03 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-01 00:34:03 +0300 |
| commit | af7ffaa2798148e2a1b249da2330200bc032d7b1 (patch) | |
| tree | 4f1f41767fa620dff4142ac7ebcd74b0abd61033 /routers/repo/compare.go | |
| parent | ce5f2b9845659efaca0b81998dca6cf03882b134 (diff) | |
| download | gitea-af7ffaa2798148e2a1b249da2330200bc032d7b1.tar.gz gitea-af7ffaa2798148e2a1b249da2330200bc032d7b1.zip | |
Server-side syntax highlighting for all code (#12047)
* Server-side syntax hilighting for all code
This PR does a few things:
* Remove all traces of highlight.js
* Use chroma library to provide fast syntax hilighting directly on the server
* Provide syntax hilighting for diffs
* Re-style both unified and split diffs views
* Add custom syntax hilighting styling for both regular and arc-green
Fixes #7729
Fixes #10157
Fixes #11825
Fixes #7728
Fixes #3872
Fixes #3682
And perhaps gets closer to #9553
* fix line marker
* fix repo search
* Fix single line select
* properly load settings
* npm uninstall highlight.js
* review suggestion
* code review
* forgot to call function
* fix test
* Apply suggestions from code review
suggestions from @silverwind thanks
Co-authored-by: silverwind <me@silverwind.io>
* code review
* copy/paste error
* Use const for highlight size limit
* Update web_src/less/_repository.less
Co-authored-by: Lauris BH <lauris@nix.lv>
* update size limit to 1MB and other styling tweaks
* fix highlighting for certain diff sections
* fix test
* add worker back as suggested
Co-authored-by: silverwind <me@silverwind.io>
Co-authored-by: Lauris BH <lauris@nix.lv>
Diffstat (limited to 'routers/repo/compare.go')
| -rw-r--r-- | routers/repo/compare.go | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/routers/repo/compare.go b/routers/repo/compare.go index 25aff0eeba..0ee0b0f73b 100644 --- a/routers/repo/compare.go +++ b/routers/repo/compare.go @@ -9,14 +9,12 @@ import ( "fmt" "html" "path" - "path/filepath" "strings" "code.gitea.io/gitea/models" "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/highlight" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/services/gitdiff" @@ -576,7 +574,6 @@ func CompareDiff(ctx *context.Context) { ctx.Data["IsRepoToolbarCommits"] = true ctx.Data["IsDiffCompare"] = true - ctx.Data["RequireHighlightJS"] = true ctx.Data["RequireTribute"] = true ctx.Data["RequireSimpleMDE"] = true ctx.Data["PullRequestWorkInProgressPrefixes"] = setting.Repository.PullRequest.WorkInProgressPrefixes @@ -657,7 +654,6 @@ func ExcerptBlob(ctx *context.Context) { } ctx.Data["section"] = section ctx.Data["fileName"] = filePath - ctx.Data["highlightClass"] = highlight.FileNameToHighlightClass(filepath.Base(filePath)) ctx.Data["AfterCommitID"] = commitID ctx.Data["Anchor"] = anchor ctx.HTML(200, tplBlobExcerpt) |