paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-15 03:11:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

markdown: Add data-code-lang attribute for locally echoed messages.

Browse Source 
This mimics the backend logic for adding the data-attribute -
to know what Pygments language was used to highlight the code
block - in locally echoed messages.

New test added checks our logic for canonicalizing pygments alias
(for both frontend and backend).

Other fixtures and tests amended.
This commit is contained in:
Sumanth V Rao
2020-09-06 15:22:11 +05:30
committed by Tim Abbott
parent 4a2791e2a3
commit c563cdba61
3 changed files with 29 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
static/shared/js/fenced_code.js
View File

@@ -1,6 +1,9 @@
import katex from "katex";
import _ from "lodash";
// eslint-disable-next-line
const pygments_data = require("../../generated/pygments_data.json");
// Parsing routine that can be dropped in to message parsing
// and formats code blocks
//
@@ -30,14 +33,21 @@ let stash_func = function (text) {
return text;
};
export function wrap_code(code) {
export function wrap_code(code, lang) {
let header = '<div class="codehilite"><pre><span></span><code>';
// Mimics the backend logic of adding a data-attribute (data-code-language)
// to know what Pygments language was used to highlight this code block.
if (lang !== undefined && lang !== "") {
const pygments_language_info = pygments_data.langs[lang];
let code_language = _.escape(lang);
if (pygments_language_info !== undefined) {
code_language = pygments_language_info.pretty_name;
}
header = `<div class="codehilite" data-code-language="${code_language}"><pre><span></span><code>`;
}
// Trim trailing \n until there's just one left
// This mirrors how pygments handles code input
return (
'<div class="codehilite"><pre><span></span><code>' +
_.escape(code.replace(/^\n+|\n+$/g, "")) +
"\n</code></pre></div>\n"
);
return header + _.escape(code.replace(/^\n+|\n+$/g, "")) + "\n</code></pre></div>\n";
}
function wrap_quote(text) {
@@ -169,7 +179,7 @@ export function process_fenced_code(content) {
},
done() {
const text = wrap_code(lines.join("\n"));
const text = wrap_code(lines.join("\n"), lang);
// insert safe HTML that is passed through the parsing
const placeholder = stash_func(text, true);
output_lines.push("");