Dart 24898

Closes #21236.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
MacVim devel snapshot 68

Closes #21234.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>