PY-85418 Cannot select interpreter to use with black

reverted some changes from lsp feature

closes PY-85418

GitOrigin-RevId: 85ec188c3afd3d77cdcfb7cb65663133497dadc9

Author: Morgan Bartholomew

python/src/com/jetbrains/python/black/configuration/BlackFormatterConfigurable.kt

@@ -32,7 +32,6 @@ import com.jetbrains.python.black.BlackFormatterUtil
 import com.jetbrains.python.black.BlackFormatterVersionService
 import com.jetbrains.python.black.BlackFormatterVersionService.Companion.UNKNOWN_VERSION
 import com.jetbrains.python.black.configuration.BlackFormatterConfiguration.BlackFormatterOption.Companion.toCliOptionFlags
-import com.jetbrains.python.externaltools.configuration.createPythonSdkComboBox
 import com.jetbrains.python.packaging.management.ui.PythonPackageManagerUI
 import com.jetbrains.python.packaging.management.ui.installPackageBackground
 import com.jetbrains.python.sdk.pythonSdk
@@ -73,8 +72,7 @@ class BlackFormatterConfigurable(val project: Project) : BoundConfigurable(PyBun
       .withTitle(@Suppress("DialogTitleCapitalization") PyBundle.message("black.select.path.to.executable")))
   }
 
-  // TODO: initial should be project default
-  private val sdkSelectionComboBox = createPythonSdkComboBox(project, null)
+  private val sdkSelectionComboBox = createPythonSdkComboBox(project.modules.mapNotNull { it.pythonSdk }, null)
 
   private val cliArgumentsTextField = BlackTextFieldWithAutoCompletion(project, object :
     TextFieldWithAutoCompletionListProvider<BlackFormatterConfiguration.CliOptionFlag>(
@@ -181,6 +179,7 @@ class BlackFormatterConfigurable(val project: Project) : BoundConfigurable(PyBun
     executionModeComboBox.addActionListener { updateUiState() }
 
     sdkSelectionComboBox.addActionListener {
+      selectedSdk = sdkSelectionComboBox.item
       updateSdkInfo()
       updateUiState()
     }
@@ -191,6 +190,7 @@ class BlackFormatterConfigurable(val project: Project) : BoundConfigurable(PyBun
     enableOnSaveCheckBox.isSelected = storedState.enabledOnSave
     executionModeComboBox.item = storedState.executionMode
     cliArgumentsTextField.text = storedState.cmdArguments
+    sdkSelectionComboBox.item = selectedSdk
 
     blackExecutablePathField.emptyText.text = getBlackExecPathPlaceholderMessage()
     storedState.pathToExecutable?.let {

python/src/com/jetbrains/python/black/configuration/PySdkChooser.kt

@@ -0,0 +1,26 @@
+// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+package com.jetbrains.python.black.configuration
+
+import com.intellij.openapi.projectRoots.Sdk
+import com.intellij.openapi.ui.ComboBox
+import com.intellij.openapi.util.io.FileUtil
+import com.intellij.ui.CollectionComboBoxModel
+import com.intellij.ui.ComboboxSpeedSearch
+import com.jetbrains.python.sdk.PySdkListCellRenderer
+
+internal fun createPythonSdkComboBox(sdks: List<Sdk>, initialSelection: Sdk?): ComboBox<Sdk> {
+  val comboBox = ComboBox<Sdk>()
+  comboBox.model = CollectionComboBoxModel(sdks.toMutableList(), initialSelection)
+  comboBox.renderer = PySdkListCellRenderer()
+  comboBox.addActionListener { comboBox.updateTooltip() }
+  ComboboxSpeedSearch.installOn(comboBox)
+  comboBox.updateTooltip()
+  return comboBox
+}
+
+private fun ComboBox<*>.updateTooltip() {
+  val item: Any? = getSelectedItem()
+  val sdkHomePath = if (item is Sdk) item.homePath else null
+  setToolTipText(if (sdkHomePath != null) FileUtil.toSystemDependentName(sdkHomePath) else null)
+}
+

python/src/com/jetbrains/python/externaltools/configuration/PySdkChooser.kt

@@ -2,41 +2,11 @@
 package com.jetbrains.python.externaltools.configuration
 
 import com.intellij.openapi.project.Project
-import com.intellij.openapi.project.modules
 import com.intellij.openapi.projectRoots.Sdk
-import com.intellij.openapi.ui.ComboBox
-import com.intellij.openapi.util.io.FileUtil
-import com.intellij.ui.CollectionComboBoxModel
-import com.intellij.ui.ComboboxSpeedSearch
-import com.jetbrains.python.sdk.PySdkListCellRenderer
 import com.jetbrains.python.sdk.PythonSdkUtil
 import com.jetbrains.python.sdk.pythonSdk
 
 const val DEFAULT_ENVIRONMENT: String = "Project Default"
 
 fun Project.sdkByNameDefaultAware(name: String): Sdk? =
   if (name == DEFAULT_ENVIRONMENT) pythonSdk else PythonSdkUtil.findSdkByKey(name)
-
-fun createPythonSdkComboBox(project: Project, initialSelection: Any?): ComboBox<Any> {
-  val sdks = buildList {
-    project.pythonSdk?.let { add(it) }
-    project.modules.mapNotNullTo(this) { it.pythonSdk }
-  }.distinct()
-  return ComboBox<Any>().apply {
-    model = CollectionComboBoxModel(
-      // we use a simple string here, ideally we should introduce some special class for this
-      (listOf(DEFAULT_ENVIRONMENT) + sdks).toMutableList(),
-      initialSelection,
-    )
-    renderer = PySdkListCellRenderer()
-    addActionListener { updateTooltip() }
-    ComboboxSpeedSearch.installOn(this)
-    updateTooltip()
-  }
-}
-
-private fun ComboBox<*>.updateTooltip() {
-  val item = selectedItem
-  val sdkHomePath = if (item is Sdk) item.homePath else null
-  setToolTipText(if (sdkHomePath != null) FileUtil.toSystemDependentName(sdkHomePath) else null)
-}