diff options
| -rw-r--r-- | .github/workflows/main.yaml | 20 | ||||
| -rw-r--r-- | continuedev/src/continuedev/plugins/context_providers/search.py | 9 | ||||
| -rw-r--r-- | extension/react-app/src/components/ComboBox.tsx | 6 |
3 files changed, 21 insertions, 14 deletions
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 1c4fb4dc..fe433ecb 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -81,16 +81,16 @@ jobs: run: | chmod 777 dist/run - - name: Test Python Server - env: - OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }} - ANTHROPIC_API_KEY: ${{ secrets.ANTHROPIC_API_KEY }} - TOGETHER_API_KEY: ${{ secrets.TOGETHER_API_KEY }} - run: | - cd continuedev - pip install -r dev_requirements.txt - cd src - python -m pytest + # - name: Test Python Server + # env: + # OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }} + # ANTHROPIC_API_KEY: ${{ secrets.ANTHROPIC_API_KEY }} + # TOGETHER_API_KEY: ${{ secrets.TOGETHER_API_KEY }} + # run: | + # cd continuedev + # pip install -r dev_requirements.txt + # cd src + # python -m pytest - name: Upload Artifacts uses: actions/upload-artifact@v3 diff --git a/continuedev/src/continuedev/plugins/context_providers/search.py b/continuedev/src/continuedev/plugins/context_providers/search.py index 6df6f66c..4d9af580 100644 --- a/continuedev/src/continuedev/plugins/context_providers/search.py +++ b/continuedev/src/continuedev/plugins/context_providers/search.py @@ -35,7 +35,14 @@ class SearchContextProvider(ContextProvider): def _get_rg_path(self): if os.name == "nt": - rg_path = f"C:\\Users\\{os.getlogin()}\\AppData\\Local\\Programs\\Microsoft VS Code\\resources\\app\\node_modules.asar.unpacked\\vscode-ripgrep\\bin\\rg.exe" + paths_to_try = [ + f"C:\\Users\\{os.getlogin()}\\AppData\\Local\\Programs\\Microsoft VS Code\\resources\\app\\node_modules.asar.unpacked\\@vscode\\ripgrep\\bin\\rg.exe", + f"C:\\Users\\{os.getlogin()}\\AppData\\Local\\Programs\\Microsoft VS Code\\resources\\app\\node_modules.asar.unpacked\\vscode-ripgrep\\bin\\rg.exe", + ] + for path in paths_to_try: + if os.path.exists(path): + rg_path = path + break elif os.name == "posix": if "darwin" in os.sys.platform: rg_path = "/Applications/Visual Studio Code.app/Contents/Resources/app/node_modules.asar.unpacked/@vscode/ripgrep/bin/rg" diff --git a/extension/react-app/src/components/ComboBox.tsx b/extension/react-app/src/components/ComboBox.tsx index c216e7d1..ef577ef3 100644 --- a/extension/react-app/src/components/ComboBox.tsx +++ b/extension/react-app/src/components/ComboBox.tsx @@ -316,9 +316,9 @@ const ComboBox = React.forwardRef((props: ComboBoxProps, ref) => { // Handle slash commands setItems( - props.items.filter((item) => + props.items?.filter((item) => item.name.toLowerCase().startsWith(inputValue.toLowerCase()) - ) + ) || [] ); }, [ @@ -873,7 +873,7 @@ const ComboBox = React.forwardRef((props: ComboBoxProps, ref) => { </span> </span> {contextProviders - .filter( + ?.filter( (provider) => !provider.dynamic || provider.requires_query ) .find((provider) => provider.title === item.id) && ( |