Change from Advance to Jump

Author: alan412

src/blocks/mrc_advance_to_step.ts src/blocks/mrc_jump_to_step.tssrc/blocks/mrc_advance_to_step.ts renamed to src/blocks/mrc_jump_to_step.ts

@@ -16,8 +16,7 @@
  */
 
 /**
- * @fileoverview This is a block that allows your code to use a parameter
- * that is passed to a method.
+ * @fileoverview This is a block that allows your code to jump to a specific step.
  * @author [email protected] (Alan Smith)
  */
 import * as Blockly from 'blockly';
@@ -27,42 +26,42 @@ import {ExtendedPythonGenerator} from '../editor/extended_python_generator';
 import {createFieldNonEditableText} from '../fields/FieldNonEditableText';
 import {MRC_STYLE_VARIABLES} from '../themes/styles';
 
-export const BLOCK_NAME = 'mrc_advance_to_step';
+export const BLOCK_NAME = 'mrc_jump_to_step';
 
 const FIELD_STEP_NAME = 'STEP_NAME';
 
-type AdvanceToStepBlock = Blockly.Block & Blockly.BlockSvg & AdvanceToStepMixin;
+type JumpToStepBlock = Blockly.Block & Blockly.BlockSvg & JumpToStepMixin;
 
-interface AdvanceToStepMixin extends AdvanceToStepMixinType {
+interface JumpToStepMixin extends JumpToStepMixinType {
 }
 
-type AdvanceToStepMixinType = typeof ADVANCE_TO_STEP_BLOCK;
+type JumpToStepMixinType = typeof JUMP_TO_STEP_BLOCK;
 
-const ADVANCE_TO_STEP_BLOCK = {
+const JUMP_TO_STEP_BLOCK = {
   /**
    * Block initialization.
    */
-  init: function(this: AdvanceToStepBlock): void {
+  init: function(this: JumpToStepBlock): void {
     this.appendDummyInput()
-        .appendField('Advance to step')
+        .appendField('Jump to')
         .appendField(createFieldNonEditableText(''), FIELD_STEP_NAME);
     this.setPreviousStatement(true, null);
     this.setInputsInline(true);
     this.setStyle(MRC_STYLE_VARIABLES);
-    this.setTooltip('Advance to the specified step when the condition is true.');          
+    this.setTooltip('Jump to the specified step.');          
   },
 };
 
 export const setup = function() {
-  Blockly.Blocks[BLOCK_NAME] = ADVANCE_TO_STEP_BLOCK;
+  Blockly.Blocks[BLOCK_NAME] = JUMP_TO_STEP_BLOCK;
 };
 
 export const pythonFromBlock = function(
-    block: AdvanceToStepBlock,
+    block: JumpToStepBlock,
     _generator: ExtendedPythonGenerator,
 ) {
   // TODO (Alan) : Specify the type here as well
-  const code = '# TODO: Advance to step ' + block.getFieldValue(FIELD_STEP_NAME) + '\n';
+  const code = '# TODO: Jump to step ' + block.getFieldValue(FIELD_STEP_NAME) + '\n';
 
   return [code, Order.ATOMIC];
 };

src/blocks/mrc_steps.ts

@@ -43,19 +43,6 @@ const STEPS = {
         this.mrcStepNames = ["0"];
         this.appendDummyInput()
             .appendField(Blockly.Msg.STEPS);
-        /*            
-                this.appendValueInput('CONDITION_0')
-                    .appendField(createStepFieldFlydown('shoot', true))
-                    .setCheck('Boolean')
-                    .appendField('Repeat Until');    
-                this.appendStatementInput('STEP_0');
-        
-                this.appendValueInput('CONDITION_1')
-                    .appendField(createStepFieldFlydown('move', true))
-                    .setCheck('Boolean')
-                    .appendField('Repeat Until');    
-                this.appendStatementInput('STEP_1');
-        */
         this.setInputsInline(false);
         this.setStyle(MRC_STYLE_STEPS);
         this.setMutator(stepContainer.getMutatorIcon(this));

src/blocks/setup_custom_blocks.ts

@@ -20,7 +20,7 @@ import * as Port from './mrc_port';
 import * as SetPythonVariable from './mrc_set_python_variable';
 import * as Steps from './mrc_steps';
 import * as StepContainer from './mrc_step_container';
-import * as AdvanceToStep from './mrc_advance_to_step';
+import * as JumpToStep from './mrc_jump_to_step';
 
 const customBlocks = [
   CallPythonFunction,
@@ -44,7 +44,7 @@ const customBlocks = [
   SetPythonVariable,
   Steps,
   StepContainer,
-  AdvanceToStep
+  JumpToStep
 ];
 
 export const setup = function(forBlock: any) {

src/fields/field_flydown.ts

@@ -23,6 +23,8 @@
  * https://github.com/mit-cml/blockly-plugins/blob/main/block-lexical-variables/src/fields/field_flydown.js
  */
 import * as Blockly from 'blockly';
+import {BLOCK_NAME as JUMP_TO_STEP} from '../blocks/mrc_jump_to_step';
+import {BLOCK_NAME as GET_PARAMETER} from '../blocks/mrc_get_parameter';
 
 enum FlydownLocation {
     DISPLAY_BELOW = 'displayBelow',
@@ -376,7 +378,7 @@ export function createParameterBlock(paramName: string): Blockly.utils.toolbox.F
         contents: [
             {
                 kind: 'block',
-                type: 'mrc_get_parameter',
+                type: GET_PARAMETER,
                 fields: {
                     PARAMETER_NAME: paramName,
                 },
@@ -390,7 +392,7 @@ export function createAdvanceToBlock(stepName: string): Blockly.utils.toolbox.Fl
         contents: [
             {
                 kind: 'block',
-                type: 'mrc_advance_to_step',
+                type: JUMP_TO_STEP,
                 fields: {
                     STEP_NAME: stepName,
                 },