MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-16 22:51:17 +07:00
Code Issues Packages Projects Releases Wiki Activity

[python] saving/restoring preferred interpreter in NPW (PY-60214)

Browse Source 
GitOrigin-RevId: 43cdc3315672c9d5332596ba1a701cdb9fd2c58b
This commit is contained in:
Aleksei Kniazev
2023-11-15 13:02:08 +00:00
committed by intellij-monorepo-bot
parent 98a6b8f137
commit d87b90a195
2 changed files with 49 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
python/src/com/jetbrains/python/sdk/add/v2/PythonAddNewEnvironmentPanel.kt
View File

@@ -128,11 +128,13 @@ class PythonAddNewEnvironmentPanel(val projectPath: ObservableProperty<String>)
}
custom.onShown()
presenter.navigator.restoreLastState()
}
}
fun getSdk(): Sdk? =
when (selectedMode.get()) {
fun getSdk(): Sdk? {
presenter.navigator.saveLastState()
return when (selectedMode.get()) {
PROJECT_VENV -> {
val venvPath = Path.of(projectPath.get(), ".venv")
val venvPathOnTarget = presenter.getPathOnTarget(venvPath)
@@ -148,6 +150,7 @@ class PythonAddNewEnvironmentPanel(val projectPath: ObservableProperty<String>)
}
CUSTOM -> custom.getSdk()
}
}
fun createStatisticsInfo(): InterpreterStatisticsInfo = when (selectedMode.get()) {

44
python/src/com/jetbrains/python/sdk/add/v2/uiUtils.kt
View File

@@ -2,6 +2,7 @@
package com.jetbrains.python.sdk.add.v2
import com.intellij.icons.AllIcons
import com.intellij.ide.util.PropertiesComponent
import com.intellij.openapi.fileChooser.FileChooser
import com.intellij.openapi.fileChooser.FileChooserDescriptorFactory
import com.intellij.openapi.observable.properties.ObservableMutableProperty
@@ -34,6 +35,8 @@ import com.jetbrains.python.PyBundle.message
import com.jetbrains.python.sdk.PyDetectedSdk
import com.jetbrains.python.sdk.add.v2.PythonInterpreterSelectionMethod.CREATE_NEW
import com.jetbrains.python.sdk.add.v2.PythonInterpreterSelectionMethod.SELECT_EXISTING
import com.jetbrains.python.sdk.add.v2.PythonInterpreterSelectionMode.CUSTOM
import com.jetbrains.python.sdk.add.v2.PythonSupportedEnvironmentManagers.VIRTUALENV
import com.jetbrains.python.sdk.flavors.conda.PyCondaEnv
import com.jetbrains.python.sdk.flavors.conda.PyCondaEnvIdentity
import kotlinx.coroutines.CoroutineScope
@@ -78,6 +81,47 @@ class PythonNewEnvironmentDialogNavigator {
}
}
}
fun saveLastState() {
val properties = PropertiesComponent.getInstance()
val mode = selectionMode.get()
properties.setValue(FAV_MODE, mode.toString())
if (mode == CUSTOM) {
val method = selectionMethod.get()
val manager = if (method == CREATE_NEW) newEnvManager.get() else existingEnvManager.get()
properties.setValue(FAV_METHOD, method.toString())
properties.setValue(FAV_MANAGER, manager.toString())
}
else {
// restore defaults
properties.setValue(FAV_METHOD, CREATE_NEW.toString())
properties.setValue(FAV_MANAGER, VIRTUALENV.toString())
}
}
fun restoreLastState() {
val properties = PropertiesComponent.getInstance()
val modeString = properties.getValue(FAV_MODE) ?: return
val mode = PythonInterpreterSelectionMode.valueOf(modeString)
selectionMode.set(mode)
if (mode == CUSTOM) {
val method = PythonInterpreterSelectionMethod.valueOf(properties.getValue(FAV_METHOD) ?: return)
selectionMethod.set(method)
val manager = PythonSupportedEnvironmentManagers.valueOf(properties.getValue(FAV_MANAGER) ?: return)
if (method == CREATE_NEW) newEnvManager.set(manager) else existingEnvManager.set(manager)
}
}
companion object {
const val FAV_MODE = "python.new.interpreter.fav.mode"
const val FAV_METHOD = "python.new.interpreter.fav.method"
const val FAV_MANAGER = "python.new.interpreter.fav.manager"
}
}