Merge pull request #229 from /issues/228

fixed don't run after edit ruby code.

Author: takaokouji

src/containers/controls.jsx

@@ -19,18 +19,22 @@ class Controls extends React.Component {
     handleGreenFlagClick (e) {
         e.preventDefault();
 
-        if (!this.props.targetCodeToBlocks()) {
+        const converter = this.props.targetCodeToBlocks();
+        if (!converter.result) {
             return;
         }
-
-        if (e.shiftKey) {
-            this.props.vm.setTurboMode(!this.props.turbo);
-        } else {
-            if (!this.props.isStarted) {
-                this.props.vm.start();
-            }
-            this.props.vm.greenFlag();
-        }
+        const shiftKey = e.shiftKey;
+        converter.apply()
+            .then(() => {
+                if (shiftKey) {
+                    this.props.vm.setTurboMode(!this.props.turbo);
+                } else {
+                    if (!this.props.isStarted) {
+                        this.props.vm.start();
+                    }
+                    this.props.vm.greenFlag();
+                }
+            });
     }
     handleStopAllClick (e) {
         e.preventDefault();

src/containers/ruby-tab.jsx

@@ -32,11 +32,26 @@ class RubyTab extends React.Component {
                   this.props.vm.editingTarget && this.props.rubyCode.target &&
                   this.props.vm.editingTarget.id !== targetId;
             if (changedTarget || this.props.blocksTabVisible) {
-                if (this.props.targetCodeToBlocks()) {
-                    modified = false;
-                } else {
-                    this.aceEditorRef.editor.focus();
+                const converter = this.props.targetCodeToBlocks();
+                if (converter.result) {
+                    converter.apply().then(() => {
+                        modified = false;
+
+                        if (!modified) {
+                            if ((this.props.isVisible && !prevProps.isVisible) ||
+                                (this.props.editingTarget && this.props.editingTarget !== prevProps.editingTarget)) {
+                                this.props.updateRubyCodeTargetState(this.props.vm.editingTarget);
+                            }
+                        }
+
+                        if (this.props.isVisible && !prevProps.isVisible) {
+                            this.aceEditorRef.editor.renderer.updateFull();
+                            this.aceEditorRef.editor.focus();
+                        }
+                    });
+                    return;
                 }
+                this.aceEditorRef.editor.focus();
             }
         }
 

src/containers/sb3-downloader.jsx

@@ -29,16 +29,18 @@ class SB3Downloader extends React.Component {
         ]);
     }
     downloadProject () {
-        if (!this.props.targetCodeToBlocks()) {
+        const converter = this.props.targetCodeToBlocks();
+        if (!converter.result) {
             return;
         }
-
-        this.props.saveProjectSb3().then(content => {
-            if (this.props.onSaveFinished) {
-                this.props.onSaveFinished();
-            }
-            downloadBlob(this.props.projectFilename, content);
-        });
+        converter.apply()
+            .then(this.props.saveProjectSb3)
+            .then(content => {
+                if (this.props.onSaveFinished) {
+                    this.props.onSaveFinished();
+                }
+                downloadBlob(this.props.projectFilename, content);
+            });
     }
     render () {
         const {

src/lib/ruby-to-blocks-converter-hoc.jsx

@@ -3,7 +3,10 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import {connect} from 'react-redux';
 import VM from 'scratch-vm';
-import {targetCodeToBlocks} from '../lib/ruby-to-blocks-converter';
+import {
+    NullRubyToBlocksConverter,
+    targetCodeToBlocks
+} from '../lib/ruby-to-blocks-converter';
 
 import {
     activateTab,
@@ -38,24 +41,29 @@ const RubyToBlocksConverterHOC = function (WrappedComponent) {
 
         /**
          * targetCodeToBlocks:
-         * @return {boolean} - True if succeeded to convert Ruby to Blocks
+         * @return {RubyToBlocksConverter} - a block converter that translates ruby code into the blocks
          */
         targetCodeToBlocks () {
             if (this.props.rubyCode.modified) {
-                const errors = [];
-                if (!targetCodeToBlocks(this.props.vm, this.props.rubyCode.target, this.props.rubyCode.code, errors)) {
+                const converter = targetCodeToBlocks(
+                    this.props.vm,
+                    this.props.rubyCode.target,
+                    this.props.rubyCode.code
+                );
+                if (!converter.result) {
                     this.props.vm.setEditingTarget(this.props.rubyCode.target.id);
                     if (!this.props.rubyCode.target.isStage) {
                         this.props.onHighlightTarget(this.props.rubyCode.target.id);
                     }
                     this.props.onActivateRubyTab();
                     this.props.onShowConvertRubyToBlocksErrorAlert();
-                    this.props.updateRubyCodeErrorsState(errors);
-                    return false;
+                    this.props.updateRubyCodeErrorsState(converter.errors);
+                    return converter;
                 }
                 this.props.convertedRubyCodeState();
+                return converter;
             }
-            return true;
+            return NullRubyToBlocksConverter;
         }
 
         render () {

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

@@ -211,18 +211,18 @@ class RubyToBlocksConverter {
             }
         });
 
-        Object.keys(target.blocks._blocks).forEach(blockId => {
-            target.blocks.deleteBlock(blockId);
-        });
-
         const extensionPromises = [];
         this._context.extensionIDs.forEach(extensionID => {
             if (!this.vm.extensionManager.isExtensionLoaded(extensionID)) {
                 extensionPromises.push(this.vm.extensionManager.loadExtensionURL(extensionID));
             }
         });
 
-        Promise.all(extensionPromises).then(() => {
+        return Promise.all(extensionPromises).then(() => {
+            Object.keys(target.blocks._blocks).forEach(blockId => {
+                target.blocks.deleteBlock(blockId);
+            });
+
             Object.keys(this._context.blocks).forEach(blockId => {
                 target.blocks.createBlock(this._context.blocks[blockId]);
             });
@@ -1223,17 +1223,26 @@ class RubyToBlocksConverter {
     }
 }
 
-const targetCodeToBlocks = function (vm, target, code, errors = []) {
+/**
+ * Null of RubyToBlocksConverter
+ */
+const NullRubyToBlocksConverter = {
+    result: true,
+    errors: [],
+    apply: () => Promise.resolve()
+};
+
+const targetCodeToBlocks = function (vm, target, code) {
     const converter = new RubyToBlocksConverter(vm);
-    if (converter.targetCodeToBlocks(target, code)) {
-        converter.applyTargetBlocks(target);
-        return true;
+    converter.result = converter.targetCodeToBlocks(target, code);
+    if (converter.result) {
+        converter.apply = () => converter.applyTargetBlocks(target);
     }
-    converter.errors.forEach(e => errors.push(e));
-    return false;
+    return converter;
 };
 
 export {
     RubyToBlocksConverter as default,
+    NullRubyToBlocksConverter,
     targetCodeToBlocks
 };