ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-09 17:52:34 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge VS Code 1.31.1 (#4283)

Browse Source
This commit is contained in:
Matt Irvine
2019-03-15 13:09:45 -07:00
committed by GitHub
parent 7d31575149
commit 86bac90001
1716 changed files with 53308 additions and 48375 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/vs/workbench/test/browser/part.test.ts
View File

@@ -19,12 +19,12 @@ class MyPart extends Part {
createTitleArea(parent: HTMLElement): HTMLElement {
assert.strictEqual(parent, this.expectedParent);
return super.createTitleArea(parent);
return super.createTitleArea(parent)!;
}
createContentArea(parent: HTMLElement): HTMLElement {
assert.strictEqual(parent, this.expectedParent);
return super.createContentArea(parent);
return super.createContentArea(parent)!;
}
getMemento(scope: StorageScope) {
@@ -68,7 +68,7 @@ class MyPart3 extends Part {
}
createTitleArea(parent: HTMLElement): HTMLElement {
return null;
return null!;
}
createContentArea(parent: HTMLElement): HTMLElement {
@@ -97,7 +97,7 @@ suite('Workbench parts', () => {
test('Creation', () => {
let b = document.createElement('div');
document.getElementById(fixtureId).appendChild(b);
document.getElementById(fixtureId)!.appendChild(b);
hide(b);
let part = new MyPart(b);
@@ -134,7 +134,7 @@ suite('Workbench parts', () => {
test('Part Layout with Title and Content', function () {
let b = document.createElement('div');
document.getElementById(fixtureId).appendChild(b);
document.getElementById(fixtureId)!.appendChild(b);
hide(b);
let part = new MyPart2();
@@ -146,7 +146,7 @@ suite('Workbench parts', () => {
test('Part Layout with Content only', function () {
let b = document.createElement('div');
document.getElementById(fixtureId).appendChild(b);
document.getElementById(fixtureId)!.appendChild(b);
hide(b);
let part = new MyPart3();

2
src/vs/workbench/test/browser/parts/editor/baseEditor.test.ts
View File

@@ -267,7 +267,7 @@ suite('Workbench base editor', () => {
super();
}
public getTypeId() { return 'testEditorInput'; }
public resolve(): Thenable<IEditorModel> { return Promise.resolve(null); }
public resolve(): Promise<IEditorModel> { return Promise.resolve(null!); }
public matches(other: TestEditorInput): boolean {
return other && this.id === other.id && other instanceof TestEditorInput;

2
src/vs/workbench/test/browser/parts/editor/rangeDecorations.test.ts
View File

@@ -40,7 +40,7 @@ suite('Editor - Range decorations', () => {
model = aModel(URI.file('some_file'));
codeEditor = createTestCodeEditor({ model: model });
instantiationService.stub(IEditorService, 'activeEditor', { getResource: () => { return codeEditor.getModel().uri; } });
instantiationService.stub(IEditorService, 'activeEditor', { getResource: () => { return codeEditor.getModel()!.uri; } });
instantiationService.stub(IEditorService, 'activeTextEditorWidget', codeEditor);
testObject = instantiationService.createInstance(RangeHighlightDecorations);

46
src/vs/workbench/test/browser/parts/views/views.test.ts
View File

@@ -46,7 +46,7 @@ suite('ContributableViewsModel', () => {
});
teardown(() => {
ViewsRegistry.deregisterViews(ViewsRegistry.getViews(container).map(({ id }) => id), container);
ViewsRegistry.deregisterViews(ViewsRegistry.getViews(container), container);
});
test('empty model', function () {
@@ -64,18 +64,17 @@ suite('ContributableViewsModel', () => {
const viewDescriptor: IViewDescriptor = {
id: 'view1',
ctor: null,
container,
name: 'Test View 1'
};
ViewsRegistry.registerViews([viewDescriptor]);
ViewsRegistry.registerViews([viewDescriptor], container);
assert.equal(model.visibleViewDescriptors.length, 1);
assert.equal(seq.elements.length, 1);
assert.deepEqual(model.visibleViewDescriptors[0], viewDescriptor);
assert.deepEqual(seq.elements[0], viewDescriptor);
ViewsRegistry.deregisterViews(['view1'], container);
ViewsRegistry.deregisterViews([viewDescriptor], container);
assert.equal(model.visibleViewDescriptors.length, 0);
assert.equal(seq.elements.length, 0);
@@ -91,12 +90,11 @@ suite('ContributableViewsModel', () => {
const viewDescriptor: IViewDescriptor = {
id: 'view1',
ctor: null,
container,
name: 'Test View 1',
when: ContextKeyExpr.equals('showview1', true)
};
ViewsRegistry.registerViews([viewDescriptor]);
ViewsRegistry.registerViews([viewDescriptor], container);
assert.equal(model.visibleViewDescriptors.length, 0, 'view should not appear since context isnt in');
assert.equal(seq.elements.length, 0);
@@ -116,7 +114,7 @@ suite('ContributableViewsModel', () => {
assert.equal(model.visibleViewDescriptors.length, 0, 'view should disappear');
assert.equal(seq.elements.length, 0);
ViewsRegistry.deregisterViews(['view1'], container);
ViewsRegistry.deregisterViews([viewDescriptor], container);
assert.equal(model.visibleViewDescriptors.length, 0, 'view should not be there anymore');
assert.equal(seq.elements.length, 0);
@@ -130,10 +128,10 @@ suite('ContributableViewsModel', () => {
const model = new ContributableViewsModel(container, viewsService);
const seq = new ViewDescriptorSequence(model);
const view1: IViewDescriptor = { id: 'view1', ctor: null, container, name: 'Test View 1' };
const view2: IViewDescriptor = { id: 'view2', ctor: null, container, name: 'Test View 2', when: ContextKeyExpr.equals('showview2', true) };
const view1: IViewDescriptor = { id: 'view1', ctor: null, name: 'Test View 1' };
const view2: IViewDescriptor = { id: 'view2', ctor: null, name: 'Test View 2', when: ContextKeyExpr.equals('showview2', true) };
ViewsRegistry.registerViews([view1, view2]);
ViewsRegistry.registerViews([view1, view2], container);
assert.deepEqual(model.visibleViewDescriptors, [view1], 'only view1 should be visible');
assert.deepEqual(seq.elements, [view1], 'only view1 should be visible');
@@ -146,17 +144,17 @@ suite('ContributableViewsModel', () => {
assert.deepEqual(model.visibleViewDescriptors, [view1, view2], 'both views should be visible');
assert.deepEqual(seq.elements, [view1, view2], 'both views should be visible');
ViewsRegistry.deregisterViews([view1.id, view2.id], container);
ViewsRegistry.deregisterViews([view1, view2], container);
});
test('when contexts - multiple 2', async function () {
const model = new ContributableViewsModel(container, viewsService);
const seq = new ViewDescriptorSequence(model);
const view1: IViewDescriptor = { id: 'view1', ctor: null, container, name: 'Test View 1', when: ContextKeyExpr.equals('showview1', true) };
const view2: IViewDescriptor = { id: 'view2', ctor: null, container, name: 'Test View 2' };
const view1: IViewDescriptor = { id: 'view1', ctor: null, name: 'Test View 1', when: ContextKeyExpr.equals('showview1', true) };
const view2: IViewDescriptor = { id: 'view2', ctor: null, name: 'Test View 2' };
ViewsRegistry.registerViews([view1, view2]);
ViewsRegistry.registerViews([view1, view2], container);
assert.deepEqual(model.visibleViewDescriptors, [view2], 'only view2 should be visible');
assert.deepEqual(seq.elements, [view2], 'only view2 should be visible');
@@ -169,18 +167,18 @@ suite('ContributableViewsModel', () => {
assert.deepEqual(model.visibleViewDescriptors, [view1, view2], 'both views should be visible');
assert.deepEqual(seq.elements, [view1, view2], 'both views should be visible');
ViewsRegistry.deregisterViews([view1.id, view2.id], container);
ViewsRegistry.deregisterViews([view1, view2], container);
});
test('setVisible', () => {
const model = new ContributableViewsModel(container, viewsService);
const seq = new ViewDescriptorSequence(model);
const view1: IViewDescriptor = { id: 'view1', ctor: null, container, name: 'Test View 1', canToggleVisibility: true };
const view2: IViewDescriptor = { id: 'view2', ctor: null, container, name: 'Test View 2', canToggleVisibility: true };
const view3: IViewDescriptor = { id: 'view3', ctor: null, container, name: 'Test View 3', canToggleVisibility: true };
const view1: IViewDescriptor = { id: 'view1', ctor: null, name: 'Test View 1', canToggleVisibility: true };
const view2: IViewDescriptor = { id: 'view2', ctor: null, name: 'Test View 2', canToggleVisibility: true };
const view3: IViewDescriptor = { id: 'view3', ctor: null, name: 'Test View 3', canToggleVisibility: true };
ViewsRegistry.registerViews([view1, view2, view3]);
ViewsRegistry.registerViews([view1, view2, view3], container);
assert.deepEqual(model.visibleViewDescriptors, [view1, view2, view3]);
assert.deepEqual(seq.elements, [view1, view2, view3]);
@@ -212,7 +210,7 @@ suite('ContributableViewsModel', () => {
assert.deepEqual(model.visibleViewDescriptors, [view1, view2, view3], 'view2 should show');
assert.deepEqual(seq.elements, [view1, view2, view3]);
ViewsRegistry.deregisterViews([view1.id, view2.id, view3.id], container);
ViewsRegistry.deregisterViews([view1, view2, view3], container);
assert.deepEqual(model.visibleViewDescriptors, []);
assert.deepEqual(seq.elements, []);
});
@@ -221,11 +219,11 @@ suite('ContributableViewsModel', () => {
const model = new ContributableViewsModel(container, viewsService);
const seq = new ViewDescriptorSequence(model);
const view1: IViewDescriptor = { id: 'view1', ctor: null, container, name: 'Test View 1' };
const view2: IViewDescriptor = { id: 'view2', ctor: null, container, name: 'Test View 2' };
const view3: IViewDescriptor = { id: 'view3', ctor: null, container, name: 'Test View 3' };
const view1: IViewDescriptor = { id: 'view1', ctor: null, name: 'Test View 1' };
const view2: IViewDescriptor = { id: 'view2', ctor: null, name: 'Test View 2' };
const view3: IViewDescriptor = { id: 'view3', ctor: null, name: 'Test View 3' };
ViewsRegistry.registerViews([view1, view2, view3]);
ViewsRegistry.registerViews([view1, view2, view3], container);
assert.deepEqual(model.visibleViewDescriptors, [view1, view2, view3], 'model views should be OK');
assert.deepEqual(seq.elements, [view1, view2, view3], 'sql views should be OK');

14
src/vs/workbench/test/browser/quickopen.test.ts
View File

@@ -13,9 +13,9 @@ import { QuickOpenHandlerDescriptor, IQuickOpenRegistry, Extensions as QuickOpen
export class TestQuickOpenService implements IQuickOpenService {
public _serviceBrand: any;
private callback: (prefix: string) => void;
private callback?: (prefix?: string) => void;
constructor(callback?: (prefix: string) => void) {
constructor(callback?: (prefix?: string) => void) {
this.callback = callback;
}
@@ -28,7 +28,7 @@ export class TestQuickOpenService implements IQuickOpenService {
close(): void {
}
show(prefix?: string, options?: any): Thenable<void> {
show(prefix?: string, options?: any): Promise<void> {
if (this.callback) {
this.callback(prefix);
}
@@ -37,11 +37,11 @@ export class TestQuickOpenService implements IQuickOpenService {
}
get onShow(): Event<void> {
return null;
return null!;
}
get onHide(): Event<void> {
return null;
return null!;
}
public dispose() { }
@@ -59,7 +59,7 @@ suite('QuickOpen', () => {
'testhandler',
',',
'Handler',
null
null!
);
registry.registerQuickOpenHandler(handler);
@@ -71,7 +71,7 @@ suite('QuickOpen', () => {
});
test('QuickOpen Action', () => {
let defaultAction = new QuickOpenAction('id', 'label', void 0, new TestQuickOpenService((prefix: string) => assert(!prefix)));
let defaultAction = new QuickOpenAction('id', 'label', (undefined)!, new TestQuickOpenService((prefix: string) => assert(!prefix)));
let prefixAction = new QuickOpenAction('id', 'label', ',', new TestQuickOpenService((prefix: string) => assert(!!prefix)));
defaultAction.run();

2
src/vs/workbench/test/browser/viewlet.test.ts
View File

@@ -13,7 +13,7 @@ suite('Viewlets', () => {
class TestViewlet extends Viewlet {
constructor() {
super('id', null, null, null, null, null);
super('id', null!, null!, null!, null!, null!);
}
public layout(dimension: any): void {