Discard renamed directory in IDE throws error

Description

Noticed while locally on master.

1. Rename a directory in the IDE.
2. Discard one of the renamed file's changes.
3. The IDE will error out and the renamed directory is still there.

20200107_rename_directory_ide_bug