feat(prompts): option to choose prompt per project

Closes #229

Author: Blarc

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## [Unreleased]
 
+### Added
+
+- Option to choose prompt per project.
+
 ## [2.3.1] - 2024-09-11
 
 ### Fixed

src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/settings/AppSettingsConfigurable.kt

@@ -25,6 +25,7 @@ class AppSettingsConfigurable(val project: Project, cs: CoroutineScope) : BoundC
     private var isProjectSpecificLLMClientCheckBox = JBCheckBox(message("settings.llmClient.projectSpecific"))
     private lateinit var llmClientToolbarDecorator: ToolbarDecorator
     private val promptTable = PromptTable(cs)
+    private val isProjectSpecificPromptCheckBox = JBCheckBox(message("settings.prompt.projectSpecific"))
     private lateinit var toolbarDecorator: ToolbarDecorator
     private lateinit var promptComboBox: ComboBox<Prompt>
 
@@ -33,11 +34,13 @@ class AppSettingsConfigurable(val project: Project, cs: CoroutineScope) : BoundC
         row {
             label(message("settings.llmClient")).widthGroup("labelPrompt")
             llmClientConfigurationComboBox = comboBox(AppSettings2.instance.llmClientConfigurations, AICommitsListCellRenderer())
-                .bindItem(getter = { getActiveLLMClientConfiguration() },  setter = { client: LLMClientConfiguration? -> setActiveLLMClientConfiguration(client) })
+                .bindItem(getter = { getActiveLLMClientConfiguration() }, setter = { setActiveLLMClientConfiguration(it) })
                 .widthGroup("input")
                 .component
             cell(isProjectSpecificLLMClientCheckBox)
                 .bindSelected(project.service<ProjectSettings>()::isProjectSpecificLLMClient)
+            contextHelp(message("settings.llmClient.projectSpecific.contextHelp"))
+                .align(AlignX.LEFT)
         }
         row {
             llmClientToolbarDecorator = ToolbarDecorator.createDecorator(llmClientTable.table)
@@ -76,17 +79,21 @@ class AppSettingsConfigurable(val project: Project, cs: CoroutineScope) : BoundC
                 AICommitsListCellRenderer()
             )
                 .widthGroup("input")
-                .bindItem(AppSettings2.instance::locale.toNullableProperty())
+                .bindItem(getter = { getActiveLocale() }, setter = { setActiveLocale(it)} )
 
             browserLink(message("settings.more-prompts"), AICommitsBundle.URL_PROMPTS_DISCUSSION.toString())
                 .align(AlignX.RIGHT)
         }
         row {
             label(message("settings.prompt")).widthGroup("labelPrompt")
             promptComboBox = comboBox(AppSettings2.instance.prompts.values, AICommitsListCellRenderer())
-                .bindItem(AppSettings2.instance::activePrompt.toNullableProperty())
+                .bindItem(getter = { getActivePrompt() }, { setActivePrompt(it) })
                 .widthGroup("input")
                 .component
+            cell(isProjectSpecificPromptCheckBox)
+                .bindSelected(project.service<ProjectSettings>()::isProjectSpecificPrompt)
+            contextHelp(message("settings.prompt.projectSpecific.contextHelp"))
+                .align(AlignX.LEFT)
         }
         row {
             toolbarDecorator = ToolbarDecorator.createDecorator(promptTable.table)
@@ -148,6 +155,42 @@ class AppSettingsConfigurable(val project: Project, cs: CoroutineScope) : BoundC
         }
     }
 
+    private fun getActivePrompt(): Prompt? {
+        return if (isProjectSpecificPromptCheckBox.isSelected) {
+            project.service<ProjectSettings>().activePrompt
+        } else {
+            AppSettings2.instance.activePrompt
+        }
+    }
+
+    private fun setActivePrompt(prompt: Prompt?) {
+        prompt?.let {
+            if (isProjectSpecificPromptCheckBox.isSelected) {
+                project.service<ProjectSettings>().activePrompt = prompt
+            } else {
+                AppSettings2.instance.activePrompt = prompt
+            }
+        }
+    }
+
+    private fun getActiveLocale(): Locale {
+        return if (isProjectSpecificPromptCheckBox.isSelected) {
+            project.service<ProjectSettings>().locale
+        } else {
+            AppSettings2.instance.locale
+        }
+    }
+
+    private fun setActiveLocale(locale: Locale?) {
+        locale?.let {
+            if (isProjectSpecificPromptCheckBox.isSelected) {
+                project.service<ProjectSettings>().locale = locale
+            } else {
+                AppSettings2.instance.locale = locale
+            }
+        }
+    }
+
     private fun updateActionAvailability(action: CommonActionsPanel.Buttons) {
         val selectedRow = promptTable.table.selectedRow
         val selectedPrompt = promptTable.table.items[selectedRow]

src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/settings/ProjectSettings.kt

@@ -1,13 +1,17 @@
 package com.github.blarc.ai.commits.intellij.plugin.settings
 
 import com.github.blarc.ai.commits.intellij.plugin.AICommitsUtils
+import com.github.blarc.ai.commits.intellij.plugin.settings.AppSettings2.LocaleConverter
 import com.github.blarc.ai.commits.intellij.plugin.settings.clients.LLMClientConfiguration
+import com.github.blarc.ai.commits.intellij.plugin.settings.prompts.Prompt
 import com.intellij.openapi.components.PersistentStateComponent
 import com.intellij.openapi.components.Service
 import com.intellij.openapi.components.State
 import com.intellij.openapi.components.Storage
 import com.intellij.util.xmlb.XmlSerializerUtil
 import com.intellij.util.xmlb.annotations.Attribute
+import com.intellij.util.xmlb.annotations.OptionTag
+import java.util.*
 
 @State(
         name = ProjectSettings.SERVICE_NAME,
@@ -27,6 +31,12 @@ class ProjectSettings : PersistentStateComponent<ProjectSettings?> {
     @Attribute
     var isProjectSpecificLLMClient: Boolean = false
 
+    var activePrompt: Prompt? = null
+    @OptionTag(converter = LocaleConverter::class)
+    var locale: Locale = Locale.ENGLISH
+    @Attribute
+    var isProjectSpecificPrompt: Boolean = false
+
     override fun getState() = this
 
     override fun loadState(state: ProjectSettings) {

src/main/resources/messages/AiCommitsBundle.properties

@@ -49,6 +49,8 @@ actions.add=Add
 settings.prompt.edit.title=Edit Prompt
 settings.prompt.add.title=Add Prompt
 settings.prompt.description=Description
+settings.prompt.projectSpecific=Project specific
+settings.prompt.projectSpecific.contextHelp=When selected, saves the chosen prompt and locale for this project only.
 validation.unique=Value already exists.
 settings.loadingModels=Loading OpenAI models...
 settings.more-prompts=More prompts
@@ -62,6 +64,7 @@ settings.prompt.hint=Hint
 settings.prompt.hint.comment=Note: This field is for testing purposes only. When generating the actual prompt, the {hint} variable will be replaced with content from the commit dialog.
 settings.llmClient=LLM Client
 settings.llmClient.projectSpecific=Project specific
+settings.llmClient.projectSpecific.contextHelp=When selected, saves the chosen LLM client for this project only.
 settings.llmClient.name=Name
 settings.llmClient.host=Host
 settings.llmClient.proxy=Proxy URL