Merge from vscode 817eb6b0c720a4ecbc13c020afbbebfed667aa09 (#7356)

This commit is contained in:
Anthony Dresser
2019-09-24 21:36:17 -07:00
committed by GitHub
parent a29ae4d3b9
commit 6a6048d40f
541 changed files with 7045 additions and 7287 deletions

View File

@@ -57,8 +57,8 @@ export namespace PeekContext {
export const notInPeekEditor: ContextKeyExpr = inPeekEditor.toNegated();
}
export function getOuterEditor(accessor: ServicesAccessor): ICodeEditor | null {
let editor = accessor.get(ICodeEditorService).getFocusedCodeEditor();
export function getOuterEditor(accessor: ServicesAccessor): ICodeEditor | undefined {
const editor = accessor.get(ICodeEditorService).getFocusedCodeEditor();
if (editor instanceof EmbeddedCodeEditorWidget) {
return editor.getParentEditor();
}
@@ -83,7 +83,7 @@ export abstract class PeekViewWidget extends ZoneWidget {
public _serviceBrand: undefined;
private _onDidClose = new Emitter<PeekViewWidget>();
private readonly _onDidClose = new Emitter<PeekViewWidget>();
protected _headElement?: HTMLDivElement;
protected _primaryHeading?: HTMLElement;