Skip to content

Conversation

seblyng
Copy link
Contributor

@seblyng seblyng commented Aug 25, 2025

Problem:

It is annoying to always have to press <esc> before being able to either accept or reject the diff with gda or gdr.

Solution:

Default to normal mode when in applying inline diff to allow users to immediately accept/reject diffs

BTW:

The inline diff PR is a super good improvement. Not only is it very nice that I know don't have to install a different plugin like mini.diff, the change in the prompt for how it should insert the patches seems to have helped a lot, making it fail less often now. Previously it would fail a lot for me, but trying to use it now for some hours constantly having it insert code for me, it seems to have gotten a lot better

Checklist

  • I've read the contributing guidelines and have adhered to them in this PR
  • I've updated CodeCompanion.has in the init.lua file for my new feature
  • I've added test coverage for this fix/feature
  • I've updated the README and/or relevant docs pages
  • I've run make all to ensure docs are generated, tests pass and my formatting is applied

Problem:

It is annoying to always have to press `<esc>` before being able to
either accept or reject the diff with `gda` or `gdr`.

Solution:

Default to normal mode when in applying inline diff to allow users to
immediately accept/reject diffs
@bassamsdata
Copy link
Contributor

bassamsdata commented Aug 25, 2025

I’m not sure why this is happening, I haven’t experienced this myself. I’ll push a PR today (hopefully), and after that, we can see if the issue still occurs before we do the "esc" part.

That said, I’m really glad you like the new inline diff!

On a side note, I’m currently working on the PR that really should have been ready yesterday. But after coming back from vacation, I accidentally deleted a symlink to my local CodeCompanion repo using oil.nvim thinking that Oil will just delete the symlink only, but Oil ended up deleting the entire original directory :( without sending it to trash. So, I lost all of the changes I had made. Bad Oil :(

@seblyng
Copy link
Contributor Author

seblyng commented Aug 25, 2025

So, I lost all of the changes I had made

Oh no, that is not good:(

I’ll push a PR today (hopefully), and after that, we can see if the issue still occurs before we do the "esc" part.

Sounds good to me👍

@olimorris olimorris added the P4 Negligible impact and urgency label Aug 27, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
P4 Negligible impact and urgency
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants