Merge from vscode e3c4990c67c40213af168300d1cfeb71d680f877 (#16569)

This commit is contained in:
Cory Rivera
2021-08-25 16:28:29 -07:00
committed by GitHub
parent ab1112bfb3
commit cb7b7da0a4
1752 changed files with 59525 additions and 33878 deletions

View File

@@ -11,7 +11,6 @@ import { MainThreadModelViewShape } from 'sql/workbench/api/common/sqlExtHost.pr
import { IMainContext } from 'vs/workbench/api/common/extHost.protocol';
import { IComponentShape, IItemConfig, ComponentEventType, IComponentEventArgs, ModelComponentTypes, DeclarativeDataType } from 'sql/workbench/api/common/sqlExtHostTypes';
import { TitledFormItemLayout } from 'sql/workbench/browser/modelComponents/formContainer.component';
import { assign } from 'vs/base/common/objects';
interface InternalItemConfig {
toIItemConfig(): IItemConfig;
@@ -178,7 +177,7 @@ suite('ExtHostModelView Validation Tests', () => {
topLevelInputFormComponent,
{
components: [
assign(groupInputFormComponent, { layout: groupInputLayout }),
Object.assign(groupInputFormComponent, { layout: groupInputLayout }),
groupDropdownFormComponent
],
title: groupTitle

View File

@@ -30,7 +30,7 @@ suite('MainThreadNotebook Tests', () => {
let providerId = 'TestProvider';
setup(() => {
mockProxy = TypeMoq.Mock.ofType(ExtHostNotebookStub);
mockProxy = TypeMoq.Mock.ofType<ExtHostNotebookShape>(ExtHostNotebookStub);
let extContext = <IExtHostContext>{
getProxy: proxyType => mockProxy.object
};