Merge from vscode a348d103d1256a06a2c9b3f9b406298a9fef6898 (#15681)

* Merge from vscode a348d103d1256a06a2c9b3f9b406298a9fef6898

* Fixes and cleanup

* Distro

* Fix hygiene yarn

* delete no yarn lock changes file

* Fix hygiene

* Fix layer check

* Fix CI

* Skip lib checks

* Remove tests deleted in vs code

* Fix tests

* Distro

* Fix tests and add removed extension point

* Skip failing notebook tests for now

* Disable broken tests and cleanup build folder

* Update yarn.lock and fix smoke tests

* Bump sqlite

* fix contributed actions and file spacing

* Fix user data path

* Update yarn.locks

Co-authored-by: ADS Merger <karlb@microsoft.com>
This commit is contained in:
Charles Gagnon
2021-06-17 08:17:11 -07:00
committed by GitHub
parent fdcb97c7f7
commit 3cb2f552a6
2582 changed files with 124827 additions and 87099 deletions

View File

@@ -136,11 +136,11 @@ class MockEditorService extends TestEditorService {
super();
}
activeEditorPane: IVisibleEditorPane = <any>{
override activeEditorPane: IVisibleEditorPane = <any>{
group: {}
};
get activeTextEditorControl(): ICodeEditor {
override get activeTextEditorControl(): ICodeEditor {
return {
getModel: () => {
return <any>{
@@ -153,11 +153,11 @@ class MockEditorService extends TestEditorService {
} as any;
}
openEditor(_editor: any, _options?: any, _group?: any): Promise<any> {
override openEditor(_editor: any, _options?: any, _group?: any): Promise<any> {
return Promise.resolve(_editor);
}
createEditorInput(_input: IUntitledTextResourceEditorInput): EditorInput {
override createEditorInput(_input: IUntitledTextResourceEditorInput): EditorInput {
const accessor = this.instantiationService.createInstance(ServiceAccessor);
const service = accessor.untitledTextEditorService;
return this.instantiationService.createInstance(UntitledTextEditorInput, service.create());