Skip to content

fix: Escape html in code blocks #263

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

Merged
merged 2 commits into from
Oct 12, 2021
Merged

fix: Escape html in code blocks #263

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
49e5b30
fix: Escape html in code blocks
ospencer Oct 12, 2021
7cc4a3c
only do this for non-grain code
ospencer Oct 12, 2021
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
79 changes: 51 additions & 28 deletions scripts/syntaxHighlight.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,72 +1,95 @@
const fs = require('fs');
const vsctm = require('vscode-textmate');
const onig = require('onigasm');
const onigWasm = require.resolve('onigasm/lib/onigasm.wasm');
const fs = require("fs");
const vsctm = require("vscode-textmate");
const onig = require("onigasm");
const onigWasm = require.resolve("onigasm/lib/onigasm.wasm");

const wasm = fs.readFileSync(onigWasm).buffer;

hexo.extend.filter.register('after_init', initialize);
hexo.extend.filter.register('marked:renderer', hookRenderer);
hexo.extend.filter.register("after_init", initialize);
hexo.extend.filter.register("marked:renderer", hookRenderer);

function escapeHTML(str) {
return str.replace(
/[&<>'"]/g,
(tag) =>
({
"&": "&amp;",
"<": "&lt;",
">": "&gt;",
"'": "&#39;",
'"': "&quot;",
}[tag] || tag)
);
}

async function initialize() {
await onig.loadWASM(wasm);

const registry = new vsctm.Registry({
onigLib: Promise.resolve({
createOnigScanner: (sources) => new onig.OnigScanner(sources),
createOnigString: (str) => new onig.OnigString(str)
createOnigString: (str) => new onig.OnigString(str),
}),
loadGrammar: async (scopeName) => {
if (scopeName === 'source.grain') {
let path = './grain-language-server/editor-extensions/vscode/syntaxes/grain.json'
let grammar = fs.readFileSync(path)
return vsctm.parseRawGrammar(grammar.toString(), path)
if (scopeName === "source.grain") {
let path =
"./grain-language-server/editor-extensions/vscode/syntaxes/grain.json";
let grammar = fs.readFileSync(path);
return vsctm.parseRawGrammar(grammar.toString(), path);
}
console.log(`Unknown scope name: ${scopeName}`);
return null;
}
},
});

const grammar = await registry.loadGrammar('source.grain');
const grammar = await registry.loadGrammar("source.grain");

this.grain = { registry, grammar };
}

function makeGutter(numLines) {
let line = (num) => `<span class="line">${num}</span><br>`
let lines = []
let line = (num) => `<span class="line">${num}</span><br>`;
let lines = [];
for (let i = 1; i <= numLines; i++) {
lines.push(line(i))
lines.push(line(i));
}
return `<td class="gutter"><pre>${lines.join('')}</pre></td>`
return `<td class="gutter"><pre>${lines.join("")}</pre></td>`;
}

function hookRenderer(renderer) {
const { grammar } = this.grain;

renderer.code = function (code, lang) {
let result = []
let text = code.split('\n')
let result = [];
let text = code.split("\n");

if (lang === 'grain' || lang === 'gr') {
if (lang === "grain" || lang === "gr") {
let ruleStack = vsctm.INITIAL;
for (let i = 0; i < text.length; i++) {
const line = text[i];
const lineTokens = grammar.tokenizeLine(line, ruleStack);
const lineRes = []
const lineRes = [];
for (let j = 0; j < lineTokens.tokens.length; j++) {
const token = lineTokens.tokens[j];
const tokenString = line.substring(token.startIndex, token.endIndex)
const classString = token.scopes.map(scope => scope.replace(/\./g, ' ')).join(' ')
lineRes.push(`<span class="${classString}">${tokenString}</span>`)
const tokenString = line.substring(token.startIndex, token.endIndex);
const classString = token.scopes
.map((scope) => scope.replace(/\./g, " "))
.join(" ");
lineRes.push(`<span class="${classString}">${tokenString}</span>`);
}
result.push(`<span class="line">${lineRes.join('')}</span><br>`)
result.push(`<span class="line">${lineRes.join("")}</span><br>`);
ruleStack = lineTokens.ruleStack;
}
} else {
result = text.map(line => `<span class="line">${line}</span><br>`)
result = text.map(
(line) => `<span class="line">${escapeHTML(line)}</span><br>`
);
}

return `<figure class="tm-highlight"><table><tbody><tr>${makeGutter(text.length)}<td class="code"><pre>${result.join('')}</pre></td><td class="code-tools"><a class="code-copy" role="button" alt="copy code"><i class="far fa-clone"></i></a></td></tr></tbody></table></figure>`;
}
return `<figure class="tm-highlight"><table><tbody><tr>${makeGutter(
text.length
)}<td class="code"><pre>${result.join(
""
)}</pre></td><td class="code-tools"><a class="code-copy" role="button" alt="copy code"><i class="far fa-clone"></i></a></td></tr></tbody></table></figure>`;
};
}