Skip to content

Add editor::AcceptNextLineEditPrediction to accept next line suggestion only#25274

Closed
aevsai wants to merge 3 commits intozed-industries:mainfrom
aevsai:feat/editor-accept-new-line-completion
Closed

Add editor::AcceptNextLineEditPrediction to accept next line suggestion only#25274
aevsai wants to merge 3 commits intozed-industries:mainfrom
aevsai:feat/editor-accept-new-line-completion

Conversation

@aevsai
Copy link
Contributor

@aevsai aevsai commented Feb 20, 2025

Closes #20574

Release Notes:

  • Added editor action to accept next line suggestion only with editor::AcceptNextLineEditPrediction
  • editor::AcceptPartialEditPrediction renamed to editor::AcceptNextWordEditPrediction

Checklist:

  • Default keybindings: ctrl-cmd-down on macos and alt-down on linux (by analogy for right)
  • Added migrations for settings
  • Tested with supermaven
Screen.Recording.2025-02-20.at.10.19.01.PM.mov

@cla-bot cla-bot bot added the cla-signed The user has signed the Contributor License Agreement label Feb 20, 2025
@aevsai aevsai changed the title can accept edit suggestions till new line Added editor action to accept next line suggestion only with editor::AcceptNextLineEditPrediction Feb 20, 2025
@maxdeviant maxdeviant changed the title Added editor action to accept next line suggestion only with editor::AcceptNextLineEditPrediction Add editor::AcceptNextLineEditPrediction to accept next line suggestion only Feb 20, 2025
@aevsai

This comment was marked as resolved.

@aevsai
Copy link
Contributor Author

aevsai commented Feb 21, 2025

Screenshot 2025-02-21 at 9 54 42 AM
fixed condition

@aevsai aevsai force-pushed the feat/editor-accept-new-line-completion branch from 9b036ef to 23e505c Compare April 21, 2025 10:15
@maxdeviant maxdeviant assigned agu-z and unassigned maxdeviant Jun 3, 2025
@SomeoneToIgnore SomeoneToIgnore added the area:ai Improvement related to Agent Panel, Edit Prediction, Copilot, or other AI features label Jul 1, 2025
@notpeter
Copy link
Contributor

notpeter commented Aug 6, 2025

I'm going to go ahead and close this as stale given that there hasn't been any activity in 4months and there are merge conflicts.

My apologies that we didn't get a chance to review this in a timely fashion. Please free to address the merge conflicts and reopen a clean PR and we'll try to do better next time.
Thanks

@notpeter notpeter closed this Aug 6, 2025
pull bot pushed a commit to FrancoStino/zed that referenced this pull request Dec 15, 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>
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>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area:ai Improvement related to Agent Panel, Edit Prediction, Copilot, or other AI features cla-signed The user has signed the Contributor License Agreement

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Add action for accepting inline suggestions one line at a time

5 participants