fix(patch): cherry-pick 8cae90f to release/v0.27.0-preview.7-pr-18108 [CONFLICTS]#18230
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 backport a critical fix for cursor navigation on wrapped lines into a preview release. The original change corrects a regression where up/down arrow keys did not function as expected when text spanned multiple visual lines. However, the automated cherry-pick process encountered merge conflicts, necessitating manual intervention to resolve these before the fix can be fully integrated and 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 is correct, but it has introduced merge conflict markers into the source code that were not resolved. This will cause the build to fail and must be corrected.
| <<<<<<< HEAD | ||
| ======= | ||
| setText, | ||
| text, | ||
| visualCursor, | ||
| visualLines, | ||
| >>>>>>> 8cae90f40 (Fix up/down arrow regression and add test. (#18108)) |
There was a problem hiding this comment.
This file contains unresolved merge conflict markers. These markers must be removed to ensure the code is syntactically correct and can be compiled. Based on the changes in this PR, visualCursor and visualLines should be added to the dependency array for the handleInput useCallback hook, as they are now used within it. The other variables (setText, text) from the conflict are not used and can be omitted.
visualCursor,
visualLines,|
Size Change: +55 B (0%) Total Size: 23.5 MB ℹ️ View Unchanged
|

This PR automatically cherry-picks commit 8cae90f to patch version v0.27.0-preview.7 in the preview release to create version 0.27.0-preview.8.
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: