feat(context): Display branch name in mention menu help text #8156
Conversation
This commit enhances the mention menu to display the branch name associated with the context item, improving user clarity. - Adds a `getBranchHelpText` function to determine the appropriate help text based on available branch information. - The function checks if the branch is specified in the mention data or the query string. - Updates the MentionMenu component to use the `getBranchHelpText` function to display the branch name. - Adds unit tests for the `getBranchHelpText` function and `extractRepoAndBranch` function to ensure correct behavior. - Modifies `extractRepoAndBranch` to support parsing repo and branch from strings like "repo@branch", "repo", or "repo:directory@branch". - Updates the query to include the branch when searching for directories.
This commit introduces several enhancements to the remote directory search functionality, improving the accuracy and usability of directory context within the Cody extension. - Improves the parsing of repo and branch from the query string in `extractRepoAndBranch` function. - Adds tests for `github.com/mrdoob/three.js@dev` parsing. - Implements branch selection for root directory search. - Implements branch selection with directory path filtering. - Introduces `getDirectoryContents` query to fetch directory contents. - Updates `getDirectoryItem` to use `getDirectoryContents` and filter directory entries. - Adds DIRECTORY_CONTENTS_QUERY to GraphQL queries. - Adds `getDirectoryContents` method to `SourcegraphGraphQLAPIClient`.
| path | ||
| byteSize | ||
| url | ||
| content |
There was a problem hiding this comment.
Examining the rest of the PR, it looks like you don't need content. content is pretty expensive, so you should use it only when you need the file contents immediately. If you think you may need the file contents, you can use rawURL instead of content and then use that URL to retrieve the content.
Additionally, examine whether you need the blob at all - it looks like this PR is using the directories, but not the files, so you may be able to ditch the file info (GitBlob) completely.
|
@peterguy I'm looking at addressing your feedback. If we do just a remote file then we use the entire file as context. The new getDirectory with it's conditions would of returned only the files found in that folder and not it's children I know that if I manually add some context I would expect for the entire file to be read instead of just chunks, was trying this on Cursor and although the folder is local and not remote it was able to properly read the contents of all 4 files that were found in that directory. If we want to keep this light chunk but more encompassing search that finds files also in children directories then I will just look at adding the information regarding the branch searching and selecting and keep the remote directory context with the file chunk as it is. |
|
@ichim-david in general, even if you’re using file contents, you should return |
…earch This commit enhances the retrieval of remote directory items by utilizing context search for improved accuracy and performance. It also introduces a fallback mechanism to `getDirectoryContents` if context search returns no results. - Implements context search for retrieving directory items using `graphqlClient.contextSearch`. - Adds a fallback mechanism to `getDirectoryContents` if context search returns no results. - Modifies `getDirectoryItem` to accept `repoID` instead of `query`. - Updates `getDirectoryItem` to use directory basename as search query since contextSearch requires non-empty query. - Adds revision support to context search. - Adds repoName and revision to context item mentions. - Reduces the number of entries fetched in `GetDirectoryContents` query to 15. - Updates file pattern regex for root directory search in `getDirectoryMentions` to ensure it matches from the start of the string. - Constructs URL with branch information in `getDirectoryMentions` if available. - Fixes parsing of repo and branch from query string in `extractRepoAndBranch` function by using `indexOf` instead of `lastIndexOf` to find the `@` symbol.
This commit addresses issues in the remote directory search tests and improves URL generation for directory mentions. - Updates test assertions to use the correct server endpoint from the mock configuration. - Mocks `contextSearch` to return an empty array to trigger fallback in tests. - Adds `repoID` to the data object in directory contents tests. - Corrects the URL generation in `getDirectoryMentions` to use `/tree/` instead of `/blob/` for directory paths. - Updates the file pattern regex in `searchFileMatches` to ensure it matches from the start of the string.
…d fuzzy matching This commit introduces several enhancements to the remote directory search functionality, including improved branch handling and fuzzy matching for branch names, enhancing the user experience when searching for directories within specific branches. - Implements branch suggestions when the user types `repo:` to show available branches. - Adds fuzzy matching for branch names when the user types `repo:@query` to filter branches. - Supports branch names with hyphens, slashes, and dots in `extractRepoAndBranch`. - Improves the display of branch information in the mention menu, including help text indicating the source branch. - Updates the mention menu to display the correct query label with branch information. - Fixes the search query to include the branch name when searching for directories. - Adds tests for branch name parsing and branch suggestions.
…rowsing This commit introduces branch suggestions and enhances remote file browsing within OpenCtx, allowing users to easily navigate and search for files within specific branches of a repository. - Adds `getBranchMentions` to fetch branch suggestions for a given repository. - Implements branch filtering based on user input. - Adds support for browsing files in a specific branch using the `repo@branch:path` format. - Updates `createRepositoryMention` to include `defaultBranch` and `branches` in the mention data. - Modifies `getFileMentions` to include an optional branch parameter in the search query. - Creates `createBranchMentionsFromData` to create mention objects for branches. - Introduces `parseRemoteQuery` to parse the query string and extract repository name, branch, and path components.
…ents This commit enhances the remote directory search functionality by utilizing the `getDirectoryContents` API to fetch directory contents directly, improving performance and reliability. - Replaces the previous implementation that relied on `contextSearch` and a fallback to `getDirectoryContents` with a direct call to `getDirectoryContents`. - Adds a new `fetchContentFromRawURL` method to fetch the content of files from their raw URLs. - Updates the `getDirectoryItem` function to use the `getDirectoryContents` API and `fetchContentFromRawURL` to retrieve file entries and their content. - Filters out directories and binary files from the results. - Exports `DirectoryContentsResponse` type. - Updates the `GetDirectoryContents` query to include `rawURL` and `binary` fields.
This commit enhances the mention menu to display the branch name associated with the context item, improving user clarity.
getBranchHelpTextfunction to determine the appropriate help text based on available branch information.getBranchHelpTextfunction to display the branch name.getBranchHelpTextfunction andextractRepoAndBranchfunction to ensure correct behavior.extractRepoAndBranchto support parsing repo and branch from strings like "repo@branch", "repo", or "repo:directory@branch".Test plan
and when done it will find it