Refactor utbot-intellij-python package names

tamarinvs19 · tamarinvs19 · commit 3c201ebea5d7 · 2023-09-13T14:55:19.000+03:00
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -60,6 +60,8 @@ include("utbot-spring-framework")
 include("utbot-spring-commons-api")
 include("utbot-spring-commons")
 include("utbot-spring-analyzer")
+include("utbot-spring-sample")
+include("utbot-spring-test")
 
 if (pythonIde.split(",").contains(ideType)) {
     include("utbot-python")
@@ -70,9 +72,6 @@ if (pythonIde.split(",").contains(ideType)) {
     include("utbot-python-executor")
 }
 
-include("utbot-spring-sample")
-include("utbot-spring-test")
-
 if (projectType == ultimateEdition) {
     if (jsBuild == buildType || jsIde.split(",").contains(ideType)) {
         include("utbot-js")
@@ -88,3 +87,4 @@ if (projectType == ultimateEdition) {
 }
 
 include("utbot-light")
+include("utbot-intellij-java")
diff --git a/utbot-intellij-python/build.gradle.kts b/utbot-intellij-python/build.gradle.kts
@@ -43,13 +43,14 @@ dependencies {
 }
 
 intellij {
-
-    val androidPlugins = listOf("org.jetbrains.android")
-
     val jvmPlugins = listOf(
         "java"
     )
 
+    val kotlinPlugins = mutableListOf(
+        "org.jetbrains.kotlin"
+    )
+
     val pythonCommunityPlugins = listOf(
         "PythonCore:${pythonCommunityPluginVersion}"
     )
@@ -58,24 +59,17 @@ intellij {
         "Pythonid:${pythonUltimatePluginVersion}"
     )
 
-    val jsPlugins = listOf(
-        "JavaScript"
-    )
-
-    val goPlugins = listOf(
-        "org.jetbrains.plugins.go:${goPluginVersion}"
-    )
-
     plugins.set(
         when (ideType) {
-            "IC" -> jvmPlugins + pythonCommunityPlugins + androidPlugins
-            "IU" -> jvmPlugins + pythonUltimatePlugins + jsPlugins + goPlugins + androidPlugins
-            "PC" -> pythonCommunityPlugins
-            "PY" -> pythonUltimatePlugins // something else, JS?
+            "IC" -> jvmPlugins + kotlinPlugins + pythonCommunityPlugins
+            "IU" -> jvmPlugins + kotlinPlugins + pythonUltimatePlugins
+            "PC" -> jvmPlugins + kotlinPlugins + pythonCommunityPlugins
+            "PY" -> jvmPlugins + kotlinPlugins + pythonUltimatePlugins // something else, JS?
             else -> jvmPlugins
         }
     )
 
     version.set(ideVersion)
     type.set(ideType)
+    SettingsTemplateHelper.proceed(project)
 }
diff --git a/utbot-intellij-python/src/main/java/org/utbot/intellij/plugin/python/table/UtPyClassItem.java b/utbot-intellij-python/src/main/java/org/utbot/intellij/plugin/python/table/UtPyClassItem.java
@@ -1,4 +1,4 @@
-package org.utbot.intellij.plugin.language.python.table;
+package org.utbot.intellij.plugin.python.table;
 
 import com.intellij.icons.AllIcons;
 import com.jetbrains.python.psi.PyClass;
diff --git a/utbot-intellij-python/src/main/java/org/utbot/intellij/plugin/python/table/UtPyFunctionItem.java b/utbot-intellij-python/src/main/java/org/utbot/intellij/plugin/python/table/UtPyFunctionItem.java
@@ -1,4 +1,4 @@
-package org.utbot.intellij.plugin.language.python.table;
+package org.utbot.intellij.plugin.python.table;
 
 import com.intellij.icons.AllIcons;
 import com.jetbrains.python.psi.PyElement;
diff --git a/utbot-intellij-python/src/main/java/org/utbot/intellij/plugin/python/table/UtPyMemberSelectionTable.java b/utbot-intellij-python/src/main/java/org/utbot/intellij/plugin/python/table/UtPyMemberSelectionTable.java
@@ -1,4 +1,4 @@
-package org.utbot.intellij.plugin.language.python.table;
+package org.utbot.intellij.plugin.python.table;
 
 import com.intellij.openapi.actionSystem.BackgroundableDataProvider;
 import com.intellij.openapi.actionSystem.CommonDataKeys;
diff --git a/utbot-intellij-python/src/main/java/org/utbot/intellij/plugin/python/table/UtPyTableItem.java b/utbot-intellij-python/src/main/java/org/utbot/intellij/plugin/python/table/UtPyTableItem.java
@@ -1,4 +1,4 @@
-package org.utbot.intellij.plugin.language.python.table;
+package org.utbot.intellij.plugin.python.table;
 
 import com.jetbrains.python.psi.PyElement;
 
diff --git a/utbot-intellij-python/src/main/java/org/utbot/intellij/plugin/python/table/Utils.java b/utbot-intellij-python/src/main/java/org/utbot/intellij/plugin/python/table/Utils.java
@@ -1,4 +1,4 @@
-package org.utbot.intellij.plugin.language.python.table;
+package org.utbot.intellij.plugin.python.table;
 
 import java.util.HashSet;
 import java.util.List;
diff --git a/utbot-intellij-python/src/main/kotlin/org/utbot/intellij/plugin/python/IntellijRequirementsInstaller.kt b/utbot-intellij-python/src/main/kotlin/org/utbot/intellij/plugin/python/IntellijRequirementsInstaller.kt
@@ -1,4 +1,4 @@
-package org.utbot.intellij.plugin.language.python
+package org.utbot.intellij.plugin.python
 
 import com.intellij.notification.NotificationType
 import com.intellij.openapi.application.invokeLater
diff --git a/utbot-intellij-python/src/main/kotlin/org/utbot/intellij/plugin/python/PythonDialogProcessor.kt b/utbot-intellij-python/src/main/kotlin/org/utbot/intellij/plugin/python/PythonDialogProcessor.kt
@@ -1,4 +1,4 @@
-package org.utbot.intellij.plugin.language.python
+package org.utbot.intellij.plugin.python
 
 import com.intellij.openapi.application.ReadAction
 import com.intellij.openapi.application.invokeLater
diff --git a/utbot-intellij-python/src/main/kotlin/org/utbot/intellij/plugin/python/PythonDialogWindow.kt b/utbot-intellij-python/src/main/kotlin/org/utbot/intellij/plugin/python/PythonDialogWindow.kt
@@ -1,4 +1,4 @@
-package org.utbot.intellij.plugin.language.python
+package org.utbot.intellij.plugin.python
 
 import com.intellij.openapi.components.service
 import com.intellij.openapi.ui.ComboBox
@@ -16,19 +16,16 @@ import com.jetbrains.python.psi.PyClass
 import com.jetbrains.python.psi.PyFunction
 import org.utbot.framework.codegen.domain.ProjectType
 import org.utbot.framework.codegen.domain.TestFramework
-import org.utbot.intellij.plugin.language.python.settings.PythonTestFrameworkMapper
-import org.utbot.intellij.plugin.language.python.settings.loadStateFromModel
-import org.utbot.intellij.plugin.language.python.table.UtPyClassItem
-import org.utbot.intellij.plugin.language.python.table.UtPyFunctionItem
-import org.utbot.intellij.plugin.language.python.table.UtPyMemberSelectionTable
-import org.utbot.intellij.plugin.language.python.table.UtPyTableItem
+import org.utbot.intellij.plugin.python.settings.PythonTestFrameworkMapper
+import org.utbot.intellij.plugin.python.settings.loadStateFromModel
+import org.utbot.intellij.plugin.python.table.UtPyClassItem
+import org.utbot.intellij.plugin.python.table.UtPyFunctionItem
+import org.utbot.intellij.plugin.python.table.UtPyMemberSelectionTable
+import org.utbot.intellij.plugin.python.table.UtPyTableItem
 import org.utbot.intellij.plugin.settings.Settings
 import org.utbot.intellij.plugin.ui.components.TestSourceDirectoryChooser
 import org.utbot.intellij.plugin.ui.utils.createTestFrameworksRenderer
-import java.awt.event.ActionEvent
 import java.util.concurrent.TimeUnit
-import javax.swing.AbstractAction
-import javax.swing.Action
 import javax.swing.DefaultComboBoxModel
 import javax.swing.JComponent
 
@@ -113,7 +110,7 @@ class PythonDialogWindow(val model: PythonTestsModel) : DialogWrapper(model.proj
         val functionItems = functions
             .groupBy { it.containingClass }
             .flatMap { (_, pyFuncs) ->
-                pyFuncs.map {UtPyFunctionItem(it)}
+                pyFuncs.map { UtPyFunctionItem(it) }
             }
         val classItems = classes.map {
             UtPyClassItem(it)
diff --git a/utbot-intellij-python/src/main/kotlin/org/utbot/intellij/plugin/python/PythonIntellijProcessor.kt b/utbot-intellij-python/src/main/kotlin/org/utbot/intellij/plugin/python/PythonIntellijProcessor.kt
@@ -1,4 +1,4 @@
-package org.utbot.intellij.plugin.language.python
+package org.utbot.intellij.plugin.python
 
 import com.intellij.codeInsight.CodeInsightUtil
 import com.intellij.openapi.application.invokeLater
@@ -7,6 +7,7 @@ import com.intellij.openapi.project.Project
 import com.intellij.psi.PsiDirectory
 import com.intellij.psi.PsiFileFactory
 import com.jetbrains.python.psi.PyClass
+import org.utbot.intellij.plugin.python.language.PythonLanguageAssistant
 import org.utbot.intellij.plugin.ui.utils.showErrorDialogLater
 import org.utbot.python.PythonTestGenerationConfig
 import org.utbot.python.PythonTestGenerationProcessor
diff --git a/utbot-intellij-python/src/main/kotlin/org/utbot/intellij/plugin/python/PythonTestsModel.kt b/utbot-intellij-python/src/main/kotlin/org/utbot/intellij/plugin/python/PythonTestsModel.kt
@@ -1,4 +1,4 @@
-package org.utbot.intellij.plugin.language.python
+package org.utbot.intellij.plugin.python
 
 import com.intellij.openapi.module.Module
 import com.intellij.openapi.project.Project
@@ -8,7 +8,7 @@ import com.jetbrains.python.psi.PyFile
 import org.utbot.framework.codegen.domain.RuntimeExceptionTestsBehaviour
 import org.utbot.framework.codegen.domain.TestFramework
 import org.utbot.framework.codegen.services.language.CgLanguageAssistant
-import org.utbot.intellij.plugin.language.python.table.UtPyTableItem
+import org.utbot.intellij.plugin.python.table.UtPyTableItem
 import org.utbot.intellij.plugin.models.BaseTestsModel
 
 class PythonTestsModel(
diff --git a/utbot-intellij-python/src/main/kotlin/org/utbot/intellij/plugin/python/Utils.kt b/utbot-intellij-python/src/main/kotlin/org/utbot/intellij/plugin/python/Utils.kt
@@ -1,4 +1,4 @@
-package org.utbot.intellij.plugin.language.python
+package org.utbot.intellij.plugin.python
 
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.roots.ProjectFileIndex
@@ -9,9 +9,9 @@ import com.intellij.psi.PsiElement
 import com.jetbrains.python.psi.PyClass
 import com.jetbrains.python.psi.PyElement
 import com.jetbrains.python.psi.PyFunction
-import org.utbot.intellij.plugin.language.python.table.UtPyClassItem
-import org.utbot.intellij.plugin.language.python.table.UtPyFunctionItem
-import org.utbot.intellij.plugin.language.python.table.UtPyTableItem
+import org.utbot.intellij.plugin.python.table.UtPyClassItem
+import org.utbot.intellij.plugin.python.table.UtPyFunctionItem
+import org.utbot.intellij.plugin.python.table.UtPyTableItem
 import org.utbot.python.utils.RequirementsUtils
 import kotlin.random.Random
 
diff --git a/utbot-intellij-python/src/main/kotlin/org/utbot/intellij/plugin/python/language/PythonLanguageAssistant.kt b/utbot-intellij-python/src/main/kotlin/org/utbot/intellij/plugin/python/language/PythonLanguageAssistant.kt
@@ -1,4 +1,4 @@
-package org.utbot.intellij.plugin.language.python
+package org.utbot.intellij.plugin.python.language
 
 import com.intellij.lang.Language
 import com.intellij.openapi.actionSystem.AnActionEvent
@@ -19,6 +19,7 @@ import org.jetbrains.kotlin.idea.core.util.toPsiDirectory
 import org.jetbrains.kotlin.idea.core.util.toPsiFile
 import org.utbot.framework.plugin.api.util.LockFile
 import org.utbot.intellij.plugin.language.agnostic.LanguageAssistant
+import org.utbot.intellij.plugin.python.*
 
 object PythonLanguageAssistant : LanguageAssistant() {
 
diff --git a/utbot-intellij-python/src/main/kotlin/org/utbot/intellij/plugin/python/settings/PythonTestFrameworkMapper.kt b/utbot-intellij-python/src/main/kotlin/org/utbot/intellij/plugin/python/settings/PythonTestFrameworkMapper.kt
@@ -1,4 +1,4 @@
-package org.utbot.intellij.plugin.language.python.settings
+package org.utbot.intellij.plugin.python.settings
 
 import org.utbot.framework.codegen.domain.TestFramework
 import org.utbot.intellij.plugin.settings.TestFrameworkMapper
diff --git a/utbot-intellij-python/src/main/kotlin/org/utbot/intellij/plugin/python/settings/Settings.kt b/utbot-intellij-python/src/main/kotlin/org/utbot/intellij/plugin/python/settings/Settings.kt
@@ -1,7 +1,7 @@
-package org.utbot.intellij.plugin.language.python.settings
+package org.utbot.intellij.plugin.python.settings
 
 import org.utbot.framework.codegen.domain.HangingTestsTimeout
-import org.utbot.intellij.plugin.language.python.PythonTestsModel
+import org.utbot.intellij.plugin.python.PythonTestsModel
 import org.utbot.intellij.plugin.settings.Settings
 
 fun loadStateFromModel(settings: Settings, model: PythonTestsModel) {
diff --git a/utbot-ui-commons/build.gradle.kts b/utbot-ui-commons/build.gradle.kts
@@ -37,7 +37,6 @@ tasks {
     runIde {
         jvmArgs("-Xmx2048m")
         jvmArgs("--add-exports", "java.desktop/sun.awt.windows=ALL-UNNAMED")
-        androidStudioPath?.let { ideDir.set(file(it)) }
     }
 
     patchPluginXml {
diff --git a/utbot-ui-commons/src/main/kotlin/org/utbot/intellij/plugin/language/agnostic/LanguageAssistant.kt b/utbot-ui-commons/src/main/kotlin/org/utbot/intellij/plugin/language/agnostic/LanguageAssistant.kt
@@ -97,9 +97,9 @@ abstract class LanguageAssistant {
 private fun loadWithException(language: Language): Class<*>? {
     try {
         return when (language.id) {
-            "Python" -> Class.forName("org.utbot.intellij.plugin.language.python.PythonLanguageAssistant")
-            "ECMAScript 6" -> Class.forName("org.utbot.intellij.plugin.language.js.JsLanguageAssistant")
-            "go" -> Class.forName("org.utbot.intellij.plugin.language.go.GoLanguageAssistant")
+            "Python" -> Class.forName("org.utbot.intellij.plugin.python.language.PythonLanguageAssistant")
+            "ECMAScript 6" -> Class.forName("org.utbot.intellij.plugin.js.language.JsLanguageAssistant")
+            "go" -> Class.forName("org.utbot.intellij.plugin.go.language.GoLanguageAssistant")
             "JAVA", "kotlin" -> Class.forName("org.utbot.intellij.plugin.language.JvmLanguageAssistant")
             else -> error("Unknown language id: ${language.id}")
         }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package org.utbot.intellij.plugin.language.python.table;`
	`1`	`+package org.utbot.intellij.plugin.python.table;`
`2`	`2`
`3`	`3`	`import com.intellij.icons.AllIcons;`
`4`	`4`	`import com.jetbrains.python.psi.PyClass;`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,6 @@ tasks {`
`37`	`37`	`runIde {`
`38`	`38`	`jvmArgs("-Xmx2048m")`
`39`	`39`	`jvmArgs("--add-exports", "java.desktop/sun.awt.windows=ALL-UNNAMED")`
`40`		`- androidStudioPath?.let { ideDir.set(file(it)) }`
`41`	`40`	`}`
`42`	`41`
`43`	`42`	`patchPluginXml {`