fix(patch): cherry-pick 8cae90f to release/v0.27.0-preview.6-pr-18108 [CONFLICTS]#18224
Conversation
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com> # Conflicts: # packages/cli/src/ui/components/shared/text-buffer.ts
Summary of ChangesHello @gemini-cli-robot, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed! This pull request aims to integrate a critical bug fix into an upcoming preview release by automatically cherry-picking a commit. The fix specifically resolves a regression in the CLI's text buffer component, ensuring that cursor navigation with up and down arrow keys works as expected on lines that wrap across multiple visual lines. Due to merge conflicts encountered during the automated process, manual intervention is required to resolve these conflicts before the fix can be fully applied and the new preview version released. Highlights
Changelog
Activity
Using Gemini Code AssistThe full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips. Invoking Gemini You can request assistance from Gemini at any point by creating a comment using either
Customization To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a Limitations & Feedback Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here. You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension. Footnotes
|
There was a problem hiding this comment.
Code Review
This pull request cherry-picks a fix for a regression in up/down arrow key navigation on wrapped lines, and adds a corresponding regression test. The fix itself appears correct, but a merge conflict was not resolved properly, leaving conflict markers in the code. This is a critical issue that will prevent the code from compiling and must be addressed.
| <<<<<<< HEAD | ||
| ======= | ||
| setText, | ||
| text, | ||
| visualCursor, | ||
| visualLines, | ||
| >>>>>>> 8cae90f40 (Fix up/down arrow regression and add test. (#18108)) |
There was a problem hiding this comment.
It appears there are unresolved merge conflict markers left in the code. This will cause a syntax error and prevent the code from compiling. Please remove the markers. The dependencies visualCursor and visualLines are correctly added as they are now used in handleInput, but setText and text appear to be unused in this callback and can be omitted.
visualCursor,
visualLines,
This PR automatically cherry-picks commit 8cae90f to patch version v0.27.0-preview.6 in the preview release to create version 0.27.0-preview.7.
This cherry-pick resulted in merge conflicts that need manual resolution.
🔧 Next Steps:
📋 Files with conflicts:
The commit has been created with conflict markers for easier manual resolution.
🚨 Important: