returnTPromise.wrapError<void>(nls.localize('cannotDiffBinary',"At least one of the resources to compare seems to be binary and this is currently not supported"));
returnnull;
}
}
// Assert that the current input is still the one we expect. This prevents a race condition when loading a diff takes long and another input was set meanwhile
// Assert that the current input is still the one we expect. This prevents a race condition when loading a diff takes long and another input was set meanwhile
...
@@ -174,9 +175,9 @@ export class TextDiffEditor extends BaseTextEditor {
...
@@ -174,9 +175,9 @@ export class TextDiffEditor extends BaseTextEditor {
returnPromise.wrapError(nls.localize('cannotDiffBinary',"At least one of the resources to compare seems to be binary and this is currently not supported"));
returnnull;
}
}
// Otherwise make sure the error bubbles up
// Otherwise make sure the error bubbles up
...
@@ -184,6 +185,21 @@ export class TextDiffEditor extends BaseTextEditor {
...
@@ -184,6 +185,21 @@ export class TextDiffEditor extends BaseTextEditor {