Merge "Update highlight.js to 9.12.0 and enable kotlin" into stable-2.14

2017-07-03 03:41:50 +00:00
parent cb3962fd7b 3c8896ad0d
commit e067dc8af9
3 changed files with 101 additions and 87 deletions
--- a/lib/highlightjs/building.md
+++ b/lib/highlightjs/building.md
@@ -35,6 +35,7 @@ languages included. Build it with the following:
          java \
          javascript \
          json \
+          kotlin \
          lisp \
          lua \
          markdown \
--- a/lib/highlightjs/highlight.min.js
+++ b/lib/highlightjs/highlight.min.js
--- a/polygerrit-ui/app/elements/diff/gr-syntax-layer/gr-syntax-layer.js
+++ b/polygerrit-ui/app/elements/diff/gr-syntax-layer/gr-syntax-layer.js
@@ -31,6 +31,7 @@
    'text/x-go': 'go',
    'text/x-haskell': 'haskell',
    'text/x-java': 'java',
+    'text/x-kotlin': 'kotlin',
    'text/x-lua': 'lua',
    'text/x-markdown': 'markdown',
    'text/x-objectivec': 'objectivec',