ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-13 19:48:37 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode c58aaab8a1cc22a7139b761166a0d4f37d41e998 (#7880)

Browse Source 
* Merge from vscode c58aaab8a1cc22a7139b761166a0d4f37d41e998

* fix pipelines

* fix strict-null-checks

* add missing files
This commit is contained in:
Anthony Dresser
2019-10-21 22:12:22 -07:00
committed by GitHub
parent 7c9be74970
commit 1e22f47304
913 changed files with 18898 additions and 16536 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/vs/platform/userDataSync/common/extensionsSync.ts
View File

@@ -70,16 +70,16 @@ export class ExtensionsSynchroniser extends Disposable implements ISynchroniser
async sync(): Promise<boolean> {
if (!this.configurationService.getValue<boolean>('configurationSync.enableExtensions')) {
this.logService.trace('Extensions: Skipping synchronising extensions as it is disabled.');
this.logService.trace('Extensions: Skipping synchronizing extensions as it is disabled.');
return false;
}
if (this.status !== SyncStatus.Idle) {
this.logService.trace('Extensions: Skipping synchronising extensions as it is running already.');
this.logService.trace('Extensions: Skipping synchronizing extensions as it is running already.');
return false;
}
this.logService.trace('Extensions: Started synchronising extensions...');
this.logService.trace('Extensions: Started synchronizing extensions...');
this.setStatus(SyncStatus.Syncing);
try {
@@ -88,13 +88,13 @@ export class ExtensionsSynchroniser extends Disposable implements ISynchroniser
this.setStatus(SyncStatus.Idle);
if (e instanceof UserDataSyncStoreError && e.code === UserDataSyncStoreErrorCode.Rejected) {
// Rejected as there is a new remote version. Syncing again,
this.logService.info('Extensions: Failed to synchronise extensions as there is a new remote version available. Synchronising again...');
this.logService.info('Extensions: Failed to synchronise extensions as there is a new remote version available. Synchronizing again...');
return this.sync();
}
throw e;
}
this.logService.trace('Extensions: Finised synchronising extensions.');
this.logService.trace('Extensions: Finised synchronizing extensions.');
this.setStatus(SyncStatus.Idle);
return true;
}
@@ -129,7 +129,7 @@ export class ExtensionsSynchroniser extends Disposable implements ISynchroniser
const { added, removed, updated, remote } = this.merge(localExtensions, remoteExtensions, lastSyncExtensions);
if (!added.length && !removed.length && !updated.length && !remote) {
this.logService.trace('Extensions: No changes found during synchronising extensions.');
this.logService.trace('Extensions: No changes found during synchronizing extensions.');
}
if (added.length || removed.length || updated.length) {
@@ -162,7 +162,7 @@ export class ExtensionsSynchroniser extends Disposable implements ISynchroniser
const ignoredExtensions = this.configurationService.getValue<string[]>('configurationSync.extensionsToIgnore') || [];
// First time sync
if (!remoteExtensions) {
this.logService.info('Extensions: Remote extensions does not exist. Synchronising extensions for the first time.');
this.logService.info('Extensions: Remote extensions does not exist. Synchronizing extensions for the first time.');
return { added: [], removed: [], updated: [], remote: localExtensions.filter(({ identifier }) => ignoredExtensions.some(id => id.toLowerCase() === identifier.id.toLowerCase())) };
}