fixed bug, ruby_statement_with_block with move(arg1).

Author: takaokouji

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

@@ -139,21 +139,31 @@ class RubyToBlocksConverter {
 
     _saveContext () {
         return {
-            blocks: JSON.stringify(this._context.blocks),
-            localVariables: JSON.stringify(this._context.localVariables),
-            variables: JSON.stringify(this._context.variables),
-            lists: JSON.stringify(this._context.lists)
+            blocks: Object.assign({}, this._context.blocks),
+            localVariables: Object.assign({}, this._context.localVariables),
+            variables: Object.assign({}, this._context.variables),
+            lists: Object.assign({}, this._context.lists)
         };
     }
 
+    // could not restore attributes.
     _restoreContext (saved) {
         if (!saved) {
             return;
         }
 
         Object.keys(saved).forEach(key => {
             if (this._context.hasOwnProperty(key)) {
-                this._context[key] = JSON.parse(saved[key]);
+                Object.keys(this._context[key]).forEach(id => {
+                    if (!saved[key].hasOwnProperty(id)) {
+                        delete this._context[key][id];
+                    }
+                });
+                Object.keys(saved[key]).forEach(id => {
+                    if (!this._context[key].hasOwnProperty(id)) {
+                        this._context[key][id] = saved[key][id];
+                    }
+                });
             }
         });
     }
@@ -1046,8 +1056,8 @@ class RubyToBlocksConverter {
 
             if (rubyBlockNode) {
                 block = this._createBlock('ruby_statement_with_block', 'statement');
-                this._addInput(block, 'STATEMENT', this._createTextBlock(this._getSource(node)));
-                this._addInput(block, 'ARGS', this._createTextBlock(this._getSource(rubyBlockArgsNode)));
+                this._addTextInput(block, 'STATEMENT', this._getSource(node));
+                this._addTextInput(block, 'ARGS', this._getSource(rubyBlockArgsNode));
                 this._addSubstack(block, this._process(rubyBlockNode));
             } else {
                 block = this._createRubyStatementBlock(this._getSource(node));

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

@@ -2,6 +2,7 @@ import RubyToBlocksConverter from '../../../../src/lib/ruby-to-blocks-converter'
 import {
     convertAndExpectToEqualBlocks,
     convertAndExpectToEqualRubyStatement,
+    rubyToExpected,
     expectedInfo
 } from '../../../helpers/expect-to-equal-blocks';
 
@@ -64,4 +65,51 @@ describe('RubyToBlocksConverter/Ruby', () => {
             convertAndExpectToEqualRubyStatement(converter, target, s, 'wait');
         });
     });
+
+    test('ruby_statement_with_block', () => {
+        const code = `
+            method_call(1) do |arg1, arg2|
+              move(arg1)
+              move(arg2)
+              move(10)
+            end
+        `;
+        const expected = [
+            {
+                opcode: 'ruby_statement_with_block',
+                inputs: [
+                    {
+                        name: 'STATEMENT',
+                        block: expectedInfo.makeText('method_call(1)')
+                    },
+                    {
+                        name: 'ARGS',
+                        block: expectedInfo.makeText('|arg1, arg2|')
+                    }
+                ],
+                branches: [
+                    {
+                        opcode: 'ruby_statement',
+                        inputs: [
+                            {
+                                name: 'STATEMENT',
+                                block: expectedInfo.makeText('move(arg1)')
+                            }
+                        ],
+                        next: {
+                            opcode: 'ruby_statement',
+                            inputs: [
+                                {
+                                    name: 'STATEMENT',
+                                    block: expectedInfo.makeText('move(arg2)')
+                                }
+                            ],
+                            next: rubyToExpected(converter, target, 'move(10)')[0]
+                        }
+                    }
+                ]
+            }
+        ];
+        convertAndExpectToEqualBlocks(converter, target, code, expected);
+    });
 });