Fix nested block inside else

- This adds required line breaks in the generated `else` code;
- This fixes label generation for the `while` block.

Fix #109 

Merge pull request #114 from haroldo-ok/fix-nested-block-inside-else

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vcs-game-maker",
-  "version": "0.25.2",
+  "version": "0.25.3",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",

src/generators/bbasic/logic.js

@@ -46,8 +46,11 @@ export default (Blockly) => {
             Blockly.BBasic.injectId(Blockly.BBasic.STATEMENT_SUFFIX,
                 block), Blockly.BBasic.INDENT) + branchCode;
       }
-      code += '\n' + branchCode +
-        `@ ${labelStart}_else_end`;
+      code += [
+        '\n',
+        branchCode,
+        `@ ${labelStart}_else_end`,
+      ].join('\n');
     }
     return '\n' + code + '\n';
   };

src/generators/bbasic/loops.js

@@ -60,7 +60,8 @@ export default (Blockly) => {
 
   Blockly.BBasic['controls_whileUntil'] = function(block) {
   // Do while/until loop.
-    const labelName = Blockly.BBasic.nameDB_.getName('while', Blockly.PROCEDURE_CATEGORY_NAME);
+    const blockNumber = Blockly.BBasic.blockNumbers.next();
+    const labelName = `_while_${blockNumber}_`;
     const startLabelName = labelName + 'start';
     const endLabelName = labelName + 'end';
     const until = block.getFieldValue('MODE') == 'UNTIL';