Skip to content

editor: Accept next line prediction#44411

Merged
agu-z merged 12 commits intozed-industries:mainfrom
teleoflexuous:accept-next-line-prediction
Dec 15, 2025
Merged

editor: Accept next line prediction#44411
agu-z merged 12 commits intozed-industries:mainfrom
teleoflexuous:accept-next-line-prediction

Conversation

@teleoflexuous
Copy link
Contributor

@teleoflexuous teleoflexuous commented Dec 8, 2025

Closes #20574

Release Notes:

  • Replaced editor action editor::AcceptPartialEditPrediction with editor::AcceptNextLineEditPrediction and editor::AcceptNextWordEditPrediction

Tested manually on windows, attaching screen cap. https://github.com/user-attachments/assets/fea04499-fd16-4b7d-a6aa-3661bb85cf4f

Updated existing test for accepting word prediction in copilot - it is already marked as flaky, not sure what to do about it and I'm not really confident creating new one without a working example.

Added migration of keymaps and new defaults for windows, linux, macos in defaults and in cursor.

This should alleviate #21645
I used some work done in stale PR #25274, hopefully this one makes it through!

@cla-bot
Copy link

cla-bot bot commented Dec 8, 2025

We require contributors to sign our Contributor License Agreement, and we don't have @teleoflexuous on file. You can sign our CLA at https://zed.dev/cla. Once you've signed, post a comment here that says '@cla-bot check'.

@zed-industries-bot
Copy link
Contributor

zed-industries-bot commented Dec 8, 2025

Messages
📖

This PR includes links to the following GitHub Issues: #20574
If this PR aims to close an issue, please include a Closes #ISSUE line at the top of the PR body.

Generated by 🚫 dangerJS against 633976c

@teleoflexuous

This comment was marked as resolved.

@cla-bot cla-bot bot added the cla-signed The user has signed the Contributor License Agreement label Dec 8, 2025
@cla-bot
Copy link

cla-bot bot commented Dec 8, 2025

The cla-bot has been summoned, and re-checked this pull request!

@teleoflexuous

This comment was marked as outdated.

@teleoflexuous teleoflexuous changed the title Accept next line prediction editor: Accept next line prediction Dec 12, 2025
@agu-z agu-z moved this from Community PRs to In progress in Quality Week – December 2025 Dec 15, 2025
@agu-z
Copy link
Contributor

agu-z commented Dec 15, 2025

@teleoflexuous Thank you for your contribution! This looks great 😄

@agu-z agu-z enabled auto-merge (squash) December 15, 2025 18:15
@agu-z agu-z merged commit d4f9657 into zed-industries:main Dec 15, 2025
23 checks passed
@github-project-automation github-project-automation bot moved this from In progress to Done in Quality Week – December 2025 Dec 15, 2025
CherryWorm pushed a commit to CherryWorm/zed that referenced this pull request Dec 16, 2025
Closes  [zed-industries#20574](zed-industries#20574)

Release Notes:

- Replaced editor action editor::AcceptPartialEditPrediction with
editor::AcceptNextLineEditPrediction and
editor::AcceptNextWordEditPrediction

Tested manually on windows, attaching screen cap.
https://github.com/user-attachments/assets/fea04499-fd16-4b7d-a6aa-3661bb85cf4f

Updated existing test for accepting word prediction in copilot - it is
already marked as flaky, not sure what to do about it and I'm not really
confident creating new one without a working example.

Added migration of keymaps and new defaults for windows, linux, macos in
defaults and in cursor.

This should alleviate
[zed-industries#21645](zed-industries#21645)
I used some work done in stale PR
zed-industries#25274, hopefully this one
makes it through!

---------

Co-authored-by: Agus Zubiaga <agus@zed.dev>
SomeoneToIgnore pushed a commit that referenced this pull request Dec 16, 2025
…ion (#44971)

### Problem

PR #44411 replaced the `editor::AcceptPartialEditPrediction` action with
`editor::AcceptNextLineEditPrediction` and
`editor::AcceptNextWordEditPrediction`. However, the Linux cursor keymap
wasn't updated to reflect this change, causing a panic on startup for
Linux users.

### Solution

Updated the Linux keymap configuration to reference the new actions

Release Notes:

- N/A
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

cla-signed The user has signed the Contributor License Agreement

Projects

Development

Successfully merging this pull request may close these issues.

Add action for accepting inline suggestions one line at a time

3 participants