Fix at-each-key-value-single-line
end positions
#689
Merged
at-each-key-value-single-line
end positions
#689