Remove line break between similar tags and $ jsCode

packages/migrate/test/fixtures/multiple-templates/snapshot-expected.marko

@@ -2,6 +2,7 @@
 
 $ var x = 1;
 $ x++;
+
 -- ${x}
 
 

packages/migrate/test/fixtures/single-template/snapshot-expected.marko

@@ -2,4 +2,5 @@
 
 $ var x = 1;
 $ x++;
+
 -- ${x}

packages/prettyprint/src/printNodes.js

@@ -132,9 +132,22 @@ module.exports = function printNodes(nodes, printContext, inputWriter) {
       }
 
       // Insert line break between certain top-level tags
-      if (breakAfterTags[prevChild.tagName]) {
+      if (
+        breakAfterTags[prevChild.tagName] &&
+        child.tagName != prevChild.tagName
+      ) {
         writer.write(printContext.eol);
       }
+
+      //Insert line break group of scriptlets
+      if (
+        child.type === "Text" &&
+        child.nextSibling &&
+        (!prevChild.tag &&
+          prevChild.type === "Scriptlet" &&
+          child.nextSibling.type !== "Scriptlet")
+      )
+        writer.write(printContext.eol);
     }
 
     printers.printNode(child, printContext, childWriter);

packages/prettyprint/test/autotest/js-block/expected.marko

@@ -2,10 +2,12 @@ $ {
     var name = "Frank";
     console.log(`Hello ${name}!`);
 }
+
 <div/>
 ~~~~~~~
 $ {
     var name = "Frank";
     console.log(`Hello ${name}!`);
 }
-div
+
+div

packages/prettyprint/test/autotest/js-line/expected.marko

@@ -1,5 +1,7 @@
 $ console.log("Hello World!");
+
 <div/>
 ~~~~~~~
 $ console.log("Hello World!");
-div
+
+div

packages/prettyprint/test/autotest/static-vars/expected.marko

@@ -0,0 +1,27 @@
+static var a = 1;
+static var b = 2;
+static var c = 1;
+
+import { foo } from './bar'
+import { blah } from './foo'
+import { haha } from './blah'
+
+$ var k = 1;
+$ var l = 2;
+$ var m = 3;
+
+<div/>
+~~~~~~~
+static var a = 1;
+static var b = 2;
+static var c = 1;
+
+import { foo } from './bar'
+import { blah } from './foo'
+import { haha } from './blah'
+
+$ var k = 1;
+$ var l = 2;
+$ var m = 3;
+
+div

packages/prettyprint/test/autotest/static-vars/template.marko

@@ -0,0 +1,10 @@
+static var a = 1;
+static var b = 2;
+static var c = 1;
+import { foo } from './bar'
+import { blah } from './foo'
+import { haha } from './blah'
+$ var k = 1;
+$ var l = 2;
+$ var m = 3;
+<div/>