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

Merge pull request #506 from rtfpessoa/fix-error-unloaded-lang

Browse source 
fallback to plaintext when highlighting unloaded language
This commit is contained in:
Rodrigo Fernandes 2023-08-27 21:40:19 +01:00 committed by GitHub
commit 61d90c1c41
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -151,7 +151,7 @@ export class Diff2HtmlUI {
this.config.highlightLanguages = new Map(Object.entries(this.config.highlightLanguages)); this.config.highlightLanguages = new Map(Object.entries(this.config.highlightLanguages));
} }
const hljsLanguage = let hljsLanguage =
language && this.config.highlightLanguages.has(language) language && this.config.highlightLanguages.has(language)
? // eslint-disable-next-line @typescript-eslint/no-non-null-assertion ? // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
this.config.highlightLanguages.get(language)! this.config.highlightLanguages.get(language)!
@ -159,6 +159,11 @@ export class Diff2HtmlUI {
? getLanguage(language) ? getLanguage(language)
: 'plaintext'; : 'plaintext';
// Fallback to plaintext in case language is not loaded
if (hljs.getLanguage(hljsLanguage) === undefined) {
hljsLanguage = 'plaintext';
}
// Collect all the code lines and execute the highlight on them // Collect all the code lines and execute the highlight on them
const codeLines = file.querySelectorAll('.d2h-code-line-ctn'); const codeLines = file.querySelectorAll('.d2h-code-line-ctn');
codeLines.forEach(line => { codeLines.forEach(line => {