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

Vscode merge (#4582)

Browse Source 
* Merge from vscode 37cb23d3dd4f9433d56d4ba5ea3203580719a0bd

* fix issues with merges

* bump node version in azpipe

* replace license headers

* remove duplicate launch task

* fix build errors

* fix build errors

* fix tslint issues

* working through package and linux build issues

* more work

* wip

* fix packaged builds

* working through linux build errors

* wip

* wip

* wip

* fix mac and linux file limits

* iterate linux pipeline

* disable editor typing

* revert series to parallel

* remove optimize vscode from linux

* fix linting issues

* revert testing change

* add work round for new node

* readd packaging for extensions

* fix issue with angular not resolving decorator dependencies
This commit is contained in:
Anthony Dresser
2019-03-19 17:44:35 -07:00
committed by GitHub
parent 833d197412
commit 87765e8673
1879 changed files with 54505 additions and 38058 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/vs/workbench/services/progress/browser/progressService2.ts
View File

@@ -15,6 +15,7 @@ import { ProgressBadge, IActivityService } from 'vs/workbench/services/activity/
import { INotificationService, Severity, INotificationHandle, INotificationActions } from 'vs/platform/notification/common/notification';
import { Action } from 'vs/base/common/actions';
import { Event } from 'vs/base/common/event';
import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
export class ProgressService2 implements IProgressService2 {
@@ -38,8 +39,7 @@ export class ProgressService2 implements IProgressService2 {
if (viewlet) {
return this._withViewletProgress(location, task);
}
console.warn(`Bad progress location: ${location}`);
return undefined;
return Promise.reject(new Error(`Bad progress location: ${location}`));
}
switch (location) {
@@ -54,8 +54,7 @@ export class ProgressService2 implements IProgressService2 {
case ProgressLocation.Extensions:
return this._withViewletProgress('workbench.view.extensions', task);
default:
console.warn(`Bad progress location: ${location}`);
return undefined;
return Promise.reject(new Error(`Bad progress location: ${location}`));
}
}
@@ -267,3 +266,5 @@ export class ProgressService2 implements IProgressService2 {
return promise;
}
}
registerSingleton(IProgressService2, ProgressService2, true);