Skip to content

fix: make EditCode independent from chat interface ChatMode (#1086) #1088

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: make EditCode independent from chat interface ChatMode (#1086) #1088

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/main/kotlin/ee/carlrobert/codegpt/actions/editor/EditCodeSubmissionHandler.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ import com.jetbrains.rd.util.AtomicReference
import ee.carlrobert.codegpt.codecompletions.CompletionProgressNotifier
import ee.carlrobert.codegpt.completions.CompletionRequestService
import ee.carlrobert.codegpt.completions.EditCodeCompletionParameters
import ee.carlrobert.codegpt.settings.configuration.ChatMode
import ee.carlrobert.codegpt.settings.configuration.ConfigurationSettings
import ee.carlrobert.codegpt.ui.ObservableProperties

class EditCodeSubmissionHandler(
Expand Down Expand Up @@ -39,8 +41,10 @@ class EditCodeSubmissionHandler(
}
runInEdt { editor.selectionModel.removeSelection() }

// EditCode should always use EDIT mode (no backticks)
// This is independent from the chat interface ChatMode setting
service<CompletionRequestService>().getEditCodeCompletionAsync(
EditCodeCompletionParameters(userPrompt, selectedText),
EditCodeCompletionParameters(userPrompt, selectedText, ChatMode.EDIT),
EditCodeCompletionListener(editor, observableProperties, selectionTextRange)
)
}
Expand Down
1 change: 1 addition & 0 deletions src/main/kotlin/ee/carlrobert/codegpt/settings/configuration/ConfigurationSettings.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ class ConfigurationSettingsState : BaseState() {
var tableData by map<String, String>()
var chatCompletionSettings by property(ChatCompletionSettingsState())
var codeCompletionSettings by property(CodeCompletionSettingsState())
var chatMode by enum(ChatMode.ASK)

init {
tableData.putAll(EditorActionsUtil.DEFAULT_ACTIONS)
Expand Down
4 changes: 3 additions & 1 deletion src/main/kotlin/ee/carlrobert/codegpt/ui/textarea/UserInputPanel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import ee.carlrobert.codegpt.CodeGPTBundle
import ee.carlrobert.codegpt.Icons
import ee.carlrobert.codegpt.conversations.Conversation
import ee.carlrobert.codegpt.settings.configuration.ChatMode
import ee.carlrobert.codegpt.settings.configuration.ConfigurationSettings
import ee.carlrobert.codegpt.settings.models.ModelRegistry
import ee.carlrobert.codegpt.settings.service.FeatureType
import ee.carlrobert.codegpt.settings.service.ModelSelectionService
Expand Down Expand Up @@ -55,7 +56,7 @@ class UserInputPanel(
private const val CORNER_RADIUS = 16
}

private var chatMode: ChatMode = ChatMode.ASK
private var chatMode: ChatMode = ConfigurationSettings.getState().chatMode
private val disposableCoroutineScope = DisposableCoroutineScope()
private val promptTextField =
PromptTextField(
Expand Down Expand Up @@ -106,6 +107,7 @@ class UserInputPanel(

fun setChatMode(mode: ChatMode) {
chatMode = mode
ConfigurationSettings.getState().chatMode = mode
}

init {
Expand Down