Provides webviewId to merge conflicts wrapper #3955
Closed
+25
−9
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Wanted to provide webviewId as context (and implemented, but then reverted), but the command registration on graphWebview side is a bit incorrect, it always handles events of
gitlens.views.graph
So, I provide webviewId from graphWrapper and check inside the MergeConflictWarning, then pick between createWebviewCommandLink and createCommandLink. It's bad that there are several types for commands and webviewIds, it's not easy to unify it now
Checklist
Fixes $XXX -
orCloses #XXX -
prefix to auto-close the issue that your PR addresses