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

@@ -227,7 +227,7 @@ export class Dropdown extends Disposable {
}
private _showList(): void {
if (this._input.isEnabled) {
if (this._input.isEnabled()) {
this._onFocus.fire();
this._filter.filterString = '';
this.contextViewService.showContextView({
@@ -297,7 +297,7 @@ export class Dropdown extends Disposable {
style(style: IListStyles & IInputBoxStyles & IDropdownStyles) {
this._tree.style(style);
this._input.style(style);
this._treeContainer.style.backgroundColor = style.contextBackground ? style.contextBackground.toString() : null;
this._treeContainer.style.backgroundColor = style.contextBackground ? style.contextBackground.toString() : '';
this._treeContainer.style.outline = `1px solid ${style.contextBorder || this._options.contextBorder}`;
}