Feature/upgrade it to latest intellij version

build.gradle.kts

@@ -11,6 +11,7 @@ plugins {
     alias(libs.plugins.changelog) // Gradle Changelog Plugin
     alias(libs.plugins.qodana) // Gradle Qodana Plugin
     alias(libs.plugins.kover) // Gradle Kover Plugin
+//    kotlin("plugin.serialization") version "1.6.0" // Kotlin Serialization support
 }
 
 group = properties("pluginGroup").get()
@@ -25,12 +26,15 @@ repositories {
 dependencies {
     testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.0-M1")
     testImplementation("org.mockito:mockito-core:5.4.0")
+    testImplementation("junit:junit:4.13.2")
     implementation("com.google.code.gson:gson:2.10.1")
     implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.0")
     implementation("org.jetbrains.kotlin:kotlin-reflect:1.6.0")
     implementation("com.google.api:gax:2.31.0")
     implementation("org.jetbrains.kotlinx:kotlinx-html-jvm:0.8.1")
     implementation("org.jetbrains:annotations:23.0.0")
+//    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.0")
+//    implementation("org.openjfx:javafx:11")
 }
 
 // Set the JVM language level used to build the project. Use Java 11 for 2020.3+, and Java 17 for 2022.2+.

docs/PITFALLS.md

@@ -207,4 +207,24 @@
         </tbody>
     </table>
     <p class="notion-text notion-block-5649da35ca0f43e3bf40151f26a16966"><em>Last updated March 11th, 2023
-        from </em><em><a class="notion-link" href="https://openai.com/pricing">openai.com/pricing</a></em></p></section>
+        from </em><em><a class="notion-link" href="https://openai.com/pricing">openai.com/pricing</a></em></p></section>
+
+5) I prefix each new Prompt with this phrase : analyse the Prompt and using NLP return topic, context, intent, named
+   entities, keywords and sentiment ending each sentence with a full stop and then respond to the Follow Up question.
+
+It results in useful NLP analysis of the Response and creates a virtuous circle with the next Prompt. An example of such
+an analysis was: Topic: Heinrich Schliemann and Homer’s Iliad and Odyssey: Context: Excavation at Hissarlik: Intent: To
+search for and verify the historical accuracy of Homer’s descriptions of the cities: Named Entities: Heinrich
+Schliemann, Hissarlik, Homer’s Iliad and Odyssey: Keywords: Excavate, verify, historical accuracy, Homer’s descriptions,
+cities: Sentiment: Neutral
+
+The period symbol ‘.’ helps separate discreet elements of the response. It is also good practise to terminate prompts
+with characters such as ‘?.!’ which helps GPT recognise questions, sentences and exclamations.
+
+![img.png](img.png)
+
+6) How to debug
+   A) From main IDE run config 'runIde'
+   B) From second IDE run 'Attach to process'
+   C) Breaking points go on FIRST IDE
+   D) Profit :)

gradle.properties

@@ -1,28 +1,21 @@
 # IntelliJ Platform Artifacts Repositories -> https://plugins.jetbrains.com/docs/intellij/intellij-artifacts.html
-
-pluginGroup = com.github.sloppylopez.moneypennyideaplugin
-pluginName = moneypenny-idea-plugin
-pluginRepositoryUrl = https://github.com/sloppylopez/moneypenny-idea-plugin
+pluginGroup=com.github.sloppylopez.moneypennyideaplugin
+pluginName=moneypenny-idea-plugin
+pluginRepositoryUrl=https://github.com/sloppylopez/moneypenny-idea-plugin
 # SemVer format -> https://semver.org
-pluginVersion = 1.1.1-SNAPSHOT
-
+pluginVersion=2.0.2-SNAPSHOT
 # Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
-pluginSinceBuild = 222
-pluginUntilBuild = 232.*
-
+pluginSinceBuild=243.0
 # IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#configuration-intellij-extension
-platformType = IC
-platformVersion = 2022.2.5
-
+platformType=IC
+platformVersion=2024.3
 # Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
 # Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22
-platformPlugins = com.intellij.java, org.intellij.plugins.markdown
-
+platformPlugins=com.intellij.java, org.intellij.plugins.markdown
 # Gradle Releases -> https://github.com/gradle/gradle/releases
-gradleVersion = 8.1.1
-
+gradleVersion=8.1.1
 # Opt-out flag for bundling Kotlin standard library -> https://jb.gg/intellij-platform-kotlin-stdlib
-kotlin.stdlib.default.dependency = false
+kotlin.stdlib.default.dependency=false
 
 # Enable Gradle Configuration Cache -> https://docs.gradle.org/current/userguide/configuration_cache.html
 org.gradle.configuration-cache = true

src/main/kotlin/com/github/sloppylopez/moneypennyideaplugin/actions/AddTextAction.kt

@@ -0,0 +1,41 @@
+package com.github.sloppylopez.moneypennyideaplugin.actions
+
+import com.github.sloppylopez.moneypennyideaplugin.services.ProjectService
+import com.intellij.icons.AllIcons
+import com.intellij.openapi.actionSystem.AnAction
+import com.intellij.openapi.actionSystem.AnActionEvent
+import com.intellij.openapi.actionSystem.CommonDataKeys
+import com.intellij.openapi.application.ApplicationManager
+import com.intellij.openapi.command.WriteCommandAction
+import com.intellij.openapi.components.Service
+import com.intellij.openapi.components.service
+import com.intellij.openapi.project.Project
+
+@Service(Service.Level.PROJECT)
+class AddTextAction(private val project: Project) : AnAction() {
+    private val service = project.service<ProjectService>()
+
+    init {
+        templatePresentation.icon = AllIcons.Chooser.Left
+        templatePresentation.text = "Send to Editor"
+    }
+
+    override fun actionPerformed(e: AnActionEvent) {
+        ApplicationManager.getApplication().runWriteAction {
+            WriteCommandAction.runWriteCommandAction(project) {
+                val editor = e.getData(CommonDataKeys.EDITOR)
+                val selectionModel = editor?.selectionModel
+                val selectedText = selectionModel?.selectedText
+                val startOffset = selectionModel?.selectionStart
+                val endOffset = selectionModel?.selectionEnd
+                val textToAdd = "Hello World"//TODO here we should send the code returned by AI
+
+                if (selectedText == null) {
+                    editor?.document?.insertString(startOffset!!, textToAdd)
+                } else {
+                    editor.document.replaceString(startOffset!!, endOffset!!, textToAdd)
+                }
+            }
+        }
+    }
+}

src/main/kotlin/com/github/sloppylopez/moneypennyideaplugin/actions/ComboBoxEnginesAction.kt

@@ -1,6 +1,6 @@
 package com.github.sloppylopez.moneypennyideaplugin.actions
 
-import com.github.sloppylopez.moneypennyideaplugin.global.GlobalData
+import com.github.sloppylopez.moneypennyideaplugin.data.GlobalData
 import com.intellij.openapi.actionSystem.ActionUpdateThread
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.actionSystem.Presentation
@@ -50,13 +50,6 @@ class ComboBoxEnginesAction(
     }
 
     private fun addEngineToGlobalData(selectedOption: String) {
-//        val notification = Notification(
-//            "MoneyPenny",
-//            "Selected Option",
-//            selectedOption,
-//            NotificationType.INFORMATION
-//        )
-//        Notifications.Bus.notify(notification)
         GlobalData.engine = selectedOption
     }
 

src/main/kotlin/com/github/sloppylopez/moneypennyideaplugin/actions/ComboBoxRolesAction.kt

@@ -1,6 +1,6 @@
 package com.github.sloppylopez.moneypennyideaplugin.actions
 
-import com.github.sloppylopez.moneypennyideaplugin.global.GlobalData
+import com.github.sloppylopez.moneypennyideaplugin.data.GlobalData
 import com.intellij.openapi.actionSystem.ActionUpdateThread
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.actionSystem.Presentation
@@ -50,7 +50,7 @@ class ComboBoxRolesAction(
     }
 
     private fun addEngineToGlobalData(selectedOption: String) {
-        GlobalData.role = selectedOption.split(" ")[1]
+        GlobalData.role = selectedOption
     }
 
     override fun getActionUpdateThread(): ActionUpdateThread {

src/main/kotlin/com/github/sloppylopez/moneypennyideaplugin/actions/CopyPromptAction.kt

@@ -1,15 +1,17 @@
 package com.github.sloppylopez.moneypennyideaplugin.actions
 
-import com.github.sloppylopez.moneypennyideaplugin.global.GlobalData
+import com.github.sloppylopez.moneypennyideaplugin.data.GlobalData
 import com.github.sloppylopez.moneypennyideaplugin.services.ProjectService
 import com.github.sloppylopez.moneypennyideaplugin.services.PromptService
 import com.intellij.icons.AllIcons
 import com.intellij.notification.NotificationType
 import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.AnActionEvent
+import com.intellij.openapi.components.Service
 import com.intellij.openapi.components.service
 import com.intellij.openapi.project.Project
 
+@Service(Service.Level.PROJECT)
 class CopyPromptAction(private var project: Project) : AnAction() {
     private val service: ProjectService by lazy { project.service<ProjectService>() }
     private val promptService: PromptService by lazy { project.service<PromptService>() }
@@ -17,15 +19,16 @@
 
     init {
         templatePresentation.icon = AllIcons.Actions.Copy
         templatePresentation.text = "Copy prompt"
     }
 
     override fun actionPerformed(e: AnActionEvent) {
         project = e.project!!
 
-        val tabName = GlobalData.tabbedPane?.getTitleAt(GlobalData.tabbedPane!!.selectedIndex)
+        val tabName = GlobalData.selectedTabbedPane?.getTitleAt(GlobalData.selectedTabbedPane!!.selectedIndex)
         val prompts = promptService.getPrompts()
-        val promptList = service.getPromptListByKey(prompts!!, tabName!!)
+        val promptList = service.getPromptListByKey(prompts, tabName!!)
+
         if (promptList.isNotEmpty()) {
             val promptsText = promptList.joinToString("\n")
             service.copyToClipboard(promptsText)

src/main/kotlin/com/github/sloppylopez/moneypennyideaplugin/actions/DRYSelectionAction.kt

@@ -1,7 +1,7 @@
 package com.github.sloppylopez.moneypennyideaplugin.actions
 
 import com.github.sloppylopez.moneypennyideaplugin.client.ChatGptMessage
-import com.github.sloppylopez.moneypennyideaplugin.global.GlobalData
+import com.github.sloppylopez.moneypennyideaplugin.data.GlobalData
 import com.github.sloppylopez.moneypennyideaplugin.services.ChatGPTService
 import com.github.sloppylopez.moneypennyideaplugin.services.ProjectService
 import com.github.sloppylopez.moneypennyideaplugin.toolWindow.ProgressBarFactory
@@ -36,12 +36,12 @@ class DRYSelectionAction(private var project: Project) : AnAction() {
             editor
         )
         chatGPTService.sendChatPrompt(
-            getPrompt(selectedText), createCallback(file)
+            getPrompt(selectedText), createCallback(file), null, null
         ).whenComplete { _, _ ->
             progressBarFactory.removeProgressBar(GlobalData.innerPanel!!, jProgressBar)
         }
     }
-
+    //This is for right click action only
     private fun getPrompt(selectedText: String?): String {
         val prePrompt = "Refactor code:\n"
         val postPrompt = "\nDRY it following best practices and using one-liners if possible"
@@ -66,10 +66,16 @@ class DRYSelectionAction(private var project: Project) : AnAction() {
 
     private fun createCallback(file: VirtualFile): ChatGPTService.ChatGptChoiceCallback {
         return object : ChatGPTService.ChatGptChoiceCallback {
-            override fun onCompletion(choice: ChatGptMessage) {
+            override fun onCompletion(
+                choice: ChatGptMessage,
+                prompt: String,
+                upperTabName: String?,
+                promptList: List<String>?
+            ) {
                 try {
                     var content = choice.content
-                    if (GlobalData.role == "refactor-machine" && service.isCodeCommented(content)) {
+                    val role = GlobalData.role.split(" ")[1]
+                    if (role == "refactor-machine" && service.isCodeCommented(content)) {
                         content = service.extractCommentsFromCode(content)
                     }
                     if (!content.contains("Error: No response from GPT")) {