fix: trailing bracket in json with highlightMode enabled (#66)

readmeio · Feb 1, 2021 · 4f34ef6 · 4f34ef6
1 parent ad4072d
commit 4f34ef6
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/__tests__/codeMirror.test.js b/__tests__/codeMirror.test.js
@@ -40,6 +40,18 @@ test('should work with modes', () => {
   );
 });
 
+test('should keep trailing json bracket if highlightMode is enabled', () => {
+  expect(
+    shallow(
+      syntaxHighlighter('{ "a": 1 }', 'json', {
+        highlightMode: true,
+      })
+    ).html()
+  ).toBe(
+    '<div class="cm-s-neo CodeEditor"><div class="CodeMirror"><div class="cm-linerow "><span class="cm-lineNumber">1</span>{ <span class="cm-property">&quot;a&quot;</span>: <span class="cm-number">1</span> }</div></div></div>'
+  );
+});
+
 test('should have a dark theme', () => {
   expect(shallow(syntaxHighlighter('{ "a": 1 }', 'json', { dark: true })).hasClass('cm-s-material-palenight')).toBe(
     true

diff --git a/src/codeMirror/index.jsx b/src/codeMirror/index.jsx
@@ -86,7 +86,7 @@ const StyledSyntaxHighlighter = ({ output, ranges }) => {
 
   const enumerateMatches = (o, final) => {
     // Case where a single line break
-    if (o.length === 1) {
+    if (o.length === 1 && lineBreakRegex.test(o)) {
       incrementLine(true);
       // Case with multiple consecutive line breaks
     } else {