Merge from vscode 10492ba146318412cbee8b76a8c630f226914734

src/vs/workbench/common/component.ts

@@ -8,6 +8,7 @@ import { IThemeService, Themable } from 'vs/platform/theme/common/themeService';
 import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
 
 export class Component extends Themable {
+
 	private readonly memento: Memento;
 
 	constructor(

src/vs/workbench/common/editor.ts

@@ -5,7 +5,6 @@
 
 import { localize } from 'vs/nls';
 import { Event, Emitter } from 'vs/base/common/event';
-import { assign } from 'vs/base/common/objects';
 import { withNullAsUndefined, assertIsDefined } from 'vs/base/common/types';
 import { URI } from 'vs/base/common/uri';
 import { IDisposable, Disposable, toDisposable } from 'vs/base/common/lifecycle';
@@ -890,7 +889,7 @@ export class SideBySideEditorInput extends EditorInput {
 	getTelemetryDescriptor(): { [key: string]: unknown } {
 		const descriptor = this.master.getTelemetryDescriptor();
 
-		return assign(descriptor, super.getTelemetryDescriptor());
+		return Object.assign(descriptor, super.getTelemetryDescriptor());
 	}
 
 	private registerListeners(): void {

src/vs/workbench/common/memento.ts

@@ -61,6 +61,7 @@ export class Memento {
 }
 
 class ScopedMemento {
+
 	private readonly mementoObj: MementoObject;
 
 	constructor(private id: string, private scope: StorageScope, private storageService: IStorageService) {