Fix microsoft#187447. Avoid npe for reading notebook pane (microsoft#187491)

rebornix · web-flow · commit 7dbc6ecb9311 · 2023-07-10T20:11:13.000+02:00
diff --git a/src/vs/workbench/contrib/notebook/browser/notebookBrowser.ts b/src/vs/workbench/contrib/notebook/browser/notebookBrowser.ts
@@ -806,7 +806,7 @@ export function getNotebookEditorFromEditorPane(editorPane?: IEditorPane): INote
 	const input = editorPane.input;
 
 	if (input && isCompositeNotebookEditorInput(input)) {
-		return (editorPane.getControl() as { notebookEditor: INotebookEditor | undefined }).notebookEditor;
+		return (editorPane.getControl() as { notebookEditor: INotebookEditor | undefined } | undefined)?.notebookEditor;
 	}
 
 	return undefined;

Original file line number	Diff line number	Diff line change
`@@ -806,7 +806,7 @@ export function getNotebookEditorFromEditorPane(editorPane?: IEditorPane): INote`
`806`	`806`	`const input = editorPane.input;`
`807`	`807`
`808`	`808`	`if (input && isCompositeNotebookEditorInput(input)) {`
`809`		`- return (editorPane.getControl() as { notebookEditor: INotebookEditor \| undefined }).notebookEditor;`
	`809`	`+ return (editorPane.getControl() as { notebookEditor: INotebookEditor \| undefined } \| undefined)?.notebookEditor;`
`810`	`810`	`}`
`811`	`811`
`812`	`812`	`return undefined;`