diff --git a/src/main/kotlin/com/sourcegraph/cody/edit/DocumentCodeActionHandler.kt b/src/main/kotlin/com/sourcegraph/cody/edit/DocumentCodeActionHandler.kt
index a98adb0e8c..b3b48a1081 100644
--- a/src/main/kotlin/com/sourcegraph/cody/edit/DocumentCodeActionHandler.kt
+++ b/src/main/kotlin/com/sourcegraph/cody/edit/DocumentCodeActionHandler.kt
@@ -1,5 +1,6 @@
package com.sourcegraph.cody.edit
+import com.intellij.openapi.actionSystem.AnActionEvent
import com.intellij.openapi.actionSystem.DataContext
import com.intellij.openapi.diagnostic.Logger
import com.intellij.openapi.editor.Caret
@@ -8,9 +9,19 @@ import com.intellij.openapi.editor.actionSystem.EditorAction
import com.intellij.openapi.editor.actionSystem.EditorActionHandler
import com.intellij.openapi.project.DumbAware
import com.sourcegraph.cody.autocomplete.action.CodyAction
+import com.sourcegraph.cody.config.CodyApplicationSettings
+import com.sourcegraph.config.ConfigUtil
import com.sourcegraph.utils.CodyEditorUtil
-class DocumentCodeAction : EditorAction(DocumentCodeActionHandler()), CodyAction, DumbAware
+class DocumentCodeAction : EditorAction(DocumentCodeActionHandler()), CodyAction, DumbAware {
+ override fun update(e: AnActionEvent) {
+ super.update(e)
+
+ e.presentation.isVisible =
+ ConfigUtil.isFeatureFlagEnabled("cody.feature.inline-edits") ||
+ CodyApplicationSettings.instance.isInlineEditionEnabled
+ }
+}
class DocumentCodeActionHandler : EditorActionHandler() {
private val logger = Logger.getInstance(DocumentCodeActionHandler::class.java)
diff --git a/src/main/kotlin/com/sourcegraph/cody/edit/EditCodeActionHandler.kt b/src/main/kotlin/com/sourcegraph/cody/edit/EditCodeActionHandler.kt
index ce312b1d72..bb9f0ea51e 100644
--- a/src/main/kotlin/com/sourcegraph/cody/edit/EditCodeActionHandler.kt
+++ b/src/main/kotlin/com/sourcegraph/cody/edit/EditCodeActionHandler.kt
@@ -1,5 +1,6 @@
package com.sourcegraph.cody.edit
+import com.intellij.openapi.actionSystem.AnActionEvent
import com.intellij.openapi.actionSystem.DataContext
import com.intellij.openapi.diagnostic.Logger
import com.intellij.openapi.editor.Caret
@@ -8,9 +9,19 @@ import com.intellij.openapi.editor.actionSystem.EditorAction
import com.intellij.openapi.editor.actionSystem.EditorActionHandler
import com.intellij.openapi.project.DumbAware
import com.sourcegraph.cody.autocomplete.action.CodyAction
+import com.sourcegraph.cody.config.CodyApplicationSettings
+import com.sourcegraph.config.ConfigUtil
import com.sourcegraph.utils.CodyEditorUtil
-class EditCodeAction : EditorAction(EditCodeActionHandler()), CodyAction, DumbAware
+class EditCodeAction : EditorAction(EditCodeActionHandler()), CodyAction, DumbAware {
+ override fun update(e: AnActionEvent) {
+ super.update(e)
+
+ e.presentation.isVisible =
+ ConfigUtil.isFeatureFlagEnabled("cody.feature.inline-edits") ||
+ CodyApplicationSettings.instance.isInlineEditionEnabled
+ }
+}
class EditCodeActionHandler : EditorActionHandler() {
private val logger = Logger.getInstance(EditCodeActionHandler::class.java)
diff --git a/src/main/kotlin/com/sourcegraph/cody/initialization/PostStartupActivity.kt b/src/main/kotlin/com/sourcegraph/cody/initialization/PostStartupActivity.kt
index 8b9414c954..34051f7839 100644
--- a/src/main/kotlin/com/sourcegraph/cody/initialization/PostStartupActivity.kt
+++ b/src/main/kotlin/com/sourcegraph/cody/initialization/PostStartupActivity.kt
@@ -1,15 +1,10 @@
package com.sourcegraph.cody.initialization
-import com.intellij.openapi.actionSystem.ActionManager
-import com.intellij.openapi.actionSystem.Constraints
-import com.intellij.openapi.actionSystem.DefaultActionGroup
-import com.intellij.openapi.application.ApplicationManager
import com.intellij.openapi.project.Project
import com.intellij.openapi.startup.StartupActivity
import com.sourcegraph.cody.CodyFocusChangeListener
import com.sourcegraph.cody.agent.CodyAgentService
import com.sourcegraph.cody.auth.SelectOneOfTheAccountsAsActive
-import com.sourcegraph.cody.config.CodyApplicationSettings
import com.sourcegraph.cody.config.SettingsMigration
import com.sourcegraph.cody.config.ui.CheckUpdatesTask
import com.sourcegraph.cody.statusbar.CodyStatusService
@@ -34,28 +29,5 @@ class PostStartupActivity : StartupActivity.DumbAware {
CodyStatusService.resetApplication(project)
CodyFocusChangeListener().runActivity(project)
EndOfTrialNotificationScheduler.createAndStart(project)
- initializeInlineEdits()
- }
-
- // TODO: This should go away (along with the feature flag) once Inline Edits are stable/released.
- private fun initializeInlineEdits() {
- ApplicationManager.getApplication().invokeLater {
- if (ConfigUtil.isFeatureFlagEnabled("cody.feature.inline-edits") ||
- CodyApplicationSettings.instance.isInlineEditionEnabled) {
- val actionManager = ActionManager.getInstance()
- (actionManager.getAction("CodyEditorActions") as? DefaultActionGroup)?.apply {
- pushFrontAction(actionManager, "cody.documentCodeAction", this)
- pushFrontAction(actionManager, "cody.editCodeAction", this)
- }
- }
- }
- }
-
- private fun pushFrontAction(
- actionManager: ActionManager,
- actionId: String,
- group: DefaultActionGroup
- ) {
- actionManager.getAction(actionId)?.let { group.add(it, Constraints.FIRST) }
}
}
diff --git a/src/main/resources/CodyBundle.properties b/src/main/resources/CodyBundle.properties
index 648047badf..6c939e5fd3 100644
--- a/src/main/resources/CodyBundle.properties
+++ b/src/main/resources/CodyBundle.properties
@@ -131,6 +131,6 @@ LlmDropdown.disabled.text=Start a new chat to change the model
# Chat actions
action.cody.openChat.text=Open Chat
action.cody.newChat.text=New Chat
-action.cody.newChat.description=New Chat
+action.cody.newChat.description=New chat
action.cody.exportChats.text=Export All Chats As JSON
action.cody.exportChats.description=Export All Chats As JSON
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
index 3d93b3cd6a..1e9bbc7afa 100644
--- a/src/main/resources/META-INF/plugin.xml
+++ b/src/main/resources/META-INF/plugin.xml
@@ -220,6 +220,7 @@
icon="/icons/codyLogoSm.svg" searchable="false"
class="com.sourcegraph.cody.CodyActionGroup">
+
-
+
-
+
-
+
-
@@ -266,17 +266,14 @@
id="cody.editCodeAction"
class="com.sourcegraph.cody.edit.EditCodeAction"
text="Edit Code">
-
-
-
+
-
-
+