- use PsiStatement as scope instead of PsiIfStatement - more tests (cherry picked from commit 2602190296988a80d54520c7a0f15fd0f8e3d942) IJ-CR-147991 GitOrigin-RevId: 45d61e2aa9e70c3aa68032d21a77f05754a76534