Merge pull request #6350 from SimonBrandner/fix/dont-auto-detect-lang…

…/12366 Don't autodetect language in inline code blocks
matrix-org · Jul 12, 2021 · ebd64eb · ebd64eb
2 parents 8a816bb + cd12550
commit ebd64eb
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/components/views/messages/TextualBody.tsx b/src/components/views/messages/TextualBody.tsx
@@ -244,7 +244,11 @@ export default class TextualBody extends React.Component<IProps, IState> {
     }
 
     private highlightCode(code: HTMLElement): void {
-        if (SettingsStore.getValue("enableSyntaxHighlightLanguageDetection")) {
+        // Auto-detect language only if enabled and only for codeblocks
+        if (
+            SettingsStore.getValue("enableSyntaxHighlightLanguageDetection") &&
+            code.parentElement instanceof HTMLPreElement
+        ) {
             highlight.highlightBlock(code);
         } else {
             // Only syntax highlight if there's a class starting with language-