MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-08 15:09:39 +07:00
Code Issues Packages Projects Releases Wiki Activity

cleanup, remove dead code

Browse Source 
(cherry picked from commit f7912b44dc75c228a9c763cf0b517d3aee0ea483)

IJ-MR-141257

GitOrigin-RevId: 095827de20dd1c2dd83dd8eedb6b40a9bb3c8a64
This commit is contained in:
Aleksandr Sorotskii
2024-07-29 23:25:38 +02:00
committed by intellij-monorepo-bot
parent c728b222ee
commit 56b48787e3
4 changed files with 3 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
python/ide/impl/src/com/intellij/pycharm/community/ide/impl/newProject/steps/PythonGenerateProjectCallback.java
View File

@@ -36,6 +36,7 @@ public class PythonGenerateProjectCallback<T> extends AbstractNewProjectStep.Abs
public void consume(@Nullable ProjectSettingsStepBase<T> step, @NotNull ProjectGeneratorPeer<T> projectGeneratorPeer) {
if (!(step instanceof ProjectSpecificSettingsStep settingsStep)) return;
// FIXME: pass welcome script creation via settings
if (step instanceof PythonProjectSpecificSettingsStep) {
// has to be set before project generation
boolean welcomeScript = PropertiesComponent.getInstance().getBoolean("PyCharm.NewProject.Welcome", false);
@@ -45,17 +46,6 @@ public class PythonGenerateProjectCallback<T> extends AbstractNewProjectStep.Abs
final DirectoryProjectGenerator generator = settingsStep.getProjectGenerator();
Sdk sdk = settingsStep.getSdk();
if (generator instanceof PythonProjectGenerator) {
final BooleanFunction<PythonProjectGenerator> beforeProjectGenerated = ((PythonProjectGenerator<?>)generator).beforeProjectGenerated(sdk);
if (beforeProjectGenerated != null) {
final boolean result = beforeProjectGenerated.fun((PythonProjectGenerator)generator);
if (!result) {
Messages.showWarningDialog(PyBundle.message("project.cannot.be.generated"), PyBundle.message("error.in.project.generation"));
return;
}
}
}
final Object settings = computeProjectSettings(generator, settingsStep, projectGeneratorPeer);
final Project newProject = generateProject(settingsStep, settings);
if (settings instanceof PyNewProjectSettings) {

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

@@ -309,10 +309,6 @@ public abstract class PythonProjectGenerator<T extends PyNewProjectSettings> ext
}
}
public @Nullable BooleanFunction<PythonProjectGenerator> beforeProjectGenerated(final @Nullable Sdk sdk) {
return null;
}
public void afterProjectGenerated(final @NotNull Project project) {
}

2
python/src/com/jetbrains/python/sdk/add/v2/PoetryNewEnvironmentCreator.kt
View File

@@ -56,7 +56,7 @@ class PoetryNewEnvironmentCreator(model: PythonMutableTargetAddInterpreterModel)
}
override fun getOrCreateSdk(): Sdk? {
override fun getOrCreateSdk(): Sdk {
if (model is PythonLocalAddInterpreterModel) {
PropertiesComponent.getInstance().poetryPath = model.state.poetryExecutable.get().nullize()
}

2
python/src/com/jetbrains/python/sdk/poetry/PoetryCommandExecutor.kt
View File

@@ -60,7 +60,7 @@ internal fun detectPoetryExecutable(): Path? {
else -> "poetry"
}
return PathEnvironmentVariableUtil.findInPath(name)?.toPath() ?: System.getProperty("user.home")?.let { homePath ->
Path.of(homePath,".poetry", "bin", name).takeIf { it.exists() }
Path.of(homePath, ".poetry", "bin", name).takeIf { it.exists() }
}
}