Merge from vscode 52dcb723a39ae75bee1bd56b3312d7fcdc87aeed (#6719)

This commit is contained in:
Anthony Dresser
2019-08-12 21:31:51 -07:00
committed by GitHub
parent 00250839fc
commit 7eba8c4c03
616 changed files with 9472 additions and 7087 deletions

View File

@@ -60,7 +60,7 @@ class CodeLensContentWidget implements editorBrowser.IContentWidget {
private readonly _editor: editorBrowser.ICodeEditor;
private readonly _commands = new Map<string, Command>();
private _widgetPosition: editorBrowser.IContentWidgetPosition;
private _widgetPosition?: editorBrowser.IContentWidgetPosition;
constructor(
editor: editorBrowser.ICodeEditor,
@@ -147,8 +147,8 @@ class CodeLensContentWidget implements editorBrowser.IContentWidget {
};
}
getPosition(): editorBrowser.IContentWidgetPosition {
return this._widgetPosition;
getPosition(): editorBrowser.IContentWidgetPosition | null {
return this._widgetPosition || null;
}
isVisible(): boolean {
@@ -192,9 +192,9 @@ export class CodeLensHelper {
export class CodeLensWidget {
private readonly _editor: editorBrowser.ICodeEditor;
private readonly _viewZone: CodeLensViewZone;
private readonly _viewZoneId: number;
private readonly _contentWidget: CodeLensContentWidget;
private readonly _viewZone!: CodeLensViewZone;
private readonly _viewZoneId!: number;
private readonly _contentWidget!: CodeLensContentWidget;
private _decorationIds: string[];
private _data: CodeLensItem[];