Merge pull request #2936 from continuedev/pe/jb-osr-bugfixes

bugfix: OSR copy/paste bugs

Author: Patrick-Erichsen

core/protocol/ideWebview.ts

@@ -37,6 +37,7 @@ export type ToIdeFromWebviewProtocol = ToIdeFromWebviewOrCoreProtocol & {
   insertAtCursor: [{ text: string }, void];
   copyText: [{ text: string }, void];
   "jetbrains/editorInsetHeight": [{ height: number }, void];
+  "jetbrains/isOSREnabled": [undefined, void];
   "vscode/openMoveRightMarkdown": [undefined, void];
   setGitHubAuthToken: [{ token: string }, void];
   acceptDiff: [{ filepath: string }, void];
@@ -103,6 +104,7 @@ export type ToWebviewFromIdeProtocol = ToWebviewFromIdeOrCoreProtocol & {
   setTheme: [{ theme: any }, void];
   setColors: [{ [key: string]: string }, void];
   "jetbrains/editorInsetRefresh": [undefined, void];
+  "jetbrains/isOSREnabled": [boolean, void];
   addApiKey: [undefined, void];
   setupLocalConfig: [undefined, void];
   incrementFtc: [undefined, void];

extensions/intellij/src/main/kotlin/com/github/continuedev/continueintellijextension/editor/ToolTipComponent.kt

@@ -88,8 +88,8 @@ class ToolTipComponent(editor: Editor, x: Int, y: Int) :
         val componentHorizontalPadding = 4
         val buttonMargin = 4
 
-        addToChatButton = StyledButton("Chat (${cmdCtrlChar}J)")
-        editButton = StyledButton("Edit (${cmdCtrlChar}I)")
+        addToChatButton = StyledButton("Chat (${cmdCtrlChar}+J)")
+        editButton = StyledButton("Edit (${cmdCtrlChar}+I)")
 
         addToChatButton.addActionListener { e: ActionEvent? ->
             focusContinueInput(editor.project)

extensions/intellij/src/main/kotlin/com/github/continuedev/continueintellijextension/toolWindow/ContinueBrowser.kt

@@ -18,8 +18,6 @@ import kotlinx.coroutines.*
 import org.cef.CefApp
 import org.cef.browser.CefBrowser
 import org.cef.handler.CefLoadHandlerAdapter
-import com.intellij.openapi.application.ApplicationInfo
-import com.intellij.openapi.util.SystemInfo
 
 class ContinueBrowser(val project: Project, url: String) {
     private val coroutineScope = CoroutineScope(
@@ -79,8 +77,8 @@ class ContinueBrowser(val project: Project, url: String) {
     val browser: JBCefBrowser
 
     init {
-        val enableOSR = ServiceManager.getService(ContinueExtensionSettings::class.java).continueState.enableOSR
-        this.browser = JBCefBrowser.createBuilder().setOffScreenRendering(enableOSR).build()
+        val isOSREnabled = ServiceManager.getService(ContinueExtensionSettings::class.java).continueState.enableOSR
+        this.browser = JBCefBrowser.createBuilder().setOffScreenRendering(isOSREnabled).build()
 
 
         browser.jbCefClient.setProperty(
@@ -136,6 +134,10 @@ class ContinueBrowser(val project: Project, url: String) {
                     heightChangeListeners.forEach { it(height) }
                 }
 
+                "jetbrains/isOSREnabled" -> {
+                    sendToWebview( "jetbrains/isOSREnabled", isOSREnabled)
+                }
+
                 "onLoad" -> {
                     coroutineScope.launch {
                         // Set the colors to match Intellij theme

gui/src/components/mainInput/TipTapEditor.tsx

@@ -60,10 +60,11 @@ import {
   getSlashCommandDropdownOptions,
 } from "./getSuggestion";
 import {
-  handleJetBrainsMetaKeyPress,
-  handleMetaKeyPress,
-} from "./handleMetaKeyPress";
+  handleJetBrainsOSRMetaKeyIssues,
+  handleVSCMetaKeyIssues,
+} from "./handleMetaKeyIssues";
 import { ComboBoxItem } from "./types";
+import useIsOSREnabled from "../../hooks/useIsOSREnabled";
 
 const InputBoxDiv = styled.div<{ border?: string }>`
   resize: none;
@@ -181,6 +182,8 @@ function TipTapEditor(props: TipTapEditorProps) {
   const inSubmenuRef = useRef<string | undefined>(undefined);
   const inDropdownRef = useRef(false);
 
+  const isOSREnabled = useIsOSREnabled();
+
   const enterSubmenu = async (editor: Editor, providerId: string) => {
     const contents = editor.getText();
     const indexOfAt = contents.lastIndexOf("@");
@@ -551,17 +554,14 @@ function TipTapEditor(props: TipTapEditorProps) {
    *  with those key actions.
    */
   const handleKeyDown = async (e: KeyboardEvent<HTMLDivElement>) => {
-    if (!editorFocusedRef?.current) return;
-
     setActiveKey(e.key);
 
-    // Handle meta key issues
-    if (isMetaEquivalentKeyPressed(e)) {
-      if (isJetBrains()) {
-        handleJetBrainsMetaKeyPress(e, editor);
-      }
+    if (!editorFocusedRef?.current || !isMetaEquivalentKeyPressed(e)) return;
 
-      await handleMetaKeyPress(e, editor);
+    if (isOSREnabled) {
+      handleJetBrainsOSRMetaKeyIssues(e, editor);
+    } else {
+      await handleVSCMetaKeyIssues(e, editor);
     }
   };
 

gui/src/components/mainInput/handleMetaKeyPress.ts gui/src/components/mainInput/handleMetaKeyIssues.ts

@@ -4,38 +4,23 @@ import { isWebEnvironment } from "../../util";
 
 const isWebEnv = isWebEnvironment();
 
-export const handleJetBrainsMetaKeyPress = (
+/**
+ * This handles various keypress issues when OSR is enabled
+ */
+export const handleJetBrainsOSRMetaKeyIssues = (
   e: KeyboardEvent,
   editor: Editor,
 ) => {
   const selection = window.getSelection();
+  const alter = e.shiftKey ? "extend" : "move";
 
   const handlers: Record<string, () => void> = {
     Backspace: () => handleJetBrainsMetaBackspace(editor),
-    ArrowLeft: () =>
-      selection.modify(
-        e.shiftKey ? "extend" : "move",
-        "backward",
-        "lineboundary",
-      ),
-    ArrowRight: () =>
-      selection.modify(
-        e.shiftKey ? "extend" : "move",
-        "forward",
-        "lineboundary",
-      ),
-    ArrowDown: () =>
-      selection.modify(
-        e.shiftKey ? "extend" : "move",
-        "forward",
-        "documentboundary",
-      ),
+    ArrowLeft: () => selection.modify(alter, "backward", "lineboundary"),
+    ArrowRight: () => selection.modify(alter, "forward", "lineboundary"),
+    ArrowDown: () => selection.modify(alter, "forward", "documentboundary"),
     ArrowUp: () => {
-      selection.modify(
-        e.shiftKey ? "extend" : "move",
-        "backward",
-        "documentboundary",
-      );
+      selection.modify(alter, "backward", "documentboundary");
     },
   };
 
@@ -47,10 +32,12 @@ export const handleJetBrainsMetaKeyPress = (
 };
 
 /**
- * We use this for VS Code to fix an .ipynb bug
- * And we use it in JetBrains when OSR is turned on
+ * This handles reported issues with cut/copy/paste in .ipynb files in VSC
  */
-export const handleMetaKeyPress = async (e: KeyboardEvent, editor: Editor) => {
+export const handleVSCMetaKeyIssues = async (
+  e: KeyboardEvent,
+  editor: Editor,
+) => {
   const text = editor.state.doc.textBetween(
     editor.state.selection.from,
     editor.state.selection.to,

gui/src/hooks/useIsOSREnabled.ts

@@ -0,0 +1,21 @@
+import { useState, useEffect, useContext } from "react";
+import { isJetBrains } from "../util";
+import { useWebviewListener } from "./useWebviewListener";
+import { IdeMessengerContext } from "../context/IdeMessenger";
+
+export default function useIsOSREnabled() {
+  const [isOSREnabled, setIsOSREnabled] = useState(false);
+  const ideMessenger = useContext(IdeMessengerContext);
+
+  useWebviewListener("jetbrains/isOSREnabled", async (isOSREnabled) => {
+    setIsOSREnabled(isOSREnabled);
+  });
+
+  useEffect(() => {
+    if (isJetBrains()) {
+      ideMessenger.request("jetbrains/isOSREnabled", undefined);
+    }
+  }, []);
+
+  return isOSREnabled;
+}