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

Fix TS 2.3.1 Compiler Errors in VSCode src/workbench #25249

Merged
merged 1 commit into from
Apr 25, 2017

Conversation

mjbvz
Copy link
Collaborator

@mjbvz mjbvz commented Apr 24, 2017

From: microsoft/TypeScript#15352

TS 2.3.1 introduced a breaking change by switching to covariant types for callbacks. This change tries to fix these compiler errors in the workbench codebase

@mjbvz mjbvz self-assigned this Apr 24, 2017
@mjbvz mjbvz force-pushed the ts-231-vscode-workbench-fixes branch 2 times, most recently from f01cb3e to 9475058 Compare April 24, 2017 21:41
@mjbvz
Copy link
Collaborator Author

mjbvz commented Apr 24, 2017

I'm going to revert the changes around IColorTheme for this PR. For cases like this where the fix is unclear to me, I'll open bugs and try to assign them to the proper owner

@mjbvz mjbvz force-pushed the ts-231-vscode-workbench-fixes branch 2 times, most recently from c63b518 to 1871615 Compare April 24, 2017 23:13
@@ -310,7 +310,7 @@ export class ExtHostSCM {
return sourceControl;
}

$provideOriginalResource(sourceControlHandle: number, uri: URI): TPromise<URI> {
Copy link
Collaborator Author

@mjbvz mjbvz Apr 24, 2017

Choose a reason for hiding this comment

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

I also wasn't entirely sure of URI vs vscode.Uri. I think the change itself is correct, but I was not confident to know if any existing code is relying on the old signature or if this change could cause any trouble

Copy link
Member

Choose a reason for hiding this comment

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

Good catch. Both URI there should be vscode.Uri.

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.

Thanks for doing this!

Copy link
Member

@joaomoreno joaomoreno left a comment

Choose a reason for hiding this comment

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

Looks great, thanks!

@@ -310,7 +310,7 @@ export class ExtHostSCM {
return sourceControl;
}

$provideOriginalResource(sourceControlHandle: number, uri: URI): TPromise<URI> {
Copy link
Member

Choose a reason for hiding this comment

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

Good catch. Both URI there should be vscode.Uri.

@isidorn
Copy link
Contributor

isidorn commented Apr 25, 2017

Looks good, thanks!

TS 2.3.1 introduced a breaking change by [switching to covariant types for callbacks](https://github.com/Microsoft/TypeScript/wiki/Breaking-Changes#covariance-in-callback-parameters). This change tries to fix these compiler errors in the workbench codebase
@mjbvz mjbvz force-pushed the ts-231-vscode-workbench-fixes branch from 1871615 to d65b4e7 Compare April 25, 2017 15:19
@mjbvz mjbvz merged commit 6147b54 into microsoft:master Apr 25, 2017
@github-actions github-actions bot locked and limited conversation to collaborators Mar 27, 2020
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.

6 participants