feat: when_flag_clicked / ruby to block [#309]

Author: takaokouji

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

@@ -112,6 +112,12 @@ const EventConverter = {
                     this._addInput(block, 'BROADCAST_INPUT', inputBlock, shadowBlock);
                 }
                 break;
+            case 'when_flag_clicked':
+                if (args.length == 0 && rubyBlockArgs && rubyBlockArgs.length === 0 && rubyBlock) {
+                    block = this._createBlock('event_whenflagclicked', 'hat');
+                    this._setParent(rubyBlock, block);
+                }
+                break;
             }
         }
 

test/unit/lib/ruby-to-blocks-converter/event.test.js

@@ -21,7 +21,6 @@ describe('RubyToBlocksConverter/Event', () => {
 
     describe('event_whenflagclicked', () => {
         test('normal', () => {
-            code = 'self.when(:flag_clicked) { bounce_if_on_edge }';
             expected = [
                 {
                     opcode: 'event_whenflagclicked',
@@ -30,33 +29,53 @@ describe('RubyToBlocksConverter/Event', () => {
                     }
                 }
             ];
-            convertAndExpectToEqualBlocks(converter, target, code, expected);
+            [
+                'self.when(:flag_clicked) { bounce_if_on_edge }',
+                'when_flag_clicked { bounce_if_on_edge }',
+                'when_flag_clicked() { bounce_if_on_edge }',
+                'self.when_flag_clicked { bounce_if_on_edge }'
+            ].forEach(code => {
+                convertAndExpectToEqualBlocks(converter, target, code, expected);
+            });
 
-            code = 'self.when(:flag_clicked) { bounce_if_on_edge; move(10) }';
             expected = [
                 {
                     opcode: 'event_whenflagclicked',
                     next: rubyToExpected(converter, target, 'bounce_if_on_edge; move(10)')[0]
                 }
             ];
-            convertAndExpectToEqualBlocks(converter, target, code, expected);
+            [
+                'self.when(:flag_clicked) { bounce_if_on_edge; move(10) }',
+                'when_flag_clicked { bounce_if_on_edge; move(10) }'
+            ].forEach(code => {
+                convertAndExpectToEqualBlocks(converter, target, code, expected);
+            });
         });
 
         test('hat', () => {
-            code = `
-                bounce_if_on_edge
-                self.when(:flag_clicked) do
-                end
-                bounce_if_on_edge
-            `;
             expected = [
                 rubyToExpected(converter, target, 'bounce_if_on_edge')[0],
                 {
                     opcode: 'event_whenflagclicked'
                 },
                 rubyToExpected(converter, target, 'bounce_if_on_edge')[0]
             ];
-            convertAndExpectToEqualBlocks(converter, target, code, expected);
+            [
+                `
+                    bounce_if_on_edge
+                    self.when(:flag_clicked) do
+                    end
+                    bounce_if_on_edge
+                `,
+                `
+                    bounce_if_on_edge
+                    when_flag_clicked do
+                    end
+                    bounce_if_on_edge
+                `
+            ].forEach(code => {
+                convertAndExpectToEqualBlocks(converter, target, code, expected);
+            });
         });
 
         test('invalid', () => {
@@ -68,7 +87,8 @@ describe('RubyToBlocksConverter/Event', () => {
 
             [
                 'self.when(:flag_clicked, 1) { bounce_if_on_edge }',
-                'self.when(:flag_click) { bounce_if_on_edge }'
+                'self.when(:flag_click) { bounce_if_on_edge }',
+                'when_flag_click { bounce_if_on_edge }'
             ].forEach(s => {
                 convertAndExpectRubyBlockError(converter, target, s);
             });