ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 10:58:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode 1a81711a85e38ccf784110568ebf3784ab9094a5 (#9161)

Browse Source 
* Merge from vscode 1a81711a85e38ccf784110568ebf3784ab9094a5

* small spacing fix
This commit is contained in:
Anthony Dresser
2020-02-15 00:43:09 -06:00
committed by GitHub
parent 74b89a0a85
commit 873c6a39fe
78 changed files with 1474 additions and 1011 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/vs/platform/actions/common/actions.ts
View File

@@ -119,7 +119,9 @@ export class MenuId {
static readonly DataExplorerContext = new MenuId('DataExplorerContext'); // {{SQL CARBON EDIT}}
static readonly DataExplorerAction = new MenuId('DataExplorerAction'); // {{SQL CARBON EDIT}}
static readonly ExplorerWidgetContext = new MenuId('ExplorerWidgetContext'); // {{SQL CARBON EDIT}}
static readonly TimelineItemContext = new MenuId('TimelineItemContext');
static readonly TimelineTitle = new MenuId('TimelineTitle');
static readonly TimelineTitleContext = new MenuId('TimelineTitleContext');
readonly id: number;
readonly _debugName: string;

2
src/vs/platform/instantiation/common/instantiation.ts
View File

@@ -29,7 +29,7 @@ export interface IConstructorSignature0<T> {
}
export interface IConstructorSignature1<A1, T> {
new(first: A1, ...services: BrandedService[]): T;
new <Services extends BrandedService[]>(first: A1, ...services: Services): T;
}
export interface IConstructorSignature2<A1, A2, T> {

2
src/vs/platform/userDataSync/common/userDataAutoSyncService.ts
View File

@@ -98,7 +98,7 @@ export class UserDataAutoSyncService extends Disposable implements IUserDataAuto
async triggerAutoSync(): Promise<void> {
if (this.enabled) {
return this.syncDelayer.trigger(() => {
this.logService.info('Auto Sync: Triggerred.');
this.logService.info('Auto Sync: Triggered.');
return this.sync(false, true);
}, this.successiveFailures
? 1000 * 1 * Math.min(this.successiveFailures, 60) /* Delay by number of seconds as number of failures up to 1 minute */