ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-03-27 07:10:30 -04: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);

79
src/vs/workbench/services/progress/test/progressService.test.ts
View File

@@ -6,88 +6,11 @@
import * as assert from 'assert';
import { IAction, IActionItem } from 'vs/base/common/actions';
import { IEditorControl } from 'vs/workbench/common/editor';
import { Viewlet, ViewletDescriptor } from 'vs/workbench/browser/viewlet';
import { IPanel } from 'vs/workbench/common/panel';
import { ScopedProgressService, ScopedService } from 'vs/workbench/services/progress/browser/progressService';
import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
import { IPanelService } from 'vs/workbench/services/panel/common/panelService';
import { IViewlet } from 'vs/workbench/common/viewlet';
import { Emitter } from 'vs/base/common/event';
let activeViewlet: Viewlet = {} as any;
class TestViewletService implements IViewletService {
public _serviceBrand: any;
onDidViewletRegisterEmitter = new Emitter<ViewletDescriptor>();
onDidViewletDeregisterEmitter = new Emitter<ViewletDescriptor>();
onDidViewletOpenEmitter = new Emitter<IViewlet>();
onDidViewletCloseEmitter = new Emitter<IViewlet>();
onDidViewletRegister = this.onDidViewletRegisterEmitter.event;
onDidViewletDeregister = this.onDidViewletDeregisterEmitter.event;
onDidViewletOpen = this.onDidViewletOpenEmitter.event;
onDidViewletClose = this.onDidViewletCloseEmitter.event;
public openViewlet(id: string, focus?: boolean): Promise<IViewlet> {
return Promise.resolve(null!);
}
public getViewlets(): ViewletDescriptor[] {
return [];
}
public getAllViewlets(): ViewletDescriptor[] {
return [];
}
public getActiveViewlet(): IViewlet {
return activeViewlet;
}
public dispose() {
}
public getDefaultViewletId(): string {
return 'workbench.view.explorer';
}
public getViewlet(id: string): ViewletDescriptor {
return null!;
}
public getProgressIndicator(id: string) {
return null!;
}
}
class TestPanelService implements IPanelService {
public _serviceBrand: any;
onDidPanelOpen = new Emitter<{ panel: IPanel, focus: boolean }>().event;
onDidPanelClose = new Emitter<IPanel>().event;
public openPanel(id: string, focus?: boolean): IPanel {
return null!;
}
public getPanels(): any[] {
return [];
}
public getPinnedPanels(): any[] {
return [];
}
public getActivePanel(): IViewlet {
return activeViewlet;
}
public setPanelEnablement(id: string, enabled: boolean): void { }
public dispose() {
}
}
import { TestViewletService, TestPanelService } from 'vs/workbench/test/workbenchTestServices';
class TestViewlet implements IViewlet {