Merge from vscode 9bc92b48d945144abb405b9e8df05e18accb9148

This commit is contained in:
ADS Merger
2020-02-19 03:11:35 +00:00
parent 98584d32a7
commit 1e308639e5
253 changed files with 6414 additions and 2296 deletions

View File

@@ -48,7 +48,7 @@ export class UserDataSyncTrigger extends Disposable {
if (editorInput instanceof KeybindingsEditorInput) {
return true;
}
const resource = editorInput.getResource();
const resource = editorInput.resource;
if (isEqual(resource, this.workbenchEnvironmentService.settingsResource)) {
return true;
}