luciano/diff2html
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

perf: check hljs is not null only once

Browse source 
Update the `highlightCode` method of `Diff2HtmlUI` to check if the hljs
reference is null only once (at the start). This address the "HACK"
comments by using a locally scoped variable for hljs. This way,
TypeScript is able to deduce that, after the initial null-check, hljs is
in fact not null.
This commit is contained in:
Eric Cornelissen 2022-11-02 22:43:23 +01:00
parent 6db4aae9e5
commit 3a480e4ab0
1 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/ui/js/diff2html-ui-base.ts
View file

@ -137,16 +137,14 @@ export class Diff2HtmlUI {
}
highlightCode(): void {
if (this.hljs === null) {
const hljs = this.hljs;
if (hljs === null) {
throw new Error('Missing a `highlight.js` implementation. Please provide one when instantiating Diff2HtmlUI.');
}
// Collect all the diff files and execute the highlight on their lines
const files = this.targetElement.querySelectorAll('.d2h-file-wrapper');
files.forEach(file => {
// HACK: help Typescript know that `this.hljs` is defined since we already checked it
if (this.hljs === null) return;
const language = file.getAttribute('data-lang');
if (!(this.config.highlightLanguages instanceof Map)) {
@ -164,16 +162,13 @@ export class Diff2HtmlUI {
// Collect all the code lines and execute the highlight on them
const codeLines = file.querySelectorAll('.d2h-code-line-ctn');
codeLines.forEach(line => {
// HACK: help Typescript know that `this.hljs` is defined since we already checked it
if (this.hljs === null) return;
const text = line.textContent;
const lineParent = line.parentNode;
if (text === null || lineParent === null || !this.isElement(lineParent)) return;
const result: HighlightResult = closeTags(
this.hljs.highlight(text, {
hljs.highlight(text, {
language: hljsLanguage,
ignoreIllegals: true,
}),