sensing_askandwait

Author: takaokouji

src/lib/ruby-generator/sensing.js

@@ -41,7 +41,7 @@ export default function (Generator) {
 
     Generator.sensing_askandwait = function (block) {
         const question = Generator.valueToCode(block, 'QUESTION', Generator.ORDER_NONE) || null;
-        return `ask_and_wait(${question})\n`;
+        return `ask(${question})\n`;
     };
 
     Generator.sensing_answer = function () {

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

@@ -45,6 +45,12 @@ const SensingConverter = {
                     );
                 }
                 break;
+            case 'ask':
+                if (args.length === 1 && this._isStringOrBlock(args[0])) {
+                    block = this._createBlock('sensing_askandwait', 'statement');
+                    this._addTextInput(block, 'QUESTION', args[0], 'What\'s your name?');
+                }
+                break;
             case 'answer':
             case 'loudness':
             case 'days_since_2000':

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

@@ -3,6 +3,7 @@ import {
     convertAndExpectToEqualBlocks,
     convertAndExpectToEqualRubyStatement,
     rubyToExpected,
+    expectedInfo,
     expectNoArgsMethod
 } from '../../../helpers/expect-to-equal-blocks';
 
@@ -359,6 +360,63 @@ describe('RubyToBlocksConverter/Sensing', () => {
         });
     });
 
+    describe('sensing_askandwait', () => {
+        test('normal', () => {
+            code = 'ask("What\'s your name?")';
+            expected = [
+                {
+                    opcode: 'sensing_askandwait',
+                    inputs: [
+                        {
+                            name: 'QUESTION',
+                            block: expectedInfo.makeText('What\'s your name?')
+                        }
+                    ]
+                }
+            ];
+            convertAndExpectToEqualBlocks(converter, target, code, expected);
+
+            code = 'ask(x)';
+            expected = [
+                {
+                    opcode: 'sensing_askandwait',
+                    inputs: [
+                        {
+                            name: 'QUESTION',
+                            block: rubyToExpected(converter, target, 'x')[0],
+                            shadow: expectedInfo.makeText('What\'s your name?')
+                        }
+                    ]
+                }
+            ];
+            convertAndExpectToEqualBlocks(converter, target, code, expected);
+        });
+
+        test('statement', () => {
+            code = `
+                bounce_if_on_edge
+                ask("What's your name?")
+                bounce_if_on_edge
+            `;
+            expected = [
+                rubyToExpected(converter, target, 'bounce_if_on_edge')[0]
+            ];
+            expected[0].next = rubyToExpected(converter, target, 'ask("What\'s your name?")')[0];
+            expected[0].next.next = rubyToExpected(converter, target, 'bounce_if_on_edge')[0];
+            convertAndExpectToEqualBlocks(converter, target, code, expected);
+        });
+
+        test('invalid', () => {
+            [
+                'ask()',
+                'ask(1)',
+                'ask("What\'s your name?", 1)'
+            ].forEach(c => {
+                convertAndExpectToEqualRubyStatement(converter, target, c, c);
+            });
+        });
+    });
+
     expectNoArgsMethod('sensing_answer', 'answer', 'value');
     expectNoArgsMethod('sensing_mousedown', 'Mouse.down?', 'value_boolean');
     expectNoArgsMethod('sensing_mousex', 'Mouse.x', 'value');