fixing xml/html code example escaping

ionic-team · May 31, 2019 · f6e7152 · f6e7152
1 parent a078187
commit f6e7152
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/site/scripts/markdown-renderer.js b/site/scripts/markdown-renderer.js
@@ -116,11 +116,6 @@ function collectHeadingMetadata(renderer, metadata) {
 exports.collectHeadingMetadata = collectHeadingMetadata;
 function changeCodeCreation(renderer) {
     function highlight(code, lang) {
-        if (lang === 'html' || lang === 'xml') {
-            code = code.replace(/&/g, "&amp;")
-                .replace(/</g, "&lt;")
-                .replace(/>/g, "&gt;");
-        }
         if (lang != null && languages.indexOf(lang) !== -1) {
             return prismjs_1.default.highlight(code, prismjs_1.default.languages[lang]);
         }
@@ -138,6 +133,9 @@ function changeCodeCreation(renderer) {
             return line;
         })
             .join('\n');
+        if (['html', 'xml'].indexOf(lang) !== -1) {
+            lang = 'markup';
+        }
         const out = highlight(code, lang);
         if (out != null) {
             escaped = true;

diff --git a/site/scripts/markdown-renderer.ts b/site/scripts/markdown-renderer.ts
@@ -116,11 +116,6 @@ export function collectHeadingMetadata(renderer: marked.Renderer, metadata: Mark
 
 export function changeCodeCreation(renderer: marked.Renderer) {
   function highlight(code: string, lang?: string) {
-    if (lang === 'html' || lang === 'xml') {
-      code = code.replace(/&/g, "&amp;")
-      .replace(/</g, "&lt;")
-      .replace(/>/g, "&gt;");
-    }
     if (lang != null && languages.indexOf(lang) !== -1) {
       return Prism.highlight(code, Prism.languages[lang]);
     }
@@ -139,6 +134,11 @@ export function changeCodeCreation(renderer: marked.Renderer) {
         return line;
       })
       .join('\n');
+
+    // markup type gets escaped properly
+    if (['html','xml'].indexOf(lang) !== -1) {
+      lang = 'markup';
+    }
 
     const out = highlight(code, lang);