Fix missing "promise kept" status for the last line in a file.

For the last line we shortcut out using MatchRegion, but previously
we did not set the promise status.

Fixes issue 2943.
(cherry picked from commit 3c75e08892ac5f4092ec79f53cba8d1f3a08c76f)
Autotest fails because of cached bundle result. Fix by splitting.
(cherry picked from commit 18a831d23c88b15b232be51548f784a5fb6d51ce)
Add fix for 2943 again