diff --git a/tests/format/html/cursor/__snapshots__/jsfmt.spec.js.snap b/tests/format/html/cursor/__snapshots__/jsfmt.spec.js.snap
new file mode 100644
index 000000000..ca29f0d28
--- /dev/null
+++ b/tests/format/html/cursor/__snapshots__/jsfmt.spec.js.snap
@@ -0,0 +1,327 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`cursor-0.html format 1`] = `
+====================================options=====================================
+cursorOffset: 354
+parsers: ["html"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+<!-- At the time of adding this test, the cursor positioning we end up with
+     here seems clearly wrong.
+     I'm adding the test case anyway to demonstrate the brokenness and ensure
+     that if a future changes fixes it, it'll be obvious from the PR diff that
+     the fix happened.
+     Remove this comment if and when we fix it! -->
+<div>bla bla
+
+
+<|></div>
+
+=====================================output=====================================
+<!-- At the time of adding this test, the cursor positioning we end up with
+     here seems clearly wrong.
+     I'm adding the test case anyway to demonstrate the brokenness and ensure
+     that if a future changes fixes it, it'll be obvious from the PR diff that
+     the fix happened.
+     Remove this comment if and when we fix it! -->
+<div>bla bla</d<|>iv>
+
+================================================================================
+`;
+
+exports[`cursor-1.html format 1`] = `
+====================================options=====================================
+cursorOffset: 354
+parsers: ["html"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+<!-- At the time of adding this test, the cursor positioning we end up with
+     here seems clearly wrong.
+     I'm adding the test case anyway to demonstrate the brokenness and ensure
+     that if a future changes fixes it, it'll be obvious from the PR diff that
+     the fix happened.
+     Remove this comment if and when we fix it! -->
+<div>bla bla
+
+
+<|></div>
+<script type="module">
+      import lib from './lib.js';
+  
+        function myFunction() { return 'foo'; }
+  </script>
+
+=====================================output=====================================
+<!-- At the time of adding this test, the cursor positioning we end up with
+     here seems clearly wrong.
+     I'm adding the test case anyway to demonstrate the brokenness and ensure
+     that if a future changes fixes it, it'll be obvious from the PR diff that
+     the fix happened.
+     Remove this comment if and when we fix it! -->
+<div>bla bla</d<|>iv>
+<script type="module">
+  import lib from "./lib.js";
+
+  function myFunction() {
+    return "foo";
+  }
+</script>
+
+================================================================================
+`;
+
+exports[`cursor-2.html format 1`] = `
+====================================options=====================================
+cursorOffset: 48
+parsers: ["html"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+<div>bla bla
+
+
+</div>
+<script type="module">
+   <|>   import lib from './lib.js';
+  
+        function myFunction() { return 'foo'; }
+  </script>
+
+=====================================output=====================================
+<div>bla bla</div>
+<script type="module">
+  <|>import lib from "./lib.js";
+
+  function myFunction() {
+    return "foo";
+  }
+</script>
+
+================================================================================
+`;
+
+exports[`cursor-3.html format 1`] = `
+====================================options=====================================
+cursorOffset: 43
+parsers: ["html"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+<div>bla bla
+
+
+</div>
+<script type="module"<|>>
+      import lib from './lib.js';
+  
+        function myFunction() { return 'foo'; }
+  </script>
+
+=====================================output=====================================
+<div>bla bla</div>
+<script type="module"<|>>
+  import lib from "./lib.js";
+
+  function myFunction() {
+    return "foo";
+  }
+</script>
+
+================================================================================
+`;
+
+exports[`cursor-4.html format 1`] = `
+====================================options=====================================
+cursorOffset: 399
+parsers: ["html"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+<!-- At the time of adding this test, the cursor positioning we end up with
+     here seems wrong, or at least suboptimal.
+     I'm adding the test case anyway to demonstrate the brokenness and ensure
+     that if a future changes fixes it, it'll be obvious from the PR diff that
+     the fix happened.
+     Remove this comment if and when we fix it! -->
+<div>bla bla
+
+
+</div>
+<script type="module"><|>
+      import lib from './lib.js';
+  
+        function myFunction() { return 'foo'; }
+  </script>
+
+=====================================output=====================================
+<!-- At the time of adding this test, the cursor positioning we end up with
+     here seems wrong, or at least suboptimal.
+     I'm adding the test case anyway to demonstrate the brokenness and ensure
+     that if a future changes fixes it, it'll be obvious from the PR diff that
+     the fix happened.
+     Remove this comment if and when we fix it! -->
+<div>bla bla</div>
+<script type="module">
+  <|>import lib from "./lib.js";
+
+  function myFunction() {
+    return "foo";
+  }
+</script>
+
+================================================================================
+`;
+
+exports[`cursor-5.html format 1`] = `
+====================================options=====================================
+cursorOffset: 65
+parsers: ["html"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+<div>bla bla
+
+
+</div>
+<script type="module">
+      import lib fro<|>m './lib.js';
+  
+        function myFunction() { return 'foo'; }
+  </script>
+
+=====================================output=====================================
+<div>bla bla</div>
+<script type="module">
+  import lib fro<|>m "./lib.js";
+
+  function myFunction() {
+    return "foo";
+  }
+</script>
+
+================================================================================
+`;
+
+exports[`cursor-6.html format 1`] = `
+====================================options=====================================
+cursorOffset: 660
+parsers: ["html"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+<!-- At the time of adding this test, the cursor positioning we end up with
+     here seems clearly wrong.
+     I'm adding the test case anyway to demonstrate the brokenness and ensure
+     that if a future changes fixes it, it'll be obvious from the PR diff that
+     the fix happened.
+     Remove this comment if and when we fix it!
+     A big clue: note that tests/format/js/cursor/cursor-12.js features the
+     same JavaScript code but not in an embedded doc, and we handle cursor
+     positioning just fine in that case! -->
+<div>bla bla
+
+
+</div>
+<script type="module">
+      import lib from './lib.js';
+  
+        function myFunction() { return 'foo'; }<|>
+  </script>
+
+=====================================output=====================================
+<!-- At the time of adding this test, the cursor positioning we end up with
+     here seems clearly wrong.
+     I'm adding the test case anyway to demonstrate the brokenness and ensure
+     that if a future changes fixes it, it'll be obvious from the PR diff that
+     the fix happened.
+     Remove this comment if and when we fix it!
+     A big clue: note that tests/format/js/cursor/cursor-12.js features the
+     same JavaScript code but not in an embedded doc, and we handle cursor
+     positioning just fine in that case! -->
+<div>bla bla</div>
+<script type="module">
+  import lib from "./lib.js";
+
+  function myFunction() {
+    return "foo";<|>
+  }
+</script>
+
+================================================================================
+`;
+
+exports[`cursor-7.html format 1`] = `
+====================================options=====================================
+cursorOffset: 470
+parsers: ["html"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+<!-- At the time of adding this test, the cursor positioning we end up with
+     here seems clearly wrong.
+     I'm adding the test case anyway to demonstrate the brokenness and ensure
+     that if a future changes fixes it, it'll be obvious from the PR diff that
+     the fix happened.
+     Remove this comment if and when we fix it! -->
+
+<div>bla bla
+
+
+</div>
+<script type="module">
+      import lib from './lib.js';
+  
+        function myFunction() { return 'foo'; }
+<|>  </script>
+
+=====================================output=====================================
+<!-- At the time of adding this test, the cursor positioning we end up with
+     here seems clearly wrong.
+     I'm adding the test case anyway to demonstrate the brokenness and ensure
+     that if a future changes fixes it, it'll be obvious from the PR diff that
+     the fix happened.
+     Remove this comment if and when we fix it! -->
+
+<div>bla bla</div>
+<script type="module">
+  import lib from "./lib.js";
+
+  function myFunction() {
+    return "foo";
+<|>  }
+</script>
+
+================================================================================
+`;
+
+exports[`cursor-8.html format 1`] = `
+====================================options=====================================
+cursorOffset: 137
+parsers: ["html"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+<div>bla bla
+
+
+</div>
+<script type="module">
+      import lib from './lib.js';
+  
+        function myFunction() { return 'foo'; }
+  </scr<|>ipt>
+
+=====================================output=====================================
+<div>bla bla</div>
+<script type="module">
+  import lib from "./lib.js";
+
+  function myFunction() {
+    return "foo";
+  }
+</scr<|>ipt>
+
+================================================================================
+`;
diff --git a/tests/format/html/cursor/cursor-0.html b/tests/format/html/cursor/cursor-0.html
new file mode 100644
index 000000000..17af1f618
--- /dev/null
+++ b/tests/format/html/cursor/cursor-0.html
@@ -0,0 +1,10 @@
+<!-- At the time of adding this test, the cursor positioning we end up with
+     here seems clearly wrong.
+     I'm adding the test case anyway to demonstrate the brokenness and ensure
+     that if a future changes fixes it, it'll be obvious from the PR diff that
+     the fix happened.
+     Remove this comment if and when we fix it! -->
+<div>bla bla
+
+
+<|></div>
diff --git a/tests/format/html/cursor/cursor-1.html b/tests/format/html/cursor/cursor-1.html
new file mode 100644
index 000000000..47797fa7f
--- /dev/null
+++ b/tests/format/html/cursor/cursor-1.html
@@ -0,0 +1,15 @@
+<!-- At the time of adding this test, the cursor positioning we end up with
+     here seems clearly wrong.
+     I'm adding the test case anyway to demonstrate the brokenness and ensure
+     that if a future changes fixes it, it'll be obvious from the PR diff that
+     the fix happened.
+     Remove this comment if and when we fix it! -->
+<div>bla bla
+
+
+<|></div>
+<script type="module">
+      import lib from './lib.js';
+  
+        function myFunction() { return 'foo'; }
+  </script>
diff --git a/tests/format/html/cursor/cursor-2.html b/tests/format/html/cursor/cursor-2.html
new file mode 100644
index 000000000..21e8807ca
--- /dev/null
+++ b/tests/format/html/cursor/cursor-2.html
@@ -0,0 +1,9 @@
+<div>bla bla
+
+
+</div>
+<script type="module">
+   <|>   import lib from './lib.js';
+  
+        function myFunction() { return 'foo'; }
+  </script>
diff --git a/tests/format/html/cursor/cursor-3.html b/tests/format/html/cursor/cursor-3.html
new file mode 100644
index 000000000..11173af37
--- /dev/null
+++ b/tests/format/html/cursor/cursor-3.html
@@ -0,0 +1,9 @@
+<div>bla bla
+
+
+</div>
+<script type="module"<|>>
+      import lib from './lib.js';
+  
+        function myFunction() { return 'foo'; }
+  </script>
diff --git a/tests/format/html/cursor/cursor-4.html b/tests/format/html/cursor/cursor-4.html
new file mode 100644
index 000000000..ae2f89a25
--- /dev/null
+++ b/tests/format/html/cursor/cursor-4.html
@@ -0,0 +1,15 @@
+<!-- At the time of adding this test, the cursor positioning we end up with
+     here seems wrong, or at least suboptimal.
+     I'm adding the test case anyway to demonstrate the brokenness and ensure
+     that if a future changes fixes it, it'll be obvious from the PR diff that
+     the fix happened.
+     Remove this comment if and when we fix it! -->
+<div>bla bla
+
+
+</div>
+<script type="module"><|>
+      import lib from './lib.js';
+  
+        function myFunction() { return 'foo'; }
+  </script>
diff --git a/tests/format/html/cursor/cursor-5.html b/tests/format/html/cursor/cursor-5.html
new file mode 100644
index 000000000..ca072f71c
--- /dev/null
+++ b/tests/format/html/cursor/cursor-5.html
@@ -0,0 +1,9 @@
+<div>bla bla
+
+
+</div>
+<script type="module">
+      import lib fro<|>m './lib.js';
+  
+        function myFunction() { return 'foo'; }
+  </script>
diff --git a/tests/format/html/cursor/cursor-6.html b/tests/format/html/cursor/cursor-6.html
new file mode 100644
index 000000000..af8b97999
--- /dev/null
+++ b/tests/format/html/cursor/cursor-6.html
@@ -0,0 +1,18 @@
+<!-- At the time of adding this test, the cursor positioning we end up with
+     here seems clearly wrong.
+     I'm adding the test case anyway to demonstrate the brokenness and ensure
+     that if a future changes fixes it, it'll be obvious from the PR diff that
+     the fix happened.
+     Remove this comment if and when we fix it!
+     A big clue: note that tests/format/js/cursor/cursor-12.js features the
+     same JavaScript code but not in an embedded doc, and we handle cursor
+     positioning just fine in that case! -->
+<div>bla bla
+
+
+</div>
+<script type="module">
+      import lib from './lib.js';
+  
+        function myFunction() { return 'foo'; }<|>
+  </script>
diff --git a/tests/format/html/cursor/cursor-7.html b/tests/format/html/cursor/cursor-7.html
new file mode 100644
index 000000000..a326ec029
--- /dev/null
+++ b/tests/format/html/cursor/cursor-7.html
@@ -0,0 +1,16 @@
+<!-- At the time of adding this test, the cursor positioning we end up with
+     here seems clearly wrong.
+     I'm adding the test case anyway to demonstrate the brokenness and ensure
+     that if a future changes fixes it, it'll be obvious from the PR diff that
+     the fix happened.
+     Remove this comment if and when we fix it! -->
+
+<div>bla bla
+
+
+</div>
+<script type="module">
+      import lib from './lib.js';
+  
+        function myFunction() { return 'foo'; }
+<|>  </script>
diff --git a/tests/format/html/cursor/cursor-8.html b/tests/format/html/cursor/cursor-8.html
new file mode 100644
index 000000000..88bbd3a7d
--- /dev/null
+++ b/tests/format/html/cursor/cursor-8.html
@@ -0,0 +1,9 @@
+<div>bla bla
+
+
+</div>
+<script type="module">
+      import lib from './lib.js';
+  
+        function myFunction() { return 'foo'; }
+  </scr<|>ipt>
diff --git a/tests/format/html/cursor/jsfmt.spec.js b/tests/format/html/cursor/jsfmt.spec.js
new file mode 100644
index 000000000..54e40e1cb
--- /dev/null
+++ b/tests/format/html/cursor/jsfmt.spec.js
@@ -0,0 +1 @@
+run_spec(import.meta, ["html"]);
diff --git a/tests/format/js/cursor/__snapshots__/jsfmt.spec.js.snap b/tests/format/js/cursor/__snapshots__/jsfmt.spec.js.snap
index ae6b5b136..351583dc7 100644
--- a/tests/format/js/cursor/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/format/js/cursor/__snapshots__/jsfmt.spec.js.snap
@@ -271,6 +271,123 @@ const y = 5;
 ================================================================================
 `;
 
+exports[`cursor-11.js format 1`] = `
+====================================options=====================================
+cursorOffset: 334
+parsers: ["babel", "typescript", "flow"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+// At the time of adding this test, the cursor positioning we end up with
+// here seems clearly wrong.
+// I'm adding the test case anyway to demonstrate the brokenness and ensure
+// that if a future changes fixes it, it'll be obvious from the PR diff that
+// the fix happened.
+[
+  [
+    [
+      [
+        1,
+        2,
+               <|> 3, "looooooooooooooooooooooooooooooooooooooooooooooooooong",
+        "looooooooooooooooooooooooooooooooooooooooooooooooooong",
+      ]
+    ]
+  ]
+]
+
+=====================================output=====================================
+// At the time of adding this test, the cursor positioning we end up with
+// here seems clearly wrong.
+// I'm adding the test case anyway to demonstrate the brokenness and ensure
+// that if a future changes fixes it, it'll be obvious from the PR diff that
+// the fix happened.
+[
+  [
+    [
+      [
+        1,
+        2,
+        3,
+       <|> "looooooooooooooooooooooooooooooooooooooooooooooooooong",
+        "looooooooooooooooooooooooooooooooooooooooooooooooooong",
+      ],
+    ],
+  ],
+];
+
+================================================================================
+`;
+
+exports[`cursor-12.js format 1`] = `
+====================================options=====================================
+cursorOffset: 330
+parsers: ["babel", "typescript", "flow"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+// At the time of adding this test, the cursor positioning we end up with
+// here seems clearly wrong.
+// I'm adding the test case anyway to demonstrate the brokenness and ensure
+// that if a future changes fixes it, it'll be obvious from the PR diff that
+// the fix happened.
+[
+  [
+    [
+      [
+        1,
+        2,
+        3  <|>      ,"looooooooooooooooooooooooooooooooooooooooooooooooooong",
+        "looooooooooooooooooooooooooooooooooooooooooooooooooong",
+      ]
+    ]
+  ]
+]
+
+=====================================output=====================================
+// At the time of adding this test, the cursor positioning we end up with
+// here seems clearly wrong.
+// I'm adding the test case anyway to demonstrate the brokenness and ensure
+// that if a future changes fixes it, it'll be obvious from the PR diff that
+// the fix happened.
+[
+  [
+    [
+      [
+        1,
+        2,
+        3,
+  <|>      "looooooooooooooooooooooooooooooooooooooooooooooooooong",
+        "looooooooooooooooooooooooooooooooooooooooooooooooooong",
+      ],
+    ],
+  ],
+];
+
+================================================================================
+`;
+
+exports[`cursor-13.js format 1`] = `
+====================================options=====================================
+cursorOffset: 84
+parsers: ["babel", "typescript", "flow"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+      import lib from './lib.js';
+  
+        function myFunction() { return 'foo'; }<|>
+
+=====================================output=====================================
+import lib from "./lib.js";
+
+function myFunction() {
+  return "foo";
+}<|>
+
+================================================================================
+`;
+
 exports[`cursor-emoji.js format 1`] = `
 ====================================options=====================================
 cursorOffset: 9
diff --git a/tests/format/js/cursor/cursor-11.js b/tests/format/js/cursor/cursor-11.js
new file mode 100644
index 000000000..821a00f50
--- /dev/null
+++ b/tests/format/js/cursor/cursor-11.js
@@ -0,0 +1,17 @@
+// At the time of adding this test, the cursor positioning we end up with
+// here seems clearly wrong.
+// I'm adding the test case anyway to demonstrate the brokenness and ensure
+// that if a future changes fixes it, it'll be obvious from the PR diff that
+// the fix happened.
+[
+  [
+    [
+      [
+        1,
+        2,
+               <|> 3, "looooooooooooooooooooooooooooooooooooooooooooooooooong",
+        "looooooooooooooooooooooooooooooooooooooooooooooooooong",
+      ]
+    ]
+  ]
+]
diff --git a/tests/format/js/cursor/cursor-12.js b/tests/format/js/cursor/cursor-12.js
new file mode 100644
index 000000000..4189afdbc
--- /dev/null
+++ b/tests/format/js/cursor/cursor-12.js
@@ -0,0 +1,17 @@
+// At the time of adding this test, the cursor positioning we end up with
+// here seems clearly wrong.
+// I'm adding the test case anyway to demonstrate the brokenness and ensure
+// that if a future changes fixes it, it'll be obvious from the PR diff that
+// the fix happened.
+[
+  [
+    [
+      [
+        1,
+        2,
+        3  <|>      ,"looooooooooooooooooooooooooooooooooooooooooooooooooong",
+        "looooooooooooooooooooooooooooooooooooooooooooooooooong",
+      ]
+    ]
+  ]
+]
diff --git a/tests/format/js/cursor/cursor-13.js b/tests/format/js/cursor/cursor-13.js
new file mode 100644
index 000000000..fce7e1b0c
--- /dev/null
+++ b/tests/format/js/cursor/cursor-13.js
@@ -0,0 +1,3 @@
+      import lib from './lib.js';
+  
+        function myFunction() { return 'foo'; }<|>