Merge remote-tracking branch 'origin/master' into pycharm/docker
[idea/community.git] / platform / platform-impl / src / com / intellij / remote / RemoteConnectionCredentialsWrapper.java
index e9c08ff45b2490ec90fb85314a679676d5093eb9..83fbfaa7397c08c354b3777b8b6f36c716412177 100644 (file)
@@ -169,7 +169,9 @@ public class RemoteConnectionCredentialsWrapper {
 
       @Override
       public void vagrant(@NotNull VagrantBasedCredentialsHolder cred) {
-        result.set(VAGRANT_PREFIX + cred.getVagrantFolder());
+        result.set(VAGRANT_PREFIX + cred.getVagrantFolder()
+                   + (StringUtil.isNotEmpty(cred.getMachineName()) ?
+                      "@" + cred.getMachineName() : ""));
       }
 
       @Override