MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-03-22 15:19:59 +07:00
Code Issues Packages Projects Releases Wiki Activity

DS-6061 Disable new interpreter creation UI for DataSpell

Browse Source 
GitOrigin-RevId: eede0cb124e6b9502d36a370ac14b414b20704c3
This commit is contained in:
Anton Bragin
2023-12-01 15:54:22 +01:00
committed by intellij-monorepo-bot
parent 2e1c6343f2
commit 4778e8d59e
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
python/ide/impl/src/com/jetbrains/python/newProject/steps/PyCharmNewProjectStep.java
View File

@@ -6,7 +6,6 @@ import com.intellij.ide.util.projectWizard.ProjectSettingsStepBase;
import com.intellij.openapi.actionSystem.AnAction;
import com.intellij.openapi.actionSystem.DefaultActionGroup;
import com.intellij.openapi.util.Pair;
import com.intellij.openapi.util.registry.Registry;
import com.intellij.platform.DirectoryProjectGenerator;
import com.intellij.util.ObjectUtils;
import com.jetbrains.python.PyCharmCommunityCustomizationBundle;
@@ -14,7 +13,12 @@ import com.jetbrains.python.newProject.*;
import one.util.streamex.StreamEx;
import org.jetbrains.annotations.NotNull;
import java.util.*;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Comparator;
import java.util.List;
import static com.jetbrains.python.newProject.PythonProjectGenerator.useNewInterpreterCreationUi;
public final class PyCharmNewProjectStep extends AbstractNewProjectStep<PyNewProjectSettings> {
public PyCharmNewProjectStep() {
@@ -43,7 +47,7 @@ public final class PyCharmNewProjectStep extends AbstractNewProjectStep<PyNewPro
//noinspection unchecked
return new NewProjectWizardProjectSettingsStep<PyNewProjectSettings>(npwGenerator);
}
else if (Registry.is("python.new.interpreter.creation.ui")) {
else if (useNewInterpreterCreationUi()) {
return new PythonProjectSpecificSettingsStep<>(projectGenerator, callback);
}
else {
@@ -65,7 +69,7 @@ public final class PyCharmNewProjectStep extends AbstractNewProjectStep<PyNewPro
return 0;
}));
if (Registry.is("python.new.interpreter.creation.ui")) {
if (useNewInterpreterCreationUi()) {
//noinspection unchecked
var map = StreamEx.of(generators)
.map(generator -> new Pair<>(generator, getActions((DirectoryProjectGenerator<PyNewProjectSettings>)generator, callback)))

7
python/src/com/jetbrains/python/newProject/PythonProjectGenerator.java
View File

@@ -36,6 +36,7 @@ import com.intellij.openapi.util.registry.Registry;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.platform.DirectoryProjectGeneratorBase;
import com.intellij.util.BooleanFunction;
import com.intellij.util.PlatformUtils;
import com.intellij.util.containers.ContainerUtil;
import com.jetbrains.python.PyBundle;
import com.jetbrains.python.PyPsiPackageUtil;
@@ -176,7 +177,7 @@ public abstract class PythonProjectGenerator<T extends PyNewProjectSettings> ext
if (sdk instanceof PyLazySdk) {
final Sdk createdSdk = ((PyLazySdk)sdk).create();
settings.setSdk(createdSdk);
if (createdSdk != null && !Registry.is("python.new.interpreter.creation.ui")) {
if (createdSdk != null && !useNewInterpreterCreationUi()) {
SdkConfigurationUtil.addSdk(createdSdk);
}
}
@@ -478,4 +479,8 @@ public abstract class PythonProjectGenerator<T extends PyNewProjectSettings> ext
}
}
}
public static boolean useNewInterpreterCreationUi() {
return Registry.is("python.new.interpreter.creation.ui") && !PlatformUtils.isDataSpell();
}
}