Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

word diff view: something similar to ms-office revisions #103285

Closed
Nadano opened this issue Jul 24, 2020 · 3 comments
Closed

word diff view: something similar to ms-office revisions #103285

Nadano opened this issue Jul 24, 2020 · 3 comments
Assignees
Labels
diff-editor Diff editor issues *duplicate Issue identified as a duplicate of another issue(s) feature-request Request for new features or functionality help wanted Issues identified as good community contribution opportunities

Comments

@Nadano
Copy link

Nadano commented Jul 24, 2020

Edited for clarity:

I'm trying to have people in my team work with git, and I believe it would make things way more clear for them to have diff results that are similar to the ones used in word revisions.

Looking into the options I believe "git diff --color-word=." is the most natural for people used to office tools, explained here

@joaomoreno joaomoreno reopened this Jul 30, 2020
@joaomoreno joaomoreno assigned alexdima and unassigned joaomoreno Jul 30, 2020
@alexdima alexdima added diff-editor Diff editor issues feature-request Request for new features or functionality labels Aug 5, 2020
@alexdima alexdima removed their assignment Aug 5, 2020
@Nadano Nadano changed the title diff tool, something similar to git diff --word-diff? word diff view: something similar to ms-office revisions Sep 2, 2020
@cristian3d
Copy link

Upvoted!

But, please, don't forget about this one #3562 . It'd be a huge improvement, and is a standard feature. Or at least comment why is not possible, so we stop dreaming about it :)

@github-actions github-actions bot locked and limited conversation to collaborators Dec 4, 2020
@hediet hediet self-assigned this Sep 14, 2023
@hediet hediet reopened this Sep 14, 2023
@hediet hediet modified the milestones: Backlog Candidates, Backlog Sep 14, 2023
@hediet hediet added the help wanted Issues identified as good community contribution opportunities label Sep 14, 2023
@hediet
Copy link
Member

hediet commented Sep 14, 2023

I think this shouldn't be too hard to implement (but it is also not trivial).

My suggested attack plan would look like this:

  • Add a new settings (e.g. diffEditor.inlineView.inlineWordDiffs) - default false (I think if this works well we can turn it on by default later)
  • If set, diff hunks where each inner (character-level) range diff is single line and not too big shouldn't get the viewzone
  • Instead, the deleted part should be rendered using a decoration and injected text.

@microsoft microsoft unlocked this conversation Oct 26, 2023
@hediet
Copy link
Member

hediet commented Dec 12, 2023

/duplicate of #176969

@hediet hediet closed this as not planned Won't fix, can't repro, duplicate, stale Dec 12, 2023
@vscodenpa vscodenpa added the *duplicate Issue identified as a duplicate of another issue(s) label Dec 12, 2023
@github-actions github-actions bot locked and limited conversation to collaborators Jan 30, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
diff-editor Diff editor issues *duplicate Issue identified as a duplicate of another issue(s) feature-request Request for new features or functionality help wanted Issues identified as good community contribution opportunities
Projects
None yet
Development

No branches or pull requests

8 participants
@joaomoreno @hediet @alexdima @Nadano @cristian3d @aiday-mar @vscodenpa and others