Skip to content

fix(patch): cherry-pick 8cae90f to release/v0.27.0-preview.6-pr-18108 [CONFLICTS]#18224

Closed
gemini-cli-robot wants to merge 1 commit into
release/v0.27.0-preview.6-pr-18108from
hotfix/v0.27.0-preview.6/0.27.0-preview.7/preview/cherry-pick-8cae90f/pr-18108
Closed

fix(patch): cherry-pick 8cae90f to release/v0.27.0-preview.6-pr-18108 [CONFLICTS]#18224
gemini-cli-robot wants to merge 1 commit into
release/v0.27.0-preview.6-pr-18108from
hotfix/v0.27.0-preview.6/0.27.0-preview.7/preview/cherry-pick-8cae90f/pr-18108

Conversation

@gemini-cli-robot

Copy link
Copy Markdown
Collaborator

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.

⚠️ Merge Conflicts Detected

This cherry-pick resulted in merge conflicts that need manual resolution.

🔧 Next Steps:

  1. Review the conflicts: Check out this branch and review the conflict markers
  2. Resolve conflicts: Edit the affected files to resolve the conflicts
  3. Test the changes: Ensure the patch works correctly after resolution
  4. Update this PR: Push your conflict resolution

📋 Files with conflicts:

The commit has been created with conflict markers for easier manual resolution.

🚨 Important:

  • Do not merge this PR until conflicts are resolved
  • The automated patch release will trigger once this PR is merged

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
@gemini-code-assist

Copy link
Copy Markdown
Contributor

Summary of Changes

Hello @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

  • Automated Cherry-Pick: This PR is an automated cherry-pick of commit 8cae90f to the release/v0.27.0-preview.6-pr-18108 branch, intended to create version 0.27.0-preview.7.
  • Regression Fix: Addresses a regression where up/down arrow navigation did not function correctly on wrapped lines within the text buffer component.
  • Cursor Logic Update: The logic for handling MOVE_UP and MOVE_DOWN commands in useTextBuffer has been updated to correctly account for visual line wrapping by using visualCursor and visualLines.
  • New Regression Test: A dedicated test case has been added to text-buffer.test.ts to ensure the correct behavior of up/down arrow movement on wrapped lines.
  • Merge Conflicts: The cherry-pick operation resulted in merge conflicts in packages/cli/src/ui/components/shared/text-buffer.ts that require manual resolution.
Changelog
  • packages/cli/src/ui/components/shared/text-buffer.test.ts
    • Added a new regression test case to validate correct up/down arrow navigation on wrapped text lines.
  • packages/cli/src/ui/components/shared/text-buffer.ts
    • Modified the handleInput function to use visualCursor[0] for MOVE_UP and visualLines.length - 1 for MOVE_DOWN boundary checks, improving cursor behavior on wrapped lines.
    • Introduced merge conflicts in the dependency array of a useCallback hook, requiring manual resolution.
Activity
  • The pull request was automatically generated by gemini-cli-robot to perform a cherry-pick.
  • Merge conflicts were detected and reported, with instructions provided for manual resolution.
Using Gemini Code Assist

The 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 /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature Command Description
Code Review /gemini review Performs a code review for the current pull request in its current state.
Pull Request Summary /gemini summary Provides a summary of the current pull request in its current state.
Comment @gemini-code-assist Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help /gemini help Displays a list of available commands.

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 .gemini/ folder in the base of the repository. Detailed instructions can be found here.

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

  1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution.

@gemini-code-assist gemini-code-assist Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

Comment on lines +2977 to +2983
<<<<<<< HEAD
=======
setText,
text,
visualCursor,
visualLines,
>>>>>>> 8cae90f40 (Fix up/down arrow regression and add test. (#18108))

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

critical

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,

@skeshive skeshive closed this Feb 3, 2026
@sripasg sripasg added the size/m A medium sized PR label Jun 2, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size/m A medium sized PR

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants