Add default except block to try block, focus block after else/finally on and off

minjk-bl · minjk-bl · commit c6e40217a3e0 · 2022-01-21T12:12:22.000+09:00
diff --git a/js/MainFrame.js b/js/MainFrame.js
@@ -372,6 +372,7 @@ define([
                         if (OptionComponent) {
                             let taskState = menuState.taskState;
                             let blockState = menuState.blockState;
+                            let tmpState = menuState.tmpState;
                             let state = {
                                 ...taskState,
                                 config: menuConfig
@@ -386,9 +387,14 @@ define([
                                     parentBlock = newBlock; // set parent block of created block
                                 } else {
                                     if (prevBlock != null && !newBlock.isGroup) {
-                                        newBlock.setDepth(prevBlock.getChildDepth());
+                                        let newDepth = prevBlock.getChildDepth();
+                                        if (tmpState && tmpState.relativeDepth) {
+                                            newDepth = parentBlock.getChildDepth() + tmpState.relativeDepth;
+                                        }
+                                        newBlock.setDepth(newDepth);
                                     }
                                 }
+                                vpLog.display(VP_LOG_TYPE.DEVELOP, 'new block ' + position + ' with depth ' + newBlock.depth);
                                 prevBlock = newBlock;
                             } else {
                                 // add to task list
@@ -485,10 +491,42 @@ define([
                         }
                     ]
                     break;
+                case 'lgCtrl_try':
+                    childBlocks = [
+                        { 
+                            menuId: 'lgCtrl_pass', 
+                            menuState: { 
+                                blockState: {
+                                    isGroup: false
+                                }
+                            }
+                        },
+                        { 
+                            menuId: 'lgCtrl_except', 
+                            menuState: { 
+                                blockState: {
+                                    isGroup: false
+                                },
+                                tmpState: {
+                                    relativeDepth: -1
+                                }
+                            }
+                        },
+                        { 
+                            menuId: 'lgCtrl_pass', 
+                            menuState: { 
+                                blockState: {
+                                    isGroup: false
+                                }
+                            }
+                        }
+
+                    ];
+                    break;
+                    break;
                 case 'lgCtrl_for':
                 case 'lgCtrl_while':
                 case 'lgCtrl_if':
-                case 'lgCtrl_try':
                 case 'lgCtrl_elif':
                 case 'lgCtrl_except':
                 case 'lgCtrl_else':
diff --git a/js/board/BoardFrame.js b/js/board/BoardFrame.js
@@ -768,6 +768,10 @@ define([
                 if (elseBlock.length > 0) {
                     this.removeBlock(elseBlock[0]);
                 }
+                // focus it
+                setTimeout(function() {
+                    block.focusItem();
+                }, 100);
             }
         }
 
@@ -800,6 +804,10 @@ define([
                 if (finallyBlock) {
                     this.removeBlock(finallyBlock);
                 }
+                // focus it
+                setTimeout(function() {
+                    block.focusItem();
+                }, 100);
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -768,6 +768,10 @@ define([`
`768`	`768`	`if (elseBlock.length > 0) {`
`769`	`769`	`this.removeBlock(elseBlock[0]);`
`770`	`770`	`}`
	`771`	`+ // focus it`
	`772`	`+ setTimeout(function() {`
	`773`	`+ block.focusItem();`
	`774`	`+ }, 100);`
`771`	`775`	`}`
`772`	`776`	`}`
`773`	`777`
`@@ -800,6 +804,10 @@ define([`
`800`	`804`	`if (finallyBlock) {`
`801`	`805`	`this.removeBlock(finallyBlock);`
`802`	`806`	`}`
	`807`	`+ // focus it`
	`808`	`+ setTimeout(function() {`
	`809`	`+ block.focusItem();`
	`810`	`+ }, 100);`
`803`	`811`	`}`
`804`	`812`	`}`
`805`	`813`