Skip to content
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

Jump to bottom

Fix: slow chat because of osr and allow tab presses to accept diffs. #175

Open
wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

Fix: slow chat because of osr and allow tab presses to accept diffs. #175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
47d3439
Fix: slow chat because of `osr` and allow tab presses to accept diffs.
MarcMcIntosh Sep 13, 2024
b20b030
comment out code that doesn't change anything
MarcMcIntosh Sep 13, 2024
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
1 change: 1 addition & 0 deletions src/main/kotlin/com/smallcloud/refactai/modes/ModeProvider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@ class ModeProvider(

fun getDiffMode(): DiffMode = (modes[ModeType.Diff] as DiffMode?)!!

fun isDiffMode(): Boolean = activeMode == modes[ModeType.Diff]


companion object {
Expand Down
42 changes: 28 additions & 14 deletions src/main/kotlin/com/smallcloud/refactai/panes/sharedchat/browser/ChatWebView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,28 +3,20 @@ package com.smallcloud.refactai.panes.sharedchat.browser
import com.google.gson.Gson
import com.intellij.ide.BrowserUtil
import com.intellij.openapi.Disposable
import com.intellij.openapi.actionSystem.DataContext
import com.intellij.openapi.application.ApplicationManager
import com.intellij.openapi.fileEditor.FileEditorManager
import com.intellij.openapi.keymap.Keymap
import com.intellij.openapi.keymap.KeymapManager
import com.intellij.openapi.keymap.KeymapUtil
import com.intellij.ui.jcef.*
import com.intellij.util.ui.UIUtil
import com.smallcloud.refactai.PluginState
import com.smallcloud.refactai.lsp.LSPProcessHolderChangedNotifier
import com.smallcloud.refactai.modes.ModeProvider
import com.smallcloud.refactai.panes.sharedchat.Editor
import com.smallcloud.refactai.panes.sharedchat.Events
import org.cef.CefApp
import org.cef.browser.CefBrowser
import org.cef.browser.CefFrame
import org.cef.callback.CefAuthCallback
import org.cef.callback.CefCallback
import org.cef.handler.*
import org.cef.misc.BoolRef
import org.cef.misc.StringRef
import org.cef.network.CefCookie
import org.cef.network.CefRequest
import org.cef.network.CefResponse
import org.cef.network.CefURLRequest
import org.cef.security.CefSSLInfo
import javax.swing.JComponent


Expand Down Expand Up @@ -78,9 +70,9 @@ class ChatWebView(val editor: Editor, val messageHandler: (event: Events.FromCha
.setEnableOpenDevToolsMenuItem(true)
.setUrl("http://refactai/index.html")
// change this to enable dev tools
// setting to false prevents "Accept diff with tab"
// setting to false prevents "Accept diff with tab": fixed with onTabHandler
// setting to true causes slow scroll issues :/
.setOffScreenRendering(true)
.setOffScreenRendering(false)
.build()

browser.jbCefClient.addDisplayHandler(object : CefDisplayHandlerAdapter() {
Expand All @@ -98,6 +90,28 @@ class ChatWebView(val editor: Editor, val messageHandler: (event: Events.FromCha
browser.setProperty(JBCefBrowserBase.Properties.NO_CONTEXT_MENU, true)
}

val onTabHandler: CefKeyboardHandler = object : CefKeyboardHandlerAdapter() {
override fun onKeyEvent(browser: CefBrowser?, event: CefKeyboardHandler.CefKeyEvent?): Boolean {
val wasTabPressed = event?.type == CefKeyboardHandler.CefKeyEvent.EventType.KEYEVENT_KEYUP && event.modifiers == 0 && event.character == '\t';
val currentEditor = FileEditorManager.getInstance(editor.project).selectedTextEditor
val isInDiffMode = currentEditor != null && ModeProvider.getOrCreateModeProvider(currentEditor).isDiffMode()

if(wasTabPressed && currentEditor != null && isInDiffMode) {
ApplicationManager.getApplication().invokeLater {
ModeProvider.getOrCreateModeProvider(currentEditor)
.onTabPressed(currentEditor, null, DataContext.EMPTY_CONTEXT)
}
return false;
}
return super.onKeyEvent(browser, event)
}
}

browser.jbCefClient.addKeyboardHandler(onTabHandler, browser.cefBrowser)
// browser.component.mouseWheelListeners.iterator().forEach {
// browser.component.removeMouseWheelListener(it)
// }


CefApp.getInstance().registerSchemeHandlerFactory("http", "refactai", RequestHandlerFactory())

Expand Down
Loading