Merge pull request #77 from koxudaxi/add_python_version

Add python version for environment name
koxudaxi · Jul 25, 2020 · 695dd66 · 695dd66
2 parents e73c95b + 795ac7a
commit 695dd66
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/resources/META-INF/plugin.xml b/resources/META-INF/plugin.xml
@@ -1,9 +1,14 @@
 <idea-plugin url="https://github.com/koxudaxi/poetry-pycharm-plugin">
     <id>com.koxudaxi.poetry</id>
     <name>Poetry</name>
-    <version>0.0.13</version>
+    <version>0.1.0</version>
     <vendor email="[email protected]">Koudai Aono @koxudaxi</vendor>
     <change-notes><![CDATA[
+    <h2>version 0.1.0</h2>
+    <p>Features</p>
+    <ul>
+        <li>Add python version for environment name [#77]</li>
+    </ul>
     <h2>version 0.0.13</h2>
     <p>Bug fixes</p>
     <ul>

diff --git a/src/com/koxudaxi/poetry/poetry.kt b/src/com/koxudaxi/poetry/poetry.kt
@@ -173,7 +173,13 @@ fun setupPoetrySdkUnderProgress(project: Project?,
         }
     }
 
-    val suggestedName = "Poetry (${PathUtil.getFileName(projectPath)})"
+
+    val pythonVersion = when (python) {
+        is String -> ApplicationManager.getApplication().executeOnPooledThread<String> {  runCommand(FileUtil.toSystemDependentName(projectPath), python, "-V") }.get(10, TimeUnit.SECONDS)
+        else -> syncRunPoetry(FileUtil.toSystemDependentName(projectPath), "run", "python", "-V", defaultResult =  null){it}
+    }?.trim()
+
+    val suggestedName = "Poetry (${PathUtil.getFileName(projectPath)}) $pythonVersion"
     return createSdkByGenerateTask(task, existingSdks, null, projectPath, suggestedName)?.apply {
         associateWithModule(module ?: project?.modules?.firstOrNull(), newProjectPath)
         project?.let { project ->