Sublime Forum

**gwenzek** · March 1, 2019, 9:01am

Thanks for the new build, the inline diffs looks so great !

I really like how the diff display as regular code and can be selected / copied with regular keybindings.
And “select_all” restricts itself to the inline diff. Is this because the diff is treated as a separate view ?

Can we have commands for:

moving your cursor to the closest inline diff (I’d rather not use the mouse for that.)
reverting the diff

Lastly, will there be a new plugin API to be able to create similar readonly regions ? or are they just very well integrated phantoms ?

**jps** · March 1, 2019, 9:08am

We have modification-level navigation and revert (as oppossed to hunk level) - see the Goto / Next Modification and Edit / Text / Revert Modification menu items

**jps** · March 1, 2019, 9:09am

The deleted text is shown via a text phantom, which are similar-but-different to the html phantoms available via the API

**jfcherng** · March 1, 2019, 10:45am

Could we have a command for reverting hunk (like GitGutter) or a command that selects the whole hunk (then I could revert it with the current revert_modification)?

The new toggle_inline_diff command is awesome, btw.

**milkman** · March 1, 2019, 10:21am

Full ack! Great work @jps and the team! Thank you very much

**mauroreisvieira** · March 1, 2019, 10:32am

I find a bug in this new version.
So basically if a have the diff “open” and open the Command Palette, and scroll its work fine.

But if open the Command Palette when the initial code is deleted, the Command Palette appear bellow to the diff_deleted.

**gwenzek** · March 1, 2019, 10:51am

Thanks, found them!

Here are the relevant commands:

	{ "keys": ["ctrl+."], "command": "next_modification" },
	{ "keys": ["ctrl+,"], "command": "prev_modification" },
	{ "keys": ["super+k", "super+z"], "command": "revert_modification" },
	{ "keys": ["super+k", "super+forward_slash"], "command": "toggle_inline_diff" },
	{ "keys": ["super+k", "super+;"], "command": "toggle_inline_diff", "args": { "prefer_hide": true } },

**jfcherng** · March 1, 2019, 11:04am

Hi @gwenzek.

What does the prefer_hide do? How do you find that arg?

{ "keys": ["super+k", "super+;"], "command": "toggle_inline_diff", "args": { "prefer_hide": true } },

**gj1118** · March 1, 2019, 11:28am

I am struggling to understand how inline diffs work - When I right click a new line in an existing file (which is tracked by GIT) , I see a new option - “Line History” . On clicking on it - it opens Sublime Merge with the changes. Is this how is it supposed to work ? Please confirm .

Thanks and Regards
Gagan

**jfcherng** · March 1, 2019, 11:29am

It’s Show Diff Hunk in the menu.

**websash** · March 1, 2019, 11:30am

I can confirm. On initial render the Command Pallet renders underneath the phantom with deleted code. I have to scroll a little bit to bring the pallet to the foreground

**gj1118** · March 1, 2019, 11:36am

@jfcherng , It seems that option is not present for me.I am on the latest build

**wbond** · March 1, 2019, 11:46am

You have to right-click on a line that has been modified. Additionally, mini_diff must be enabled (the default).

**gj1118** · March 1, 2019, 11:59am

@wbond On a modified line, I right click and choose “Line History” , it opens in Sublime Merge , is that correct ?

**jfcherng** · March 1, 2019, 12:01pm

No. Choose Show Diff Hunk.

**gj1118** · March 1, 2019, 12:06pm

This is what I see

I have mini_diff turned to true

**jfcherng** · March 1, 2019, 12:10pm

Maybe Mac has a different context menu from Windows’.
It’s located above Cut on Windows…

Maybe you can try its keybinding (cmd+k, cmd+/ on macOS)

**gj1118** · March 1, 2019, 12:12pm

Tried doing that as well - it comments out the line for me.

**wbond** · March 1, 2019, 12:12pm

The feature Line History is supposed to open Sublime Merge, yes.

**gj1118** · March 1, 2019, 12:17pm

Sorry for the spam and the misunderstanding on my part. The changelog says "Inline Diffs … " . Am I on the right track ?

Build 3193