Skip to content

SOLR-18545: Update to released highlight.js library. Fix highlighting bugs in Solr Admin UI. #5129

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
epugh wants to merge 5 commits into
base: main
Choose a base branch
from
Open

SOLR-18545: Update to released highlight.js library. Fix highlighting bugs in Solr Admin UI. #5129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
78c6977
Use updated highlighter code.
epugh Oct 14, 2026
c884542
Remove dead writer types as options, no longer have highlighting
epugh Oct 14, 2026
01b7a7c
Actually highlight as json! This wasn't working.
epugh Oct 14, 2026
340ba17
tweak our rat for higlight.js
epugh Oct 15, 2026
8136a0b
Version with license headers
epugh Oct 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle/validation/rat-config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<!-- Various BSD-like third-party libraries with non-standard copyright headers -->
<license family="BSD-modi" id="BSD-modi" name="Modified BSD License">
<any>
<text>THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS</text> <!-- highlight.js -->
<text>THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS</text> <!-- highlight.js -->
</any>
</license>

Expand Down
8 changes: 6 additions & 2 deletions solr/webapp/web/css/angular/common.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,9 +465,11 @@ pre.syntax.language-json .number
color: blue;
}

pre.syntax.language-json .literal
pre.syntax.language-json .literal,
pre.syntax.language-json .literal .keyword
{
color: firebrick;
font-weight: normal;
}

pre.syntax .string,
Expand Down Expand Up @@ -515,14 +517,16 @@ pre.syntax .django .tag .keyword
}

pre.syntax .attribute,
pre.syntax .attr,
pre.syntax .variable,
pre.syntax .instancevar,
pre.syntax .lisp .body
{
color: #008080;
}

pre.syntax.language-json .attribute
pre.syntax.language-json .attribute,
pre.syntax.language-json .attr
{
color: black;
font-weight: bold;
Expand Down
2 changes: 1 addition & 1 deletion solr/webapp/web/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
<script src="libs/angular-route.min.js?_=${version}"></script>
<script src="libs/angular-cookies.min.js?_=${version}"></script>
<script src="libs/ngtimeago.js?_=${version}"></script>
<script src="libs/highlight.js?_=${version}"></script>
<script src="libs/highlight.js-11.12.0.min.js?_=${version}"></script>
<script src="libs/d3.js?_=${version}"></script>
<script src="libs/ui-grid.min.js?_=${version}"></script>
<script src="libs/solr/index.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion solr/webapp/web/js/angular/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ solrAdminApp.config([
})
.filter('highlight', function($sce) {
return function(input, lang) {
if (lang && input && lang!="txt" && lang!="csv") return hljs.highlight(lang, input).value;
if (lang && input && hljs.getLanguage(lang)) return hljs.highlight(input, {language: lang}).value;
return input;
}
})
Expand Down
31 changes: 0 additions & 31 deletions solr/webapp/web/libs/highlight.js
View file
Open in desktop

This file was deleted.

Loading
Loading