summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--continuedev/src/continuedev/libs/constants/default_config.py14
-rw-r--r--extension/react-app/src/components/ComboBox.tsx58
-rw-r--r--extension/react-app/src/components/HeaderButtonWithText.tsx4
-rw-r--r--extension/react-app/src/components/PillButton.tsx6
-rw-r--r--extension/src/bridge.ts2
-rw-r--r--extension/src/debugPanel.ts4
6 files changed, 70 insertions, 18 deletions
diff --git a/continuedev/src/continuedev/libs/constants/default_config.py b/continuedev/src/continuedev/libs/constants/default_config.py
index 8526df21..73c8eeba 100644
--- a/continuedev/src/continuedev/libs/constants/default_config.py
+++ b/continuedev/src/continuedev/libs/constants/default_config.py
@@ -66,11 +66,13 @@ config = ContinueConfig(
# Custom commands let you map a prompt to a shortened slash command
# They are like slash commands, but more easily defined - write just a prompt instead of a Step class
# Their output will always be in chat form
- custom_commands=[CustomCommand(
- name="test",
- description="This is an example custom command. Use /config to edit it and create more",
- prompt="Write a comprehensive set of unit tests for the selected code. It should setup, run tests that check for correctness including important edge cases, and teardown. Ensure that the tests are complete and sophisticated. Give the tests just as chat output, don't edit any file.",
- )],
+ custom_commands=[
+ # CustomCommand(
+ # name="test",
+ # description="Write unit tests for the higlighted code",
+ # prompt="Write a comprehensive set of unit tests for the selected code. It should setup, run tests that check for correctness including important edge cases, and teardown. Ensure that the tests are complete and sophisticated. Give the tests just as chat output, don't edit any file.",
+ # )
+ ],
# Slash commands let you run a Step from a slash command
slash_commands=[
@@ -86,7 +88,7 @@ config = ContinueConfig(
),
SlashCommand(
name="config",
- description="Open the config file to create new and edit existing slash commands",
+ description="Customize Continue - slash commands, LLMs, system message, etc.",
step=OpenConfigStep,
),
SlashCommand(
diff --git a/extension/react-app/src/components/ComboBox.tsx b/extension/react-app/src/components/ComboBox.tsx
index df3f970c..9b15713e 100644
--- a/extension/react-app/src/components/ComboBox.tsx
+++ b/extension/react-app/src/components/ComboBox.tsx
@@ -223,17 +223,48 @@ const ComboBox = React.forwardRef((props: ComboBoxProps, ref) => {
const divRef = React.useRef<HTMLDivElement>(null);
const ulRef = React.useRef<HTMLUListElement>(null);
const showAbove = () => {
- return (divRef.current?.getBoundingClientRect().top || 0) > UlMaxHeight;
+ return (
+ (divRef.current?.getBoundingClientRect().top || Number.MAX_SAFE_INTEGER) >
+ UlMaxHeight
+ );
};
useImperativeHandle(ref, () => downshiftProps, [downshiftProps]);
+ const contextItemsDivRef = React.useRef<HTMLDivElement>(null);
+ const handleTabPressed = () => {
+ // Set the focus to the next item in the context items div
+ if (!contextItemsDivRef.current) {
+ return;
+ }
+ const focusableItems =
+ contextItemsDivRef.current.querySelectorAll(".pill-button");
+ const focusableItemsArray = Array.from(focusableItems);
+ const focusedItemIndex = focusableItemsArray.findIndex(
+ (item) => item === document.activeElement
+ );
+ console.log(focusedItemIndex, focusableItems);
+ if (focusedItemIndex !== -1) {
+ const nextItem =
+ focusableItemsArray[
+ (focusedItemIndex + 1) % focusableItemsArray.length
+ ];
+ (nextItem as any)?.focus();
+ } else {
+ const firstItem = focusableItemsArray[0];
+ (firstItem as any)?.focus();
+ }
+ };
+
const [metaKeyPressed, setMetaKeyPressed] = useState(false);
const [focused, setFocused] = useState(false);
useEffect(() => {
const handleKeyDown = (e: KeyboardEvent) => {
if (e.key === "Meta") {
setMetaKeyPressed(true);
+ } else if (e.key === "Tab") {
+ e.preventDefault();
+ handleTabPressed();
}
};
const handleKeyUp = (e: KeyboardEvent) => {
@@ -271,7 +302,10 @@ const ComboBox = React.forwardRef((props: ComboBoxProps, ref) => {
return (
<>
- <div className="px-2 flex gap-2 items-center flex-wrap mt-2">
+ <div
+ className="px-2 flex gap-2 items-center flex-wrap mt-2"
+ ref={contextItemsDivRef}
+ >
{props.selectedContextItems.map((item, idx) => {
return (
<PillButton
@@ -303,6 +337,13 @@ const ComboBox = React.forwardRef((props: ComboBoxProps, ref) => {
onClick={() => {
props.onToggleAddContext();
}}
+ className="pill-button"
+ onKeyDown={(e: KeyboardEvent) => {
+ e.preventDefault();
+ if (e.key === "Enter") {
+ props.onToggleAddContext();
+ }
+ }}
>
<DocumentPlusIcon width="1.4em" height="1.4em" />
</HeaderButtonWithText>
@@ -329,10 +370,6 @@ const ComboBox = React.forwardRef((props: ComboBoxProps, ref) => {
setFocused(true);
dispatch(setBottomMessage(undefined));
},
- onBlur: (e) => {
- setFocused(false);
- postVscMessage("blurContinueInput", {});
- },
onKeyDown: (event) => {
dispatch(setBottomMessage(undefined));
if (event.key === "Enter" && event.shiftKey) {
@@ -356,6 +393,10 @@ const ComboBox = React.forwardRef((props: ComboBoxProps, ref) => {
} else if (event.key === "Tab" && items.length > 0) {
downshiftProps.setInputValue(items[0].name);
event.preventDefault();
+ } else if (event.key === "Tab") {
+ (event.nativeEvent as any).preventDownshiftDefault = true;
+ event.preventDefault();
+ handleTabPressed();
} else if (
(event.key === "ArrowUp" || event.key === "ArrowDown") &&
event.currentTarget.value.split("\n").length > 1
@@ -383,9 +424,12 @@ const ComboBox = React.forwardRef((props: ComboBoxProps, ref) => {
setCurrentlyInContextQuery(false);
} else if (event.key === "Escape") {
setCurrentlyInContextQuery(false);
- if (downshiftProps.isOpen) {
+ if (downshiftProps.isOpen && items.length > 0) {
downshiftProps.closeMenu();
} else {
+ (event.nativeEvent as any).preventDownshiftDefault = true;
+ // Remove focus from the input
+ inputRef.current?.blur();
// Move cursor back over to the editor
postVscMessage("focusEditor", {});
}
diff --git a/extension/react-app/src/components/HeaderButtonWithText.tsx b/extension/react-app/src/components/HeaderButtonWithText.tsx
index de8e3c98..bcd36972 100644
--- a/extension/react-app/src/components/HeaderButtonWithText.tsx
+++ b/extension/react-app/src/components/HeaderButtonWithText.tsx
@@ -10,6 +10,8 @@ interface HeaderButtonWithTextProps {
disabled?: boolean;
inverted?: boolean;
active?: boolean;
+ className?: string;
+ onKeyDown?: (e: any) => void;
}
const HeaderButtonWithText = (props: HeaderButtonWithTextProps) => {
@@ -29,6 +31,8 @@ const HeaderButtonWithText = (props: HeaderButtonWithTextProps) => {
setHover(false);
}}
onClick={props.onClick}
+ onKeyDown={props.onKeyDown}
+ className={props.className}
>
{props.children}
</HeaderButton>
diff --git a/extension/react-app/src/components/PillButton.tsx b/extension/react-app/src/components/PillButton.tsx
index edef808e..5895a91c 100644
--- a/extension/react-app/src/components/PillButton.tsx
+++ b/extension/react-app/src/components/PillButton.tsx
@@ -155,6 +155,12 @@ const PillButton = (props: PillButtonProps) => {
props.onHover(false);
}
}}
+ className="pill-button"
+ onKeyDown={(e) => {
+ if (e.key === "Backspace") {
+ client?.deleteContextWithIds([props.item.description.id]);
+ }
+ }}
>
{isHovered && (
<GridDiv
diff --git a/extension/src/bridge.ts b/extension/src/bridge.ts
index 9c43ebc2..0d665826 100644
--- a/extension/src/bridge.ts
+++ b/extension/src/bridge.ts
@@ -7,7 +7,7 @@ export function getContinueServerUrl() {
extensionContext &&
extensionContext.extensionMode === vscode.ExtensionMode.Development
) {
- // return "http://localhost:8001";
+ return "http://localhost:8001";
}
return (
vscode.workspace.getConfiguration("continue").get<string>("serverUrl") ||
diff --git a/extension/src/debugPanel.ts b/extension/src/debugPanel.ts
index d1fe565f..b687c3e4 100644
--- a/extension/src/debugPanel.ts
+++ b/extension/src/debugPanel.ts
@@ -243,10 +243,6 @@ export function setupDebugPanel(
vscode.commands.executeCommand("continue.viewLogs");
break;
}
- case "blurContinueInput": {
- setFocusedOnContinueInput(false);
- break;
- }
case "focusEditor": {
setFocusedOnContinueInput(false);
vscode.commands.executeCommand(
generated by cgit v1.2.3-70-g09d2 (git 2.48.1) at 2025-02-08 19:25:45 +0000