fix cycling dependency, more rich cell-options

src/vs/workbench/contrib/notebook/browser/notebook.contribution.ts

@@ -13,8 +13,8 @@ import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { EditorDescriptor, Extensions as EditorExtensions, IEditorRegistry } from 'vs/workbench/browser/editor';
 import { Extensions as WorkbenchExtensions, IWorkbenchContribution, IWorkbenchContributionsRegistry } from 'vs/workbench/common/contributions';
-import { IEditorInput, IEditorInputFactoryRegistry, Extensions as EditorInputExtensions, IEditorInputFactory, EditorInput, EditorOptions } from 'vs/workbench/common/editor';
-import { NotebookEditor } from 'vs/workbench/contrib/notebook/browser/notebookEditor';
+import { IEditorInput, IEditorInputFactoryRegistry, Extensions as EditorInputExtensions, IEditorInputFactory, EditorInput } from 'vs/workbench/common/editor';
+import { NotebookEditor, NotebookEditorOptions } from 'vs/workbench/contrib/notebook/browser/notebookEditor';
 import { NotebookEditorInput } from 'vs/workbench/contrib/notebook/browser/notebookEditorInput';
 import { INotebookService, NotebookService } from 'vs/workbench/contrib/notebook/browser/notebookService';
 import { IEditorGroup } from 'vs/workbench/services/editor/common/editorGroupsService';
@@ -86,21 +86,6 @@ Registry.as<IEditorInputFactoryRegistry>(EditorInputExtensions.EditorInputFactor
 	}
 );
 
-export class NotebookEditorOptions extends EditorOptions {
-
-	readonly cellUri?: URI;
-
-	constructor(options: IEditorOptions & { cellUri?: URI | undefined }) {
-		super();
-		this.overwrite(options);
-		this.cellUri = options.cellUri;
-	}
-
-	with(options: Partial<NotebookEditorOptions>): NotebookEditorOptions {
-		return new NotebookEditorOptions({ ...this, ...options });
-	}
-}
-
 export class NotebookContribution implements IWorkbenchContribution {
 	private _resourceMapping = new ResourceMap<NotebookEditorInput>();
 
@@ -132,7 +117,7 @@ export class NotebookContribution implements IWorkbenchContribution {
 			const name = basename(data.notebook);
 			const input = this.instantiationService.createInstance(NotebookEditorInput, data.notebook, name, data.viewType);
 			this._resourceMapping.set(resource, input);
-			return { override: this.editorService.openEditor(input, new NotebookEditorOptions({ ...options, forceReload: true, cellUri: resource }), group) };
+			return { override: this.editorService.openEditor(input, new NotebookEditorOptions({ ...options, forceReload: true, cellOptions: { resource, options } }), group) };
 		}
 
 		const notebookProviders = this.notebookService.getContributedNotebookProviders(resource);

src/vs/workbench/contrib/notebook/browser/notebookEditor.ts

@@ -40,13 +40,27 @@ import { NotebookFindWidget } from 'vs/workbench/contrib/notebook/browser/contri
 import { NotebookViewModel, INotebookEditorViewState, IModelDecorationsChangeAccessor } from 'vs/workbench/contrib/notebook/browser/viewModel/notebookViewModel';
 import { IEditorGroupView } from 'vs/workbench/browser/parts/editor/editor';
 import { CellViewModel } from 'vs/workbench/contrib/notebook/browser/viewModel/notebookCellViewModel';
-import { NotebookEditorOptions } from 'vs/workbench/contrib/notebook/browser/notebook.contribution';
 
 const $ = DOM.$;
 const NOTEBOOK_EDITOR_VIEW_STATE_PREFERENCE_KEY = 'NotebookEditorViewState';
 
 export const NOTEBOOK_EDITOR_FOCUSED = new RawContextKey<boolean>('notebookEditorFocused', false);
 
+export class NotebookEditorOptions extends EditorOptions {
+
+	readonly cellOptions?: IResourceEditorInput;
+
+	constructor(options: Partial<NotebookEditorOptions>) {
+		super();
+		this.overwrite(options);
+		this.cellOptions = options.cellOptions;
+	}
+
+	with(options: Partial<NotebookEditorOptions>): NotebookEditorOptions {
+		return new NotebookEditorOptions({ ...this, ...options });
+	}
+}
+
 export class NotebookCodeEditors implements ICompositeCodeEditor {
 
 	private readonly _disposables = new DisposableStore();
@@ -300,8 +314,8 @@ export class NotebookEditor extends BaseEditor implements INotebookEditor, Noteb
 		}
 
 		if (options instanceof NotebookEditorOptions) {
-			if (options.cellUri) {
-				this.control?.activate({ resource: options.cellUri });
+			if (options.cellOptions) {
+				this.control?.activate(options.cellOptions);
 			}
 		}
 	}