Fix double newline emit for property change/set statements. (microsoft#4180)

Author: Matthew Tebbs

cli/pyconv.ts

@@ -1848,7 +1848,7 @@ function stmt(e: py.Stmt): B.JsNode {
         currErrs = ""
     }
     if (cmts.length) {
-        r = B.mkGroup(cmts.map(c => B.H.mkComment(c)).concat(r))
+        r = B.mkGroup(cmts.map(c => B.mkStmt(B.H.mkComment(c))).concat(r))
     }
     return r
 }

pxtblocks/blocklycompiler.ts

@@ -1108,13 +1108,9 @@ namespace pxt.blocks {
         } else if (func.f == "@get@") {
             return H.mkPropertyAccess(args[1].op.replace(/.*\./, ""), args[0]);
         } else if (func.f == "@set@") {
-            return H.mkAssign(
-                H.mkPropertyAccess(args[1].op.replace(/.*\./, "").replace(/@set/, ""), args[0]),
-                args[2]);
+            return H.mkAssign(H.mkPropertyAccess(args[1].op.replace(/.*\./, "").replace(/@set/, ""), args[0]), args[2]);
         } else if (func.f == "@change@") {
-            return mkStmt(H.mkSimpleCall("+=", [
-                H.mkPropertyAccess(args[1].op.replace(/.*\./, "").replace(/@set/, ""), args[0]),
-                args[2]]))
+            return H.mkSimpleCall("+=", [H.mkPropertyAccess(args[1].op.replace(/.*\./, "").replace(/@set/, ""), args[0]), args[2]])
         } else if (func.isExtensionMethod) {
             if (func.attrs.defaultInstance) {
                 let instance: JsNode;

pxtlib/jsoutput.ts

@@ -180,7 +180,7 @@ namespace pxt.blocks {
         }
 
         export function mkComment(text: string) {
-            return mkStmt(mkText("// " + text))
+            return mkText("// " + text)
         }
 
         export function mkMultiComment(text: string) {
@@ -206,7 +206,7 @@ namespace pxt.blocks {
         }
 
         export function mkAssign(x: JsNode, e: JsNode): JsNode {
-            return mkStmt(mkSimpleCall("=", [x, e]))
+            return mkSimpleCall("=", [x, e])
         }
 
         export function mkParenthesizedExpression(expression: JsNode): JsNode {