Skip to content

Commit

Permalink
Rebase & reformating
Browse files Browse the repository at this point in the history
  • Loading branch information
pkukielka committed Jan 23, 2024
1 parent 09dd905 commit 3ef379b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
7 changes: 4 additions & 3 deletions src/main/kotlin/com/sourcegraph/cody/chat/Chat.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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))

Expand Down

0 comments on commit 3ef379b

Please sign in to comment.