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

Implements first iteration of multi diff editors. #197652

Merged
merged 4 commits into from
Nov 9, 2023
Merged

Conversation

hediet
Copy link
Member

@hediet hediet commented Nov 7, 2023

Code_-_OSS_sWZYa7jmeT

Tasks left:

  • More performant scrolling
  • Collapsing files
  • adding/removing files

Fixes #179000

Co-authored-by: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
@vscodenpa vscodenpa added this to the November 2023 milestone Nov 7, 2023
bpasero
bpasero previously requested changes Nov 7, 2023
Copy link
Member

@bpasero bpasero left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was only looking at a few files, not the larger pieces and left some feedback. I am adding @lramos15 for reviewing the editor resolver changes.

src/vs/workbench/browser/parts/editor/editorCommands.ts Outdated Show resolved Hide resolved
src/vs/workbench/common/editor.ts Outdated Show resolved Hide resolved
@bpasero bpasero requested a review from lramos15 November 7, 2023 19:48
@lramos15
Copy link
Member

lramos15 commented Nov 7, 2023

I'm guessing there is, but just for my understanding is there a reasoning for not making this a one off editor type like Chat, Search, the Perf graph, etc instead of adding an entire new editor type that my guess is won't be implemented elsehwere

@hediet
Copy link
Member Author

hediet commented Nov 9, 2023

I'm guessing there is, but just for my understanding is there a reasoning for not making this a one off editor type like Chat, Search, the Perf graph, etc instead of adding an entire new editor type that my guess is won't be implemented elsehwere

I was wondering the same. Let's start with this and refactor later.
Because the widget lives separately, it should be easy to address this later.

@hediet hediet merged commit f85a095 into main Nov 9, 2023
6 checks passed
@hediet hediet deleted the hediet/b/pregnant-mink branch November 9, 2023 18:15
@IllusionMH
Copy link
Contributor

IllusionMH commented Nov 10, 2023

Is it only for Git (VCS) view for now (at least this is my impression after glancing over this PR code)?
I can't find command that would allow me to use it to diff 2 folders. Are there plans to support folders diff?
Similar to how keybinding below allows to quickly diff files(or open editors)

    {
        "key": "ctrl+d",
        "command": "compareSelected",
        "when": "listDoubleSelection && activeViewlet == 'workbench.view.explorer'"
    },

@hediet
Copy link
Member Author

hediet commented Nov 13, 2023

Is it only for Git (VCS) view for now (at least this is my impression after glancing over this PR code)?

We will slowly integrate it into other features as well.

I can't find command that would allow me to use it to diff 2 folders. Are there plans to support folders diff?

This is out of scope for this feature, but maybe this can be implemented by an extension.

@github-actions github-actions bot locked and limited conversation to collaborators Dec 24, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Multi File Diff Editor
5 participants