diff options
author | Kirill Dubovitskiy <kirill2003de@gmail.com> | 2023-08-08 22:58:03 -0700 |
---|---|---|
committer | Kirill Dubovitskiy <kirill2003de@gmail.com> | 2023-08-08 22:59:22 -0700 |
commit | ac14b40bbd93ccea991bb81615ed5ea0a1f29a86 (patch) | |
tree | fd8e6eefb0f07cb4d6d83f71799b5f42ede72ada /extension/react-app/src/components/ComboBox.tsx | |
parent | 47c19fa8da8b459c4cfc1d9a535c6cadaa5fa5ec (diff) | |
download | sncontinue-ac14b40bbd93ccea991bb81615ed5ea0a1f29a86.tar.gz sncontinue-ac14b40bbd93ccea991bb81615ed5ea0a1f29a86.tar.bz2 sncontinue-ac14b40bbd93ccea991bb81615ed5ea0a1f29a86.zip |
Fixed an issue with files from other workspaces showing up in @context search
- Adding workspace folder information to react-app that uses
- Adding workspace_dir to the meilisearch documents
- Keeping the original singlton index as that requires a bigger change
- Truncated the context descriptions from absolute paths to only include path relative to workspace directory
Note:
I have freely changed the store.config model from workspacePath to workspacePaths as it was unused, can't think of a way how it would backfire at the moment with older versions that might have been using it. Might be missing something here
Diffstat (limited to 'extension/react-app/src/components/ComboBox.tsx')
-rw-r--r-- | extension/react-app/src/components/ComboBox.tsx | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/extension/react-app/src/components/ComboBox.tsx b/extension/react-app/src/components/ComboBox.tsx index 472e1b14..c75f9ee6 100644 --- a/extension/react-app/src/components/ComboBox.tsx +++ b/extension/react-app/src/components/ComboBox.tsx @@ -24,7 +24,8 @@ import { setBottomMessage, setBottomMessageCloseTimeout, } from "../redux/slices/uiStateSlice"; -import { useDispatch } from "react-redux"; +import { useDispatch, useSelector } from "react-redux"; +import { RootStore } from "../redux/store"; const SEARCH_INDEX_NAME = "continue_context_items"; @@ -136,6 +137,7 @@ const ComboBox = React.forwardRef((props: ComboBoxProps, ref) => { const searchClient = new MeiliSearch({ host: "http://127.0.0.1:7700" }); const client = useContext(GUIClientContext); const dispatch = useDispatch(); + const workspacePaths = useSelector((state: RootStore) => state.config.workspacePaths); const [history, setHistory] = React.useState<string[]>([]); // The position of the current command you are typing now, so the one that will be appended to history once you press enter @@ -181,10 +183,16 @@ const ComboBox = React.forwardRef((props: ComboBoxProps, ref) => { // Get search results and return setCurrentlyInContextQuery(true); const providerAndQuery = segs[segs.length - 1] || ""; - const [provider, query] = providerAndQuery.split(" "); + // Only return context items from the current workspace - the index is currently shared between all sessions + const workspaceFilter = + workspacePaths && workspacePaths.length > 0 + ? `workspace_dir IN [ ${workspacePaths.map((path) => `"${path}"`).join(", ")} ]` + : undefined; searchClient .index(SEARCH_INDEX_NAME) - .search(providerAndQuery) + .search(providerAndQuery, { + filter: workspaceFilter, + }) .then((res) => { setItems( res.hits.map((hit) => { @@ -410,7 +418,7 @@ const ComboBox = React.forwardRef((props: ComboBoxProps, ref) => { // Prevent Downshift's default 'Enter' behavior. (event.nativeEvent as any).preventDownshiftDefault = true; - if (props.onEnter) props.onEnter(event); + if (props.onEnter) {props.onEnter(event);} setCurrentlyInContextQuery(false); } else if (event.key === "Tab" && items.length > 0) { downshiftProps.setInputValue(items[0].name); @@ -423,7 +431,7 @@ const ComboBox = React.forwardRef((props: ComboBoxProps, ref) => { ) { (event.nativeEvent as any).preventDownshiftDefault = true; } else if (event.key === "ArrowUp") { - if (positionInHistory == 0) return; + if (positionInHistory == 0) {return;} else if ( positionInHistory == history.length && (history.length === 0 || |