Merge from vscode c58aaab8a1cc22a7139b761166a0d4f37d41e998 (#7880)

* Merge from vscode c58aaab8a1cc22a7139b761166a0d4f37d41e998

* fix pipelines

* fix strict-null-checks

* add missing files
This commit is contained in:
Anthony Dresser
2019-10-21 22:12:22 -07:00
committed by GitHub
parent 7c9be74970
commit 1e22f47304
913 changed files with 18898 additions and 16536 deletions

View File

@@ -28,6 +28,7 @@ import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editor
import { CommandsRegistry } from 'vs/platform/commands/common/commands';
import { IDimension } from 'vs/platform/layout/browser/layoutService';
import { TERMINAL_COMMAND_ID } from 'vs/workbench/contrib/terminal/common/terminal';
import { assertIsDefined } from 'vs/base/common/types';
// {{SQL CARBON EDIT}}
import { NewNotebookAction } from 'sql/workbench/parts/notebook/browser/notebookActions';
@@ -130,7 +131,7 @@ export class WatermarkContribution extends Disposable implements IWorkbenchContr
}
private create(): void {
const container = this.layoutService.getContainer(Parts.EDITOR_PART);
const container = assertIsDefined(this.layoutService.getContainer(Parts.EDITOR_PART));
container.classList.add('has-watermark');
this.watermark = $('.watermark');
@@ -176,7 +177,9 @@ export class WatermarkContribution extends Disposable implements IWorkbenchContr
this.watermark.remove();
const container = this.layoutService.getContainer(Parts.EDITOR_PART);
container.classList.remove('has-watermark');
if (container) {
container.classList.remove('has-watermark');
}
this.watermarkDisposable.clear();
}