Allow ResourceCommandResolver.getRightResource() to return undefined #113364
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
fix microsoft#112537 and related issues.
infinnie
changed the title
change command order
Add corresponding integration test
Closed
Update smoke.test.ts
eamodio
reviewed
Jan 4, 2021
extensions/git/src/repository.ts
Outdated
| @@ -80,15 +80,15 @@ export class Resource implements SourceControlResourceState { | |||
| } | |||
|
|
|||
| get rightUri(): Uri { | |||
| return this.resources[1]; | |||
| return this.resources[1] as Uri; | |||
There was a problem hiding this comment.
I don't think this is a good idea -- this should either return Uri | undefined or it should throw.
There was a problem hiding this comment.
I checked and adding undefined doesn't (visibly) cause any issues.
|
I've merged this now -- thanks for the fix!! |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
This PR fixes #112537 and related issues.
By allowing the
ResourceCommandResolver.getRightResource()method to return undefined, theShould never happenerror would not be thrown (#112713) in rename/delete conflicts, where only theleftUriproperty is accessed.