Merge branch 'main' into package-python [skip ci]

3 files changed, 34 insertions, 0 deletions

diff --git a/extension/package.json b/extension/package.json
index 7a703368..18783391 100644
--- a/extension/package.json
+++ b/extension/package.json
@@ -111,6 +111,16 @@
         "command": "continue.viewLogs",
         "category": "Continue",
         "title": "View Logs"
+      },
+      {
+        "command": "continue.toggleAuxiliaryBar",
+        "category": "Continue",
+        "title": "Toggle Auxiliary Bar"
+      },
+      {
+        "command": "continue.focusContinueInputWithEdit",
+        "category": "Continue",
+        "title": "Focus Continue Input With Edit"
       }
     ],
     "keybindings": [
@@ -120,6 +130,11 @@
         "key": "ctrl+m"
       },
       {
+        "command": "continue.focusContinueInputWithEdit",
+        "mac": "cmd+shift+m",
+        "key": "ctrl+shift+m"
+      },
+      {
         "command": "continue.suggestionDown",
         "mac": "shift+ctrl+down",
         "key": "shift+ctrl+down"
@@ -148,6 +163,11 @@
         "command": "continue.quickTextEntry",
         "mac": "cmd+shift+l",
         "key": "ctrl+shift+l"
+      },
+      {
+        "command": "continue.toggleAuxiliaryBar",
+        "mac": "alt+cmd+m",
+        "key": "alt+ctrl+m"
       }
     ],
     "menus": {
diff --git a/extension/react-app/src/components/ComboBox.tsx b/extension/react-app/src/components/ComboBox.tsx
index 18e150e5..9017f19c 100644
--- a/extension/react-app/src/components/ComboBox.tsx
+++ b/extension/react-app/src/components/ComboBox.tsx
@@ -255,6 +255,10 @@ const ComboBox = React.forwardRef((props: ComboBoxProps, ref) => {
     const handler = (event: any) => {
       if (event.data.type === "focusContinueInput") {
         inputRef.current!.focus();
+      } else if (event.data.type === "focusContinueInputWithEdit") {
+        inputRef.current!.focus();
+
+        downshiftProps.setInputValue("/edit ");
       }
     };
     window.addEventListener("message", handler);
diff --git a/extension/src/commands.ts b/extension/src/commands.ts
index 35d466e8..351c055d 100644
--- a/extension/src/commands.ts
+++ b/extension/src/commands.ts
@@ -52,6 +52,16 @@ const commandsMap: { [command: string]: (...args: any) => any } = {
     }
     focusedOnContinueInput = !focusedOnContinueInput;
   },
+  "continue.focusContinueInputWithEdit": async () => {
+    vscode.commands.executeCommand("continue.continueGUIView.focus");
+    debugPanelWebview?.postMessage({
+      type: "focusContinueInputWithEdit",
+    });
+    focusedOnContinueInput = true;
+  },
+  "continue.toggleAuxiliaryBar": () => {
+    vscode.commands.executeCommand("workbench.action.toggleAuxiliaryBar");
+  },
   "continue.quickTextEntry": async () => {
     const text = await vscode.window.showInputBox({
       placeHolder: