"Retrieve Source From Org" doesn't update originating source file

Summary

“Retrieve Source From Org” doesn’t update originating source file when run from a single file outside the default directory.

It works as expected when refreshed from manifest.

Steps To Reproduce:

1. > create project with manifest
2. attach to some sandbox with apex code
3. clear everything but apex classes from package.xml
4. Right click on manifest, > retrieve source from org
5. Create the following directory structure: force-app/other/classes
6. Move all the files from force-app/main/default/classes to force-app/other/classes. (Optionally delete the force-app/main/default/classes folder when done)
7. Right click on manifest, > retrieve source from org

Expected: the second time the source is retrieved (step 7), the files under force-app/other/classes will have been updated.

Result: ✅

---

Retrieve Single File

1. navigate to any .cls class under force-app/other/classes
2. right click -> retrieve source from org

Expected: The file you ran the command against on would be refreshed. EG: force-app/other/classes/Foo.cls

Result: ❌ The retrieved code will instead be placed in the default project directory: force-app/main/default/classes

Additional information

LOG:

=== Retrieved Source
FULL NAME               TYPE       PROJECT PATH
──────────────────────  ─────────  ───────────────────────────────────────────────────────────
ABTestingTriggerHelper  ApexClass  force-app/other/classes/ABTestingTriggerHelper.cls
ABTestingTriggerHelper  ApexClass  force-app/other/classes/ABTestingTriggerHelper.cls-meta.xml
23:12:47.72 sfdx force:source:retrieve --sourcepath /Users/jamesbond/Documents/clients/bug-repo/force-app/other/classes/ABTestingTriggerHelper.cls ended with exit code 0

VS Code Version: Version 1.33.1 (1.33.1)

SFDX CLI Version: sfdx-cli/7.5.0-e6ca93eee8 darwin-x64 node-v10.15.3

OS and version: osx 10.14.4

[ChuckJonas]

@shetzel just rang through my reproduction steps in the original post and it friggin work as expected now!

🙇 Finally, we can start using different folder structures

[shetzel]

@ChuckJonas - great question/callout! Sorry, I wasn’t clear in my post. As part of the mpd support for source:deploy and source:retrieve (and push/pull for that matter) the file mapping was changed so that this usecase should now be supported whether multiple package directories are used or not. You’re absolutely right that this usecase isn’t about mpd but about proper file mapping.

If the canary release doesn’t fix this usecase please mention me and I’ll make sure it does. This should definitely work and I’m sorry it’s taken this long to get it fixed.