JetBrains-Research · diffitask · Nov 14, 2023 · Oct 31, 2023 · Oct 31, 2023 · Oct 31, 2023
diff --git a/ide-former-plugin/gradle.properties b/ide-former-plugin/gradle.properties
@@ -13,11 +13,12 @@ pluginUntilBuild = 232.*
 
 # IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#configuration-intellij-extension
 platformType = IC
-platformVersion = 2023.2
+platformVersion = 2023.2.4
 
 # Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
+# To find actual PythonCore version go to https://plugins.jetbrains.com/plugin/631-python/versions and check, which version is matched with platformVersion
 # Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22
-platformPlugins = com.intellij.java, org.jetbrains.kotlin
+platformPlugins = com.intellij.java, org.jetbrains.kotlin, PythonCore:232.10203.2
 
 # Gradle Releases -> https://github.com/gradle/gradle/releases
 gradleVersion = 8.3

diff --git a/...core/src/main/kotlin/org/jetbrains/research/ideFormerPlugin/api/models/KtFileKtMethods.kt b/...core/src/main/kotlin/org/jetbrains/research/ideFormerPlugin/api/models/KtFileKtMethods.kt
diff --git a/...src/main/kotlin/org/jetbrains/research/ideFormerPlugin/api/models/fileRelated/FileText.kt b/...src/main/kotlin/org/jetbrains/research/ideFormerPlugin/api/models/fileRelated/FileText.kt
@@ -0,0 +1,19 @@
+package org.jetbrains.research.ideFormerPlugin.api.models.fileRelated
+
+import com.intellij.psi.PsiDirectory
+import org.jetbrains.research.ideFormerPlugin.api.models.IdeApiMethod
+import org.jetbrains.research.ideFormerPlugin.api.models.utils.findFileByName
+
+class FileText(
+    private val projectDirectory: PsiDirectory,
+    private val fileName: String
+) : IdeApiMethod {
+    private var fileText: String? = null
+
+    override fun execute() {
+        val psiFile = projectDirectory.findFileByName(fileName)
+        fileText = psiFile.text
+    }
+
+    fun getFileText(): String? = fileText
+}
diff --git a/.../org/jetbrains/research/ideFormerPlugin/api/models/fileRelated/fileClasses/FileClasses.kt b/.../org/jetbrains/research/ideFormerPlugin/api/models/fileRelated/fileClasses/FileClasses.kt
@@ -0,0 +1,8 @@
+package org.jetbrains.research.ideFormerPlugin.api.models.fileRelated.fileClasses
+
+import org.jetbrains.research.ideFormerPlugin.api.models.IdeApiMethod
+
+interface FileClasses : IdeApiMethod {
+    fun getClassesNames(): List<String>?
+    fun getClassCode(className: String): String?
+}
diff --git a/.../jetbrains/research/ideFormerPlugin/api/models/fileRelated/fileClasses/JavaFileClasses.kt b/.../jetbrains/research/ideFormerPlugin/api/models/fileRelated/fileClasses/JavaFileClasses.kt
@@ -0,0 +1,25 @@
+package org.jetbrains.research.ideFormerPlugin.api.models.fileRelated.fileClasses
+
+import com.intellij.psi.PsiClass
+import com.intellij.psi.PsiDirectory
+import org.jetbrains.research.ideFormerPlugin.api.models.utils.findFileByName
+import org.jetbrains.research.ideFormerPlugin.api.models.utils.psiElementsOfType
+
+class JavaFileClasses(
+    private val projectDirectory: PsiDirectory,
+    private val javaFileName: String
+) : FileClasses {
+    private var javaClasses: List<PsiClass>? = null
+
+    override fun execute() {
+        val psiFile = projectDirectory.findFileByName(javaFileName)
+        javaClasses = psiFile.psiElementsOfType<PsiClass>()
+    }
+
+    override fun getClassesNames(): List<String>? =
+        javaClasses?.mapNotNull { it.name }
+
+    override fun getClassCode(className: String): String? = javaClasses
+        ?.firstOrNull { it.name == className }
+        ?.text
+}
diff --git a/...rg/jetbrains/research/ideFormerPlugin/api/models/fileRelated/fileClasses/KtFileClasses.kt b/...rg/jetbrains/research/ideFormerPlugin/api/models/fileRelated/fileClasses/KtFileClasses.kt
@@ -0,0 +1,24 @@
+package org.jetbrains.research.ideFormerPlugin.api.models.fileRelated.fileClasses
+
+import com.intellij.psi.PsiDirectory
+import org.jetbrains.kotlin.psi.KtClass
+import org.jetbrains.research.ideFormerPlugin.api.models.utils.findFileByName
+import org.jetbrains.research.ideFormerPlugin.api.models.utils.psiElementsOfType
+
+class KtFileClasses(
+    private val projectDirectory: PsiDirectory,
+    private val ktFileName: String
+) : FileClasses {
+    private var ktClasses: List<KtClass>? = null
+
+    override fun execute() {
+        val psiFile = projectDirectory.findFileByName(ktFileName)
+        ktClasses = psiFile.psiElementsOfType<KtClass>()
+    }
+
+    override fun getClassesNames(): List<String>? = ktClasses?.mapNotNull { it.name }
+
+    override fun getClassCode(className: String): String? = ktClasses
+        ?.firstOrNull { it.name == className }
+        ?.text
+}
diff --git a/...rg/jetbrains/research/ideFormerPlugin/api/models/fileRelated/fileClasses/PyFileClasses.kt b/...rg/jetbrains/research/ideFormerPlugin/api/models/fileRelated/fileClasses/PyFileClasses.kt
@@ -0,0 +1,24 @@
+package org.jetbrains.research.ideFormerPlugin.api.models.fileRelated.fileClasses
+
+import com.intellij.psi.PsiDirectory
+import com.jetbrains.python.psi.PyClass
+import org.jetbrains.research.ideFormerPlugin.api.models.utils.findFileByName
+import org.jetbrains.research.ideFormerPlugin.api.models.utils.psiElementsOfType
+
+class PyFileClasses(
+    private val projectDirectory: PsiDirectory,
+    private val pyFileName: String
+) : FileClasses {
+    private var pyClasses: List<PyClass>? = null
+
+    override fun execute() {
+        val psiFile = projectDirectory.findFileByName(pyFileName)
+        pyClasses = psiFile.psiElementsOfType<PyClass>()
+    }
+
+    override fun getClassesNames(): List<String>? = pyClasses?.mapNotNull { it.name }
+
+    override fun getClassCode(className: String): String? = pyClasses
+        ?.firstOrNull { it.name == className }
+        ?.text
+}
diff --git a/.../jetbrains/research/ideFormerPlugin/api/models/fileRelated/fileFunctions/FileFunctions.kt b/.../jetbrains/research/ideFormerPlugin/api/models/fileRelated/fileFunctions/FileFunctions.kt
@@ -0,0 +1,8 @@
+package org.jetbrains.research.ideFormerPlugin.api.models.fileRelated.fileFunctions
+
+import org.jetbrains.research.ideFormerPlugin.api.models.IdeApiMethod
+
+interface FileFunctions : IdeApiMethod {
+    fun getFunctionsNames(): List<String>?
+    fun getFunctionCode(functionName: String): String?
+}
diff --git a/...brains/research/ideFormerPlugin/api/models/fileRelated/fileFunctions/JavaFileFunctions.kt b/...brains/research/ideFormerPlugin/api/models/fileRelated/fileFunctions/JavaFileFunctions.kt
@@ -0,0 +1,23 @@
+package org.jetbrains.research.ideFormerPlugin.api.models.fileRelated.fileFunctions
+
+import com.intellij.psi.PsiDirectory
+import com.intellij.psi.PsiMethod
+import org.jetbrains.research.ideFormerPlugin.api.models.utils.findFileByName
+import org.jetbrains.research.ideFormerPlugin.api.models.utils.psiElementsOfType
+
+class JavaFileFunctions(
+    private val projectDirectory: PsiDirectory,
+    private val javaFileName: String
+) : FileFunctions {
+    private var javaFunctions: List<PsiMethod>? = null
+
+    override fun execute() {
+        val psiFile = projectDirectory.findFileByName(javaFileName)
+        javaFunctions = psiFile.psiElementsOfType<PsiMethod>()
+    }
+
+    override fun getFunctionsNames(): List<String>? = javaFunctions?.map { it.name }
+    override fun getFunctionCode(functionName: String): String? = javaFunctions
+        ?.firstOrNull { it.name == functionName }
+        ?.text
+}
diff --git a/...etbrains/research/ideFormerPlugin/api/models/fileRelated/fileFunctions/KtFileFunctions.kt b/...etbrains/research/ideFormerPlugin/api/models/fileRelated/fileFunctions/KtFileFunctions.kt
@@ -0,0 +1,23 @@
+package org.jetbrains.research.ideFormerPlugin.api.models.fileRelated.fileFunctions
+
+import com.intellij.psi.PsiDirectory
+import org.jetbrains.kotlin.psi.KtFunction
+import org.jetbrains.research.ideFormerPlugin.api.models.utils.findFileByName
+import org.jetbrains.research.ideFormerPlugin.api.models.utils.psiElementsOfType
+
+class KtFileFunctions(
+    private val projectDirectory: PsiDirectory,
+    private val ktFileName: String
+) : FileFunctions {
+    private var ktFunctions: List<KtFunction>? = null
+
+    override fun execute() {
+        val ktFile = projectDirectory.findFileByName(ktFileName)
+        ktFunctions = ktFile.psiElementsOfType<KtFunction>()
+    }
+
+    override fun getFunctionsNames(): List<String>? = ktFunctions?.mapNotNull { it.name }
+    override fun getFunctionCode(functionName: String): String? = ktFunctions
+        ?.firstOrNull { it.name == functionName }
+        ?.text
+}
diff --git a/...etbrains/research/ideFormerPlugin/api/models/fileRelated/fileFunctions/PyFileFunctions.kt b/...etbrains/research/ideFormerPlugin/api/models/fileRelated/fileFunctions/PyFileFunctions.kt
@@ -0,0 +1,24 @@
+package org.jetbrains.research.ideFormerPlugin.api.models.fileRelated.fileFunctions
+
+import com.intellij.psi.PsiDirectory
+import com.jetbrains.python.psi.PyFile
+import com.jetbrains.python.psi.PyFunction
+import org.jetbrains.research.ideFormerPlugin.api.models.utils.findFileByName
+import org.jetbrains.research.ideFormerPlugin.api.models.utils.psiElementsOfType
+
+class PyFileFunctions(
+    private val projectDirectory: PsiDirectory,
+    private val pyFileName: String
+) : FileFunctions {
+    private var pyFunctions: List<PyFunction>? = null
+
+    override fun execute() {
+        val pyFile = projectDirectory.findFileByName(pyFileName) as PyFile
+        pyFunctions = pyFile.psiElementsOfType<PyFunction>()
+    }
+
+    override fun getFunctionsNames(): List<String>? = pyFunctions?.mapNotNull { it.name }
+    override fun getFunctionCode(functionName: String): String? = pyFunctions
+        ?.firstOrNull { it.name == functionName }
+        ?.text
+}
diff --git a/...ormerPlugin/api/models/ChangeDirectory.kt → ...dels/fileSystemRelated/ChangeDirectory.kt b/...ormerPlugin/api/models/ChangeDirectory.kt → ...dels/fileSystemRelated/ChangeDirectory.kt
@@ -1,8 +1,9 @@
-package org.jetbrains.research.ideFormerPlugin.api.models
+package org.jetbrains.research.ideFormerPlugin.api.models.fileSystemRelated
 
 import com.intellij.psi.PsiDirectory
-import org.jetbrains.research.ideFormerPlugin.api.DEFAULT_DIRECTORY_NAME
-import org.jetbrains.research.ideFormerPlugin.api.findSubdirectoryRecursively
+import org.jetbrains.research.ideFormerPlugin.api.models.utils.DEFAULT_DIRECTORY_NAME
+import org.jetbrains.research.ideFormerPlugin.api.models.utils.findSubdirectoryRecursively
+import org.jetbrains.research.ideFormerPlugin.api.models.ReversibleApiMethod
 import org.jetbrains.research.ideFormerPlugin.stateKeeper.IdeStateKeeper
 
 class ChangeDirectory(

diff --git a/...lugin/api/models/ListDirectoryContents.kt → ...ileSystemRelated/ListDirectoryContents.kt b/...lugin/api/models/ListDirectoryContents.kt → ...ileSystemRelated/ListDirectoryContents.kt
@@ -1,9 +1,10 @@
-package org.jetbrains.research.ideFormerPlugin.api.models
+package org.jetbrains.research.ideFormerPlugin.api.models.fileSystemRelated
 
 import com.intellij.psi.PsiDirectory
 import com.intellij.psi.PsiFileSystemItem
-import org.jetbrains.research.ideFormerPlugin.api.DEFAULT_DIRECTORY_NAME
-import org.jetbrains.research.ideFormerPlugin.api.findSubdirectoryRecursively
+import org.jetbrains.research.ideFormerPlugin.api.models.utils.DEFAULT_DIRECTORY_NAME
+import org.jetbrains.research.ideFormerPlugin.api.models.utils.findSubdirectoryRecursively
+import org.jetbrains.research.ideFormerPlugin.api.models.IdeApiMethod
 
 class ListDirectoryContents(
     private val currentProjectDirectory: PsiDirectory,

diff --git a/...FormerPlugin/api/models/ProjectModules.kt → ...odels/fileSystemRelated/ProjectModules.kt b/...FormerPlugin/api/models/ProjectModules.kt → ...odels/fileSystemRelated/ProjectModules.kt
@@ -1,8 +1,9 @@
-package org.jetbrains.research.ideFormerPlugin.api.models
+package org.jetbrains.research.ideFormerPlugin.api.models.fileSystemRelated
 
 import com.intellij.openapi.module.Module
 import com.intellij.openapi.module.ModuleManager
 import com.intellij.openapi.project.Project
+import org.jetbrains.research.ideFormerPlugin.api.models.IdeApiMethod
 
 class ProjectModules(private val project: Project) : IdeApiMethod {
     private var projectModules: List<Module>? = null

diff --git a/...-core/src/main/kotlin/org/jetbrains/research/ideFormerPlugin/api/models/utils/ApiUtils.kt b/...-core/src/main/kotlin/org/jetbrains/research/ideFormerPlugin/api/models/utils/ApiUtils.kt
@@ -0,0 +1,30 @@
+package org.jetbrains.research.ideFormerPlugin.api.models.utils
+
+import com.intellij.psi.PsiDirectory
+import com.intellij.util.PathUtil
+import org.jetbrains.research.ideFormerPlugin.api.models.fileRelated.fileClasses.FileClasses
+import org.jetbrains.research.ideFormerPlugin.api.models.fileRelated.fileClasses.JavaFileClasses
+import org.jetbrains.research.ideFormerPlugin.api.models.fileRelated.fileClasses.KtFileClasses
+import org.jetbrains.research.ideFormerPlugin.api.models.fileRelated.fileClasses.PyFileClasses
+import org.jetbrains.research.ideFormerPlugin.api.models.fileRelated.fileFunctions.FileFunctions
+import org.jetbrains.research.ideFormerPlugin.api.models.fileRelated.fileFunctions.JavaFileFunctions
+import org.jetbrains.research.ideFormerPlugin.api.models.fileRelated.fileFunctions.KtFileFunctions
+import org.jetbrains.research.ideFormerPlugin.api.models.fileRelated.fileFunctions.PyFileFunctions
+
+const val DEFAULT_DIRECTORY_NAME = "."
+
+fun chooseFileClassesApiForFile(fileName: String, projectDirectory: PsiDirectory): FileClasses =
+    when (val fileExtension = PathUtil.getFileExtension(fileName)) {
+        "kt" -> KtFileClasses(projectDirectory, fileName)
+        "java" -> JavaFileClasses(projectDirectory, fileName)
+        "py" -> PyFileClasses(projectDirectory, fileName)
+        else -> error("Unsupported file extension $fileExtension")
+    }
+
+fun chooseFileFunctionsApiForFile(fileName: String, projectDirectory: PsiDirectory): FileFunctions =
+    when (val fileExtension = PathUtil.getFileExtension(fileName)) {
+        "kt" -> KtFileFunctions(projectDirectory, fileName)
+        "java" -> JavaFileFunctions(projectDirectory, fileName)
+        "py" -> PyFileFunctions(projectDirectory, fileName)
+        else -> error("Unsupported file extension: $fileExtension")
+    }
diff --git a/...h/ideFormerPlugin/api/PsiElementsUtils.kt → ...ugin/api/models/utils/PsiElementsUtils.kt b/...h/ideFormerPlugin/api/PsiElementsUtils.kt → ...ugin/api/models/utils/PsiElementsUtils.kt
@@ -1,6 +1,9 @@
-package org.jetbrains.research.ideFormerPlugin.api
+package org.jetbrains.research.ideFormerPlugin.api.models.utils
 
 import com.intellij.psi.PsiDirectory
+import com.intellij.psi.PsiElement
+import com.intellij.psi.PsiFile
+import com.intellij.psi.util.PsiTreeUtil
 
 fun PsiDirectory.findSubdirectoryRecursively(targetDirectoryPath: String): PsiDirectory? {
     val nextDirectoryInPath = targetDirectoryPath.substringBefore("/")
@@ -10,4 +13,8 @@ fun PsiDirectory.findSubdirectoryRecursively(targetDirectoryPath: String): PsiDi
     return if (remainingDirectoryPath.isNotEmpty()) currentDirectory.findSubdirectoryRecursively(remainingDirectoryPath) else currentDirectory
 }
 
-const val DEFAULT_DIRECTORY_NAME = "."
+fun PsiDirectory.findFileByName(fileName: String): PsiFile =
+    this.findFile(fileName) ?: error("No such file in the current directory")
+
+inline fun <reified T : PsiElement> PsiFile.psiElementsOfType(): List<T> =
+    PsiTreeUtil.findChildrenOfType(this, T::class.java).toList()