From ab1f25d9b08fe23cb1de47673ebe5e20c76fc889 Mon Sep 17 00:00:00 2001
From: Ika <ikatyang@gmail.com>
Date: Thu, 8 Nov 2018 14:57:04 +0800
Subject: [PATCH 1/2] test: add tests

---
 tests/mdx/__snapshots__/jsfmt.spec.js.snap | 42 ++++++++++++++++++++++
 tests/mdx/jsx-codeblock.mdx                |  8 +++++
 2 files changed, 50 insertions(+)
 create mode 100644 tests/mdx/jsx-codeblock.mdx

diff --git a/tests/mdx/__snapshots__/jsfmt.spec.js.snap b/tests/mdx/__snapshots__/jsfmt.spec.js.snap
index 8aa75609223e..73830ef64ca5 100644
--- a/tests/mdx/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/mdx/__snapshots__/jsfmt.spec.js.snap
@@ -198,6 +198,48 @@ exports[`jsx.mdx - mdx-verify 2`] = `
 
 `;
 
+exports[`jsx-codeblock.mdx - mdx-verify 1`] = `
+\`\`\`jsx
+<div>foo</div>
+\`\`\`
+
+\`\`\`jsx
+const a = 1;
+<div>foo</div>;
+\`\`\`
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+\`\`\`jsx
+<div>foo</div>;
+\`\`\`
+
+\`\`\`jsx
+const a = 1;
+<div>foo</div>;
+\`\`\`
+
+`;
+
+exports[`jsx-codeblock.mdx - mdx-verify 2`] = `
+\`\`\`jsx
+<div>foo</div>
+\`\`\`
+
+\`\`\`jsx
+const a = 1;
+<div>foo</div>;
+\`\`\`
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+\`\`\`jsx
+;<div>foo</div>
+\`\`\`
+
+\`\`\`jsx
+const a = 1
+;<div>foo</div>
+\`\`\`
+
+`;
+
 exports[`mixed.mdx - mdx-verify 1`] = `
 import     {     Baz } from     './Fixture'
 import { Buz  }   from './Fixture'
diff --git a/tests/mdx/jsx-codeblock.mdx b/tests/mdx/jsx-codeblock.mdx
new file mode 100644
index 000000000000..4f5b640a9163
--- /dev/null
+++ b/tests/mdx/jsx-codeblock.mdx
@@ -0,0 +1,8 @@
+```jsx
+<div>foo</div>
+```
+
+```jsx
+const a = 1;
+<div>foo</div>;
+```

From b34c295de736e361fb1f4e760176310a96706033 Mon Sep 17 00:00:00 2001
From: Ika <ikatyang@gmail.com>
Date: Thu, 8 Nov 2018 14:57:28 +0800
Subject: [PATCH 2/2] fix(mdx): treat jsx codeblock same as in markdown

---
 src/language-js/printer-estree.js          | 2 +-
 tests/mdx/__snapshots__/jsfmt.spec.js.snap | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/language-js/printer-estree.js b/src/language-js/printer-estree.js
index c9989d1c557d..71e914c17f40 100644
--- a/src/language-js/printer-estree.js
+++ b/src/language-js/printer-estree.js
@@ -6259,7 +6259,7 @@ function isUnitTestSetUp(n) {
 }
 
 function isTheOnlyJSXElementInMarkdown(options, path) {
-  if (options.parentParser !== "markdown") {
+  if (options.parentParser !== "markdown" && options.parentParser !== "mdx") {
     return false;
   }
 
diff --git a/tests/mdx/__snapshots__/jsfmt.spec.js.snap b/tests/mdx/__snapshots__/jsfmt.spec.js.snap
index 73830ef64ca5..3cbe83086b57 100644
--- a/tests/mdx/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/mdx/__snapshots__/jsfmt.spec.js.snap
@@ -209,7 +209,7 @@ const a = 1;
 \`\`\`
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 \`\`\`jsx
-<div>foo</div>;
+<div>foo</div>
 \`\`\`
 
 \`\`\`jsx
@@ -230,7 +230,7 @@ const a = 1;
 \`\`\`
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 \`\`\`jsx
-;<div>foo</div>
+<div>foo</div>
 \`\`\`
 
 \`\`\`jsx