maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

set controller first.

Browse source
This commit is contained in:
rebornix 2021-06-24 18:46:58 -07:00
parent 1750b2b231
commit 49e1f99198
1 changed files with 8 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/vs/workbench/contrib/interactive/browser/interactive.contribution.ts
View file

@ -278,23 +278,17 @@ registerAction2(class extends Action2 {
counter++;
} while (existingNotebookDocument.has(notebookUri.toString()));
const editorInput = InteractiveEditorInput.create(accessor.get(IInstantiationService), notebookUri, inputUri);
historyService.clearHistory(notebookUri);
const interactiveEditorPane = await editorService.openEditor(editorInput, undefined, group);
const notebookEditor = (interactiveEditorPane?.getControl() as { notebookEditor: NotebookEditorWidget | undefined })?.notebookEditor;
if (notebookEditor) {
// should be true
if (id && notebookEditor.activeKernel?.id !== id && notebookEditor.textModel) {
// we should select the kernel
const allKernels = kernelService.getMatchingKernel(notebookEditor.textModel).all;
const preferredKernel = allKernels.find(kernel => kernel.id === id);
if (preferredKernel) {
kernelService.selectKernelForNotebook(preferredKernel, notebookEditor.textModel);
}
if (id) {
const allKernels = kernelService.getMatchingKernel({ uri: notebookUri, viewType: 'interactive' }).all;
const preferredKernel = allKernels.find(kernel => kernel.id === id);
if (preferredKernel) {
kernelService.selectKernelForNotebook(preferredKernel, { uri: notebookUri, viewType: 'interactive' });
}
}
const editorInput = InteractiveEditorInput.create(accessor.get(IInstantiationService), notebookUri, inputUri);
historyService.clearHistory(notebookUri);
await editorService.openEditor(editorInput, undefined, group);
// Extensions must retain references to these URIs to manipulate the interactive editor
return { notebookUri, inputUri };
}