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/...n/ide-core/src/main/kotlin/org/jetbrains/research/ideFormerPlugin/api/PsiElementsUtils.kt b/...n/ide-core/src/main/kotlin/org/jetbrains/research/ideFormerPlugin/api/PsiElementsUtils.kt
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.findFileRecursively
+
+class FileText(
+    private val projectDirectory: PsiDirectory,
+    private val fileName: String
+) : IdeApiMethod {
+    private var fileText: String? = null
+
+    override fun execute() {
+        val psiFile = projectDirectory.findFileRecursively(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,23 @@
+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.getFilePsiElementsOfType
+
+class JavaFileClasses(
+    private val projectDirectory: PsiDirectory,
+    private val javaFileName: String
+) : FileClasses {
+    private var javaClasses: List<PsiClass>? = null
+
+    override fun execute() {
+        javaClasses = getFilePsiElementsOfType<PsiClass>(projectDirectory, javaFileName)
+    }
+
+    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,22 @@
+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.getFilePsiElementsOfType
+
+class KtFileClasses(
+    private val projectDirectory: PsiDirectory,
+    private val ktFileName: String
+) : FileClasses {
+    private var ktClasses: List<KtClass>? = null
+
+    override fun execute() {
+        ktClasses = getFilePsiElementsOfType<KtClass>(projectDirectory, ktFileName)
+    }
+
+    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,22 @@
+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.getFilePsiElementsOfType
+
+class PyFileClasses(
+    private val projectDirectory: PsiDirectory,
+    private val pyFileName: String
+) : FileClasses {
+    private var pyClasses: List<PyClass>? = null
+
+    override fun execute() {
+        pyClasses = getFilePsiElementsOfType<PyClass>(projectDirectory, pyFileName)
+    }
+
+    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,21 @@
+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.getFilePsiElementsOfType
+
+class JavaFileFunctions(
+    private val projectDirectory: PsiDirectory,
+    private val javaFileName: String
+) : FileFunctions {
+    private var javaFunctions: List<PsiMethod>? = null
+
+    override fun execute() {
+        javaFunctions = getFilePsiElementsOfType<PsiMethod>(projectDirectory, javaFileName)
+    }
+
+    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,21 @@
+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.getFilePsiElementsOfType
+
+class KtFileFunctions(
+    private val projectDirectory: PsiDirectory,
+    private val ktFileName: String
+) : FileFunctions {
+    private var ktFunctions: List<KtFunction>? = null
+
+    override fun execute() {
+        ktFunctions = getFilePsiElementsOfType<KtFunction>(projectDirectory, ktFileName)
+    }
+
+    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,21 @@
+package org.jetbrains.research.ideFormerPlugin.api.models.fileRelated.fileFunctions
+
+import com.intellij.psi.PsiDirectory
+import com.jetbrains.python.psi.PyFunction
+import org.jetbrains.research.ideFormerPlugin.api.models.utils.getFilePsiElementsOfType
+
+class PyFileFunctions(
+    private val projectDirectory: PsiDirectory,
+    private val pyFileName: String
+) : FileFunctions {
+    private var pyFunctions: List<PyFunction>? = null
+
+    override fun execute() {
+        pyFunctions = getFilePsiElementsOfType<PyFunction>(projectDirectory, pyFileName)
+    }
+
+    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(
@@ -12,12 +13,7 @@ class ChangeDirectory(
     private var prevDir: PsiDirectory? = null
 
     override fun execute() {
-        if (targetDirectoryName == DEFAULT_DIRECTORY_NAME) {
-            return
-        }
-
         val targetDir = ideStateKeeper.currentProjectDirectory.findSubdirectoryRecursively(targetDirectoryName)
-            ?: error("No such directory in a project: '$targetDirectoryName'.")
 
         prevDir = ideStateKeeper.currentProjectDirectory
         ideStateKeeper.currentProjectDirectory = targetDir

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,
@@ -18,11 +19,7 @@ class ListDirectoryContents(
     }
 
     override fun execute() {
-        val searchDirectory = when (searchDirectoryName) {
-            DEFAULT_DIRECTORY_NAME -> currentProjectDirectory
-            else -> currentProjectDirectory.findSubdirectoryRecursively(searchDirectoryName)
-                ?: error("No such subdirectory: '$searchDirectoryName'")
-        }
+        val searchDirectory = currentProjectDirectory.findSubdirectoryRecursively(searchDirectoryName)
         searchDirectoryItems = searchDirectory.fileSystemItems()
     }
 

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,31 @@
+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.*
+import org.jetbrains.research.ideFormerPlugin.api.models.fileRelated.fileFunctions.*
+
+const val DEFAULT_DIRECTORY_NAME = "."
+const val UNSUPPORTED_FILE_EXTENSION_ERROR = "Unsupported file extension"
+
+enum class FileExtensions(val extension: String) {
+    KT("kt"),
+    JAVA("java"),
+    PY("py")
+}
+
+fun chooseFileClassesApiForFile(fileName: String, projectDirectory: PsiDirectory): FileClasses =
+    when (val fileExtension = PathUtil.getFileExtension(fileName)) {
+        FileExtensions.KT.extension -> KtFileClasses(projectDirectory, fileName)
+        FileExtensions.JAVA.extension -> JavaFileClasses(projectDirectory, fileName)
+        FileExtensions.PY.extension -> PyFileClasses(projectDirectory, fileName)
+        else -> error("$UNSUPPORTED_FILE_EXTENSION_ERROR: $fileExtension")
+    }
+
+fun chooseFileFunctionsApiForFile(fileName: String, projectDirectory: PsiDirectory): FileFunctions =
+    when (val fileExtension = PathUtil.getFileExtension(fileName)) {
+        FileExtensions.KT.extension -> KtFileFunctions(projectDirectory, fileName)
+        FileExtensions.JAVA.extension -> JavaFileFunctions(projectDirectory, fileName)
+        FileExtensions.PY.extension -> PyFileFunctions(projectDirectory, fileName)
+        else -> error("$UNSUPPORTED_FILE_EXTENSION_ERROR: $fileExtension")
+    }
diff --git a/...c/main/kotlin/org/jetbrains/research/ideFormerPlugin/api/models/utils/PsiElementsUtils.kt b/...c/main/kotlin/org/jetbrains/research/ideFormerPlugin/api/models/utils/PsiElementsUtils.kt
@@ -0,0 +1,38 @@
+package org.jetbrains.research.ideFormerPlugin.api.models.utils
+
+import com.intellij.psi.*
+import com.intellij.psi.util.PsiTreeUtil
+
+const val PATH_DELIMITER = "/"
+
+fun PsiDirectory.findSubdirectoryRecursively(targetDirectoryPath: String): PsiDirectory {
+    val currentDirectory = when (val nextDirectoryInPath = targetDirectoryPath.substringBefore(PATH_DELIMITER)) {
+        DEFAULT_DIRECTORY_NAME -> this
+        else -> this.findSubdirectory(nextDirectoryInPath) ?: error("No such subdirectory: $nextDirectoryInPath")
+    }
+    val remainingDirectoryPath = targetDirectoryPath.substringAfter(PATH_DELIMITER, "")
+
+    return if (remainingDirectoryPath.isNotEmpty()) currentDirectory.findSubdirectoryRecursively(remainingDirectoryPath) else currentDirectory
+}
+
+fun PsiDirectory.findFileRecursively(targetFilePath: String): PsiFile {
+    val targetFileDirectory = when (val fileDirectoryPath = targetFilePath.substringBeforeLast(PATH_DELIMITER, "")) {
+        "" -> this
+        else -> this.findSubdirectoryRecursively(fileDirectoryPath)
+    }
+
+    val fileName = targetFilePath.substringAfterLast(PATH_DELIMITER)
+    return targetFileDirectory.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()
+
+inline fun <reified T : PsiElement> getFilePsiElementsOfType(
+    projectDirectory: PsiDirectory,
+    fileName: String
+): List<T> {
+    val psiFile = projectDirectory.findFileRecursively(fileName)
+    return psiFile.psiElementsOfType<T>()
+}