Merge pull request #3134 from 0xBigBoss/allen/fix-intellij-freezing

fix: intellij sidebar chat freezing
continuedev · Dec 4, 2024 · 80985b2 · 80985b2
2 parents 1d7919f + 1f602e5
commit 80985b2
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/core/protocol/ideWebview.ts b/core/protocol/ideWebview.ts
@@ -43,7 +43,7 @@ export type ToIdeFromWebviewProtocol = ToIdeFromWebviewOrCoreProtocol & {
   insertAtCursor: [{ text: string }, void];
   copyText: [{ text: string }, void];
   "jetbrains/editorInsetHeight": [{ height: number }, void];
-  "jetbrains/isOSREnabled": [undefined, void];
+  "jetbrains/isOSREnabled": [undefined, boolean];
   "vscode/openMoveRightMarkdown": [undefined, void];
   setGitHubAuthToken: [{ token: string }, void];
   acceptDiff: [{ filepath: string; streamId?: string }, void];

diff --git a/...ain/kotlin/com/github/continuedev/continueintellijextension/toolWindow/ContinueBrowser.kt b/...ain/kotlin/com/github/continuedev/continueintellijextension/toolWindow/ContinueBrowser.kt
@@ -138,7 +138,7 @@ class ContinueBrowser(val project: Project, url: String) {
                 }
 
                 "jetbrains/isOSREnabled" -> {
-                    sendToWebview( "jetbrains/isOSREnabled", isOSREnabled)
+                    respond(isOSREnabled)
                 }
 
                 "onLoad" -> {
@@ -268,7 +268,9 @@ class ContinueBrowser(val project: Project, url: String) {
         val jsCode = buildJavaScript(jsonData)
 
         try {
-            this.browser.executeJavaScriptAsync(jsCode)
+            this.browser.executeJavaScriptAsync(jsCode).onError {
+                println("Failed to execute jsCode error: ${it.message}")
+            }
         } catch (error: IllegalStateException) {
             println("Webview not initialized yet $error")
         }

diff --git a/gui/src/hooks/useIsOSREnabled.ts b/gui/src/hooks/useIsOSREnabled.ts
@@ -7,15 +7,19 @@ export default function useIsOSREnabled() {
   const [isOSREnabled, setIsOSREnabled] = useState(false);
   const ideMessenger = useContext(IdeMessengerContext);
 
-  useWebviewListener("jetbrains/isOSREnabled", async (isOSREnabled) => {
-    setIsOSREnabled(isOSREnabled);
-  });
-
   useEffect(() => {
     if (isJetBrains()) {
-      ideMessenger.post("jetbrains/isOSREnabled", undefined);
+      (async () => {
+        await ideMessenger
+          .request("jetbrains/isOSREnabled", undefined)
+          .then((result) => {
+            if (result.status === "success") {
+              setIsOSREnabled(result.content);
+            }
+          });
+      })();
     }
-  }, []);
+  }, [ideMessenger]);
 
   return isOSREnabled;
 }