feat: stop self.when of microbit extension block

Author: takaokouji

src/lib/ruby-generator/microbit.js

@@ -7,7 +7,7 @@ export default function (Generator) {
     Generator.microbit_whenButtonPressed = function (block) {
         block.isStatement = true;
         const btn = Generator.valueToCode(block, 'BTN', Generator.ORDER_NONE) || null;
-        return `${Generator.spriteName()}.when(:microbit_button_pressed, ${btn}) do\n`;
+        return `microbit.when_button_pressed(${btn}) do\n`;
     };
 
     Generator.microbit_isButtonPressed = function (block) {
@@ -18,7 +18,7 @@ export default function (Generator) {
     Generator.microbit_whenGesture = function (block) {
         block.isStatement = true;
         const gesture = Generator.valueToCode(block, 'GESTURE', Generator.ORDER_NONE) || null;
-        return `${Generator.spriteName()}.when(:microbit_gesture, ${gesture}) do\n`;
+        return `microbit.when(${gesture}) do\n`;
     };
 
     Generator.microbit_displaySymbol = function (block) {
@@ -39,7 +39,7 @@ export default function (Generator) {
     Generator.microbit_whenTilted = function (block) {
         block.isStatement = true;
         const direction = Generator.valueToCode(block, 'DIRECTION', Generator.ORDER_NONE) || null;
-        return `${Generator.spriteName()}.when(:microbit_tilted, ${direction}) do\n`;
+        return `microbit.when_tilted(${direction}) do\n`;
     };
 
     Generator.microbit_isTilted = function (block) {
@@ -55,7 +55,7 @@ export default function (Generator) {
     Generator.microbit_whenPinConnected = function (block) {
         block.isStatement = true;
         const pin = Generator.valueToCode(block, 'PIN', Generator.ORDER_NONE) || null;
-        return `${Generator.spriteName()}.when(:microbit_pin_connected, ${pin}) do\n`;
+        return `microbit.when_pin_connected(${pin}) do\n`;
     };
 
     Generator.microbit_menu_buttons = function (block) {

src/lib/ruby-to-blocks-converter/control.js

@@ -132,7 +132,8 @@ const ControlConverter = {
             case 'start_as_a_clone':
                 return converter.callMethod(
                     params.receiver, 'when_start_as_a_clone', params.args.slice(1),
-                    params.rubyBlockArgs, params.rubyBlock, params.node);
+                    params.rubyBlockArgs, params.rubyBlock, params.node
+                );
             }
 
             return null;

src/lib/ruby-to-blocks-converter/event.js

@@ -113,10 +113,12 @@ const EventConverter = {
         };
         converter.registerCallMethod(
             'self', 'broadcast', 1,
-            params => createBroadcastBlockFunc(params, 'event_broadcast'));
+            params => createBroadcastBlockFunc(params, 'event_broadcast')
+        );
         converter.registerCallMethod(
             'self', 'broadcast_and_wait', 1,
-            params => createBroadcastBlockFunc(params, 'event_broadcastandwait'));
+            params => createBroadcastBlockFunc(params, 'event_broadcastandwait')
+        );
 
         // backward compatibility
         converter.registerCallMethodWithBlock('self', 'when', 1, 0, params => {
@@ -128,11 +130,13 @@ const EventConverter = {
             case 'flag_clicked':
                 return converter.callMethod(
                     params.receiver, 'when_flag_clicked', params.args.slice(1),
-                    params.rubyBlockArgs, params.rubyBlock, params.node);
+                    params.rubyBlockArgs, params.rubyBlock, params.node
+                );
             case 'clicked':
                 return converter.callMethod(
                     params.receiver, 'when_clicked', params.args.slice(1),
-                    params.rubyBlockArgs, params.rubyBlock, params.node);
+                    params.rubyBlockArgs, params.rubyBlock, params.node
+                );
             }
 
             return null;
@@ -148,15 +152,18 @@ const EventConverter = {
             case 'key_pressed':
                 return converter.callMethod(
                     params.receiver, 'when_key_pressed', params.args.slice(1),
-                    params.rubyBlockArgs, params.rubyBlock, params.node);
+                    params.rubyBlockArgs, params.rubyBlock, params.node
+                );
             case 'backdrop_switches':
                 return converter.callMethod(
                     params.receiver, 'when_backdrop_switches', params.args.slice(1),
-                    params.rubyBlockArgs, params.rubyBlock, params.node);
+                    params.rubyBlockArgs, params.rubyBlock, params.node
+                );
             case 'receive':
                 return converter.callMethod(
                     params.receiver, 'when_receive', params.args.slice(1),
-                    params.rubyBlockArgs, params.rubyBlock, params.node);
+                    params.rubyBlockArgs, params.rubyBlock, params.node
+                );
             }
 
             return null;
@@ -172,7 +179,8 @@ const EventConverter = {
             case 'greater_than':
                 return converter.callMethod(
                     params.receiver, 'when_greater_than', params.args.slice(1),
-                    params.rubyBlockArgs, params.rubyBlock, params.node);
+                    params.rubyBlockArgs, params.rubyBlock, params.node
+                );
             }
 
             return null;

src/lib/ruby-to-blocks-converter/index.js

@@ -83,7 +83,6 @@ class RubyToBlocksConverter {
         this._converters = [
             MusicConverter,
             PenConverter,
-            MicroBitConverter,
             MicroBitMoreConverter,
             EV3Converter,
             Wedo2Converter,
@@ -108,7 +107,8 @@ class RubyToBlocksConverter {
 
         [
             EventConverter,
-            ControlConverter
+            ControlConverter,
+            MicroBitConverter
         ].forEach(x => x.register(this));
     }
 
@@ -486,6 +486,10 @@ class RubyToBlocksConverter {
         return _.isString(value) || (value && value.type === 'str');
     }
 
+    isNumber (value) {
+        return this._isNumber(value);
+    }
+
     _isNumber (value) {
         return _.isNumber(value) || (value && (value.type === 'int' || value.type === 'float'));
     }
@@ -655,6 +659,10 @@ class RubyToBlocksConverter {
         return value;
     }
 
+    createRubyExpressionBlock (expression, node) {
+        return this._createRubyExpressionBlock(expression, node);
+    }
+
     _createRubyExpressionBlock (expression, node) {
         const block = this._createBlock('ruby_expression', 'value_boolean');
         block.node = node;
@@ -734,6 +742,10 @@ class RubyToBlocksConverter {
         return value;
     }
 
+    addTextInput (block, name, inputValue, shadowValue) {
+        return this._addTextInput(block, name, inputValue, shadowValue);
+    }
+
     _addTextInput (block, name, inputValue, shadowValue) {
         let shadowBlock;
         if (!this._isString(inputValue)) {
@@ -742,6 +754,10 @@ class RubyToBlocksConverter {
         this._addInput(block, name, this._createTextBlock(inputValue), shadowBlock);
     }
 
+    addFieldInput (block, name, opcode, fieldName, inputValue, shadowValue) {
+        return this._addFieldInput(block, name, opcode, fieldName, inputValue, shadowValue);
+    }
+
     _addFieldInput (block, name, opcode, fieldName, inputValue, shadowValue) {
         let shadowBlock;
         if (!this._isString(inputValue)) {
@@ -944,6 +960,10 @@ class RubyToBlocksConverter {
         return block;
     }
 
+    changeRubyExpressionBlock (block, opcode, blockType) {
+        return this._changeRubyExpressionBlock(block, opcode, blockType);
+    }
+
     _changeRubyExpressionBlock (block, opcode, blockType) {
         this._changeBlock(block, opcode, blockType);