[#215] Suggest existing poetry venvs that are in existing modules #217
Conversation
roxchkplusony
force-pushed
the
roxchkplusony/add-existing-venv-multiproject
branch
from
f8aca8b
to
bc3c2b3
Compare
roxchkplusony
force-pushed
the
roxchkplusony/add-existing-venv-multiproject
branch
from
bc3c2b3
to
b702342
Compare
|
@koxudaxi I must admit that I'm a little uncomfortable with how to test the plugin well. I did test manually in IJ Ultimate. There is some change in behavior here: module path is used instead of project path if it's non-null now. But, I was unable to get module to be non-null in IJ Ultimate when pulling up the dialog, not sure the scenario that would produce. |
| @@ -55,20 +58,32 @@ class PyAddExistingPoetryEnvPanel(private val project: Project?, | |||
| .panel | |||
| add(formPanel, BorderLayout.NORTH) | |||
| addInterpretersAsync(sdkComboBox) { | |||
| detectPoetryEnvs(module, existingSdks, context, project?.basePath ?: newProjectPath) | |||
| val existingSdkPaths = sdkHomes(existingSdks) | |||
| val moduleSdks = allModules(project).parallelStream().flatMap { module -> | |||
There was a problem hiding this comment.
Does not take a crazy long time to load if there are many modules (I have 45):
| .filterNot { it.isAssociatedWithAnotherModule(module) } | ||
| val moduleSdkPaths = moduleSdks.map { it.name }.toSet() | ||
| val sdks = rootSdks.filterNot { moduleSdkPaths.contains(it.name) } + moduleSdks | ||
| sdks.sortedBy { it.name } |
There was a problem hiding this comment.
Sorted alphabetically, which is understandable and searchable (alternative was by module name):
| .filterNot { it.isAssociatedWithAnotherModule(module) } | ||
| val moduleSdkPaths = moduleSdks.map { it.name }.toSet() | ||
| val sdks = rootSdks.filterNot { moduleSdkPaths.contains(it.name) } + moduleSdks |
There was a problem hiding this comment.
Ensure we only have one entry for the project if there's a module at the same level:
There was a problem hiding this comment.
Ensure that associated sdks are not in the dropdown:
| is PyDetectedSdk -> | ||
| setupPoetrySdkUnderProgress(project, module, existingSdks, newProjectPath, | ||
| is PyDetectedSdk -> { | ||
| val mappedModule = sdkToModule[sdk.name] ?: module |
There was a problem hiding this comment.
Created sdk matches the corresponding module's folder's name:
roxchkplusony
changed the title
|
@roxchkplusony
I guess the case is for PyCharm.
All changes look good. I will check the PR in PyCharm. |
|
I can't get the existing SDK 🤔 |
|
|
|
@roxchkplusony Thank you very much. |
|
I'm so glad, thank you for your leadership! |
Fixes #215