Provide printText and printComment in markup.js for HTMLElement plugin (

#4344)
jestjs · Aug 24, 2017 · 84b2502 · 84b2502
1 parent a397aba
commit 84b2502
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 11 deletions.
diff --git a/packages/pretty-format/src/plugins/html_element.js b/packages/pretty-format/src/plugins/html_element.js
@@ -10,12 +10,13 @@
 
 import type {Config, NewPlugin, Printer, Refs} from 'types/PrettyFormat';
 
-import escapeHTML from './lib/escape_html';
 import {
   printChildren,
+  printComment,
   printElement,
   printElementAsLeaf,
   printProps,
+  printText,
 } from './lib/markup';
 
 type Attribute = {
@@ -70,19 +71,12 @@ export const serialize = (
   refs: Refs,
   printer: Printer,
 ): string => {
-  const colors = config.colors;
   if (node.nodeType === TEXT_NODE) {
-    return colors.content.open + escapeHTML(node.data) + colors.content.close;
+    return printText(node.data, config);
   }
 
   if (node.nodeType === COMMENT_NODE) {
-    return (
-      colors.comment.open +
-      '<!--' +
-      escapeHTML(node.data) +
-      '-->' +
-      colors.comment.close
-    );
+    return printComment(node.data, config);
   }
 
   const type = node.tagName.toLowerCase();

diff --git a/packages/pretty-format/src/plugins/lib/markup.js b/packages/pretty-format/src/plugins/lib/markup.js
@@ -72,12 +72,28 @@ export const printChildren = (
         config.spacingOuter +
         indentation +
         (typeof child === 'string'
-          ? colors.content.open + escapeHTML(child) + colors.content.close
+          ? printText(child, config)
           : printer(child, config, indentation, depth, refs)),
     )
     .join('');
 };
 
+export const printText = (text: string, config: Config): string => {
+  const contentColor = config.colors.content;
+  return contentColor.open + escapeHTML(text) + contentColor.close;
+};
+
+export const printComment = (comment: string, config: Config): string => {
+  const commentColor = config.colors.comment;
+  return (
+    commentColor.open +
+    '<!--' +
+    escapeHTML(comment) +
+    '-->' +
+    commentColor.close
+  );
+};
+
 // Separate the functions to format props, children, and element,
 // so a plugin could override a particular function, if needed.
 // Too bad, so sad: the traditional (but unnecessary) space