use shortcut begin end syntax inside match and if then else (#2744)

use shortcut begin end syntax inside match and if then else (#2744) #1172