PY-18177 New project created in wrong directory

This commit is contained in:
Ekaterina Tuzova
2016-05-26 17:36:51 +03:00
parent b992a08822
commit 2a85576d66
@@ -28,10 +28,10 @@ import com.intellij.openapi.projectRoots.SdkAdditionalData;
import com.intellij.openapi.projectRoots.impl.SdkConfigurationUtil;
import com.intellij.openapi.roots.ui.configuration.projectRoot.ProjectSdksModel;
import com.intellij.openapi.util.Computable;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.vfs.LocalFileSystem;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.platform.DirectoryProjectGenerator;
import com.intellij.util.Function;
import com.intellij.util.NullableConsumer;
import com.jetbrains.python.configuration.PyConfigurableInterpreterList;
import com.jetbrains.python.newProject.PyNewProjectSettings;
@@ -94,7 +94,8 @@ public class GenerateProjectCallback implements NullableConsumer<ProjectSettings
private static Project generateProject(@NotNull final Project project,
@NotNull final ProjectSettingsStepBase settings) {
final DirectoryProjectGenerator generator = settings.getProjectGenerator();
return AbstractNewProjectStep.doGenerateProject(project, settings.getProjectLocation(), generator,
final String location = FileUtil.expandUserHome(settings.getProjectLocation());
return AbstractNewProjectStep.doGenerateProject(project, location, generator,
file -> computeProjectSettings(generator, (ProjectSpecificSettingsStep)settings));
}