Fix#1302: Check the logic again and ensure related Tests pass
Fix#1302: Check the logic again and ensure related Tests pass

Chillee/VSCodeNeovim,Chillee/VSCodeNeovim,Chillee/VSCodeNeovim,VSCodeVim/Vim,westim/Vim,VSCodeVim/Vim,Chillee/Vim,westim/Vim,Chillee/Vim,westim/Vim