style: Fix if-else-block-instead-of-if-exp (SIM108) (part 1) (#4561)

style: Fix if-else-block-instead-of-if-exp (SIM108) (part 1) (#4561) #2039