4 ms·
The author writes > I need to run tests, use goto definition and other editor navigation features, apply local changes to check if some things could have been
by klauserc 3y ago
The author writes
> I need to run tests, use goto definition and other editor navigation features, apply local changes to check if some things could have been written differently, look at the wider context to notice things that should have been changed, and in general notice anything that might be not quite right with the codebase, irrespective of the historical path to the current state of the code.
The editors/IDEs I've used usually only offer rudimentary support in diffs (goto defn, but only in the same file; maybe auto-completion, but usually not for newly added items; no refactoring functionality)
- pama 3y agoMaybe time to try Emacs? The diff support is great. And magit is native to Emacs.
- junke 3y agosmerge-refine is one keybinding I always use to highlight changes in 3-way diffs between base/mine, base/theirs, mine/theirs. The only problem is knowing what mine and theirs mean sometimes.
- aulin 3y agoAlso magit-ediff ('e' in any merge conflict) is great and maybe a little more intuitive than smerge
- CraigJPerry 3y agoOne area where vscode+gitlens plugin beats IntelliJ, the plugin adds in fully featured editable RHS to diff view
- atombender 3y agoIntelliJ's spli diff view is a full editor with code completion, formatting, symbol lookup, and everything.
- CraigJPerry 3y agoYeah you're right, I have no idea what i was thinking of, intellij's supported this forever.
- lelanthran 3y ago> The editors/IDEs I've used usually only offer rudimentary support in diffs (goto defn, but only in the same file; maybe auto-completion, but usually not for newly added items; no refactoring functionality) Sure, but (to me it seems that) that doesn't necessitate the display change he is advocating for. A diff program that has nice code navigation (and/or other IDE features) would be great, but what does that have to do with whether it is displaying the common split-diff, or his take on the split-diff.
- psd1 3y agoI'm early in my emacs journey, but used VSCode for years. The Github extension is absolutely amazing for pull requests, since you have all your LSP and regex code navigation goodness. I only used it for a small percentage of reviews, but it made it vastly easier to grok the impact of every change.
- IshKebab 3y agoThe author is the author of the Rust VSCode extension so I'm guessing he is familiar with VSCode. If you use Gitlens's "compare working tree with..." you get the split view and you can edit the "current" version and all IDE tools work.