From 3ef379b1e4f98a21a821baebd1102c02502d3324 Mon Sep 17 00:00:00 2001 From: Piotr Kukielka Date: Tue, 23 Jan 2024 14:50:29 +0100 Subject: [PATCH] Rebase & reformating --- src/main/kotlin/com/sourcegraph/cody/chat/Chat.kt | 7 ++++--- .../config/notification/AccountSettingChangeListener.kt | 2 -- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/main/kotlin/com/sourcegraph/cody/chat/Chat.kt b/src/main/kotlin/com/sourcegraph/cody/chat/Chat.kt index 3de1e841d0..2a98b19031 100644 --- a/src/main/kotlin/com/sourcegraph/cody/chat/Chat.kt +++ b/src/main/kotlin/com/sourcegraph/cody/chat/Chat.kt @@ -13,11 +13,11 @@ import com.sourcegraph.cody.vscode.CancellationToken import com.sourcegraph.common.CodyBundle import com.sourcegraph.common.CodyBundle.fmt import com.sourcegraph.common.UpgradeToCodyProNotification.Companion.isCodyProJetbrains -import org.eclipse.lsp4j.jsonrpc.ResponseErrorException -import org.slf4j.LoggerFactory import java.util.concurrent.ExecutionException import java.util.concurrent.atomic.AtomicBoolean import java.util.function.Consumer +import org.eclipse.lsp4j.jsonrpc.ResponseErrorException +import org.slf4j.LoggerFactory class Chat { val logger = LoggerFactory.getLogger(Chat::class.java) @@ -42,7 +42,8 @@ class Chat { val contextMessages = agentChatMessage.contextFiles?.map { contextFile: ContextFile -> ContextMessage(Speaker.ASSISTANT, agentChatMessageText, contextFile) - } ?: emptyList() + } + ?: emptyList() chat.displayUsedContext(contextMessages) chat.addMessageToChat(chatMessage) } else { diff --git a/src/main/kotlin/com/sourcegraph/cody/config/notification/AccountSettingChangeListener.kt b/src/main/kotlin/com/sourcegraph/cody/config/notification/AccountSettingChangeListener.kt index 443766c89e..8b2ad80621 100644 --- a/src/main/kotlin/com/sourcegraph/cody/config/notification/AccountSettingChangeListener.kt +++ b/src/main/kotlin/com/sourcegraph/cody/config/notification/AccountSettingChangeListener.kt @@ -5,7 +5,6 @@ import com.intellij.openapi.components.Service import com.intellij.openapi.project.Project import com.sourcegraph.cody.CodyToolWindowContent import com.sourcegraph.cody.agent.CodyAgentService -import com.sourcegraph.cody.config.CodyApplicationSettings import com.sourcegraph.cody.statusbar.CodyAutocompleteStatusService import com.sourcegraph.common.UpgradeToCodyProNotification import com.sourcegraph.config.ConfigUtil @@ -20,7 +19,6 @@ class AccountSettingChangeListener(project: Project) : ChangeListener(project) { override fun beforeAction(serverUrlChanged: Boolean) {} override fun afterAction(context: AccountSettingChangeContext) { - val codyApplicationSettings = CodyApplicationSettings.instance // Notify JCEF about the config changes javaToJSBridge?.callJS("pluginSettingsChanged", ConfigUtil.getConfigAsJson(project))