use alt instead of cmd+backspace in jetbrains

Author: sestinj

gui/src/components/mainInput/Lump/LumpToolbar.tsx

@@ -8,7 +8,12 @@ import { selectCurrentToolCall } from "../../../redux/selectors/selectCurrentToo
 import { callCurrentTool } from "../../../redux/thunks/callCurrentTool";
 import { cancelCurrentToolCall } from "../../../redux/thunks/cancelCurrentToolCall";
 import { cancelStream } from "../../../redux/thunks/cancelStream";
-import { getFontSize, getMetaKeyLabel } from "../../../util";
+import {
+  getAltKeyLabel,
+  getFontSize,
+  getMetaKeyLabel,
+  isJetBrains,
+} from "../../../util";
 import { EnterButton } from "../InputToolbar/EnterButton";
 import { BlockSettingsTopToolbar } from "./BlockSettingsTopToolbar";
 
@@ -40,18 +45,20 @@ export function LumpToolbar() {
   const ideMessenger = useContext(IdeMessengerContext);
   const ttsActive = useAppSelector((state) => state.ui.ttsActive);
   const isStreaming = useAppSelector((state) => state.session.isStreaming);
+  const jetbrains = isJetBrains();
 
   const toolCallState = useSelector(selectCurrentToolCall);
 
   const handleKeyDown = (event: KeyboardEvent) => {
     if (toolCallState?.status === "generated") {
       const metaKey = event.metaKey || event.ctrlKey;
+      const altKey = event.altKey;
 
       if (metaKey && event.key === "Enter") {
         event.preventDefault();
         event.stopPropagation();
         dispatch(callCurrentTool());
-      } else if (metaKey && event.key === "Backspace") {
+      } else if ((jetbrains ? altKey : metaKey) && event.key === "Backspace") {
         event.preventDefault();
         event.stopPropagation();
         dispatch(cancelCurrentToolCall());
@@ -92,7 +99,8 @@ export function LumpToolbar() {
             dispatch(cancelStream());
           }}
         >
-          {getMetaKeyLabel()} ⌫ Cancel
+          {/* JetBrains overrides cmd+backspace, so we have to use another shortcut */}
+          {jetbrains ? getAltKeyLabel() : getMetaKeyLabel()} ⌫ Cancel
         </StopButton>
       </Container>
     );
@@ -109,7 +117,8 @@ export function LumpToolbar() {
             onClick={() => dispatch(cancelCurrentToolCall())}
             data-testid="reject-tool-call-button"
           >
-            {getMetaKeyLabel()} ⌫ Cancel
+            {/* JetBrains overrides cmd+backspace, so we have to use another shortcut */}
+            {jetbrains ? getAltKeyLabel() : getMetaKeyLabel()} ⌫ Cancel
           </StopButton>
           <EnterButton
             isPrimary={true}

gui/src/pages/gui/Chat.tsx

@@ -48,7 +48,7 @@ import { cancelStream } from "../../redux/thunks/cancelStream";
 import { exitEditMode } from "../../redux/thunks/exitEditMode";
 import { loadLastSession } from "../../redux/thunks/session";
 import { streamResponseThunk } from "../../redux/thunks/streamResponse";
-import { isMetaEquivalentKeyPressed } from "../../util";
+import { isJetBrains, isMetaEquivalentKeyPressed } from "../../util";
 import {
   FREE_TRIAL_LIMIT_REQUESTS,
   incrementFreeTrialCount,
@@ -130,14 +130,15 @@ export function Chat() {
   const hasDismissedExploreDialog = useAppSelector(
     (state) => state.ui.hasDismissedExploreDialog,
   );
+  const jetbrains = isJetBrains();
 
   useEffect(() => {
     // Cmd + Backspace to delete current step
     const listener = (e: any) => {
       if (
-        e.key === "Backspace" &&
-        isMetaEquivalentKeyPressed(e) &&
-        !e.shiftKey
+        e.key === "Backspace" && jetbrains
+          ? e.altKey
+          : isMetaEquivalentKeyPressed(e) && !e.shiftKey
       ) {
         dispatch(cancelStream());
       }
@@ -339,8 +340,8 @@ export function Chat() {
                     inputId={item.message.id}
                   />
                 </>
-              ) : item.message.role === "tool" ? null : // /> //   toolCallId={item.message.toolCallId} //   contextItems={item.contextItems} // <ToolOutput
-              item.message.role === "assistant" &&
+              ) : item.message.role === "tool" ? null : item.message.role === // /> //   toolCallId={item.message.toolCallId} //   contextItems={item.contextItems} // <ToolOutput
+                  "assistant" &&
                 item.message.toolCalls &&
                 item.toolCallState ? (
                 <div>