Remove all uses of the notebook service active instance getter

Author: nstrayer

src/vs/workbench/contrib/positronNotebook/browser/SelectPositronNotebookKernelAction.ts

@@ -11,8 +11,9 @@ import { IQuickInputService, IQuickPickItem } from '../../../../platform/quickin
 import { selectKernelIcon } from '../../notebook/browser/notebookIcons.js';
 import { INotebookKernelService, INotebookKernel } from '../../notebook/common/notebookKernelService.js';
 import { PositronNotebookInstance } from './PositronNotebookInstance.js';
-import { IPositronNotebookService } from './positronNotebookService.js';
 import { POSITRON_RUNTIME_NOTEBOOK_KERNELS_EXTENSION_ID } from '../../runtimeNotebookKernel/common/runtimeNotebookKernelConfig.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { getActiveNotebook } from './notebookUtils.js';
 
 export const SELECT_KERNEL_ID_POSITRON = 'positronNotebook.selectKernel';
 const NOTEBOOK_ACTIONS_CATEGORY_POSITRON = localize2('positronNotebookActions.category', 'Positron Notebook');
@@ -38,8 +39,7 @@ class SelectPositronNotebookKernelAction extends Action2 {
 	async run(accessor: ServicesAccessor, context?: SelectPositronNotebookKernelContext): Promise<boolean> {
 		const { forceDropdown } = context || { forceDropdown: false };
 		const notebookKernelService = accessor.get(INotebookKernelService);
-		const notebookService = accessor.get(IPositronNotebookService);
-		const activeNotebook = notebookService.getActiveInstance();
+		const activeNotebook = getActiveNotebook(accessor.get(IEditorService));
 		const quickInputService = accessor.get(IQuickInputService);
 
 		if (!activeNotebook) {

src/vs/workbench/contrib/positronNotebook/browser/contrib/undoRedo/positronNotebookUndoRedo.ts

@@ -6,18 +6,19 @@
 import { Disposable } from '../../../../../../base/common/lifecycle.js';
 import { WorkbenchPhase, registerWorkbenchContribution2 } from '../../../../../common/contributions.js';
 import { UndoCommand, RedoCommand } from '../../../../../../editor/browser/editorExtensions.js';
-import { IPositronNotebookService } from '../../positronNotebookService.js';
 import { POSITRON_NOTEBOOK_EDITOR_CONTAINER_FOCUSED, POSITRON_NOTEBOOK_CELL_EDITOR_FOCUSED } from '../../ContextKeysManager.js';
 import { IUndoRedoService } from '../../../../../../platform/undoRedo/common/undoRedo.js';
 import { IContextKeyService } from '../../../../../../platform/contextkey/common/contextkey.js';
+import { IEditorService } from '../../../../../services/editor/common/editorService.js';
+import { getActiveNotebook } from '../../notebookUtils.js';
 
 class PositronNotebookUndoRedoContribution extends Disposable {
 
 	static readonly ID = 'workbench.contrib.positronNotebookUndoRedo';
 
 	constructor(
 		@IUndoRedoService private readonly undoRedoService: IUndoRedoService,
-		@IPositronNotebookService private readonly positronNotebookService: IPositronNotebookService,
+		@IEditorService private readonly editorService: IEditorService,
 		@IContextKeyService private readonly contextKeyService: IContextKeyService
 	) {
 		super();
@@ -30,7 +31,7 @@ class PositronNotebookUndoRedoContribution extends Disposable {
 
 	private shouldHandleUndoRedo(): boolean {
 		// Get the active notebook instance to access its scoped context key service
-		const instance = this.positronNotebookService.getActiveInstance();
+		const instance = getActiveNotebook(this.editorService);
 		if (!instance) {
 			return false;
 		}
@@ -61,7 +62,7 @@ class PositronNotebookUndoRedoContribution extends Disposable {
 			return false;
 		}
 
-		const instance = this.positronNotebookService.getActiveInstance();
+		const instance = getActiveNotebook(this.editorService);
 		if (!instance) {
 			return false;
 		}
@@ -79,7 +80,7 @@ class PositronNotebookUndoRedoContribution extends Disposable {
 			return false;
 		}
 
-		const instance = this.positronNotebookService.getActiveInstance();
+		const instance = getActiveNotebook(this.editorService);
 		if (!instance) {
 			return false;
 		}

src/vs/workbench/contrib/positronNotebook/browser/positronNotebookService.ts

@@ -30,11 +30,6 @@ export interface IPositronNotebookService {
 	 */
 	listInstances(uri?: URI): Array<IPositronNotebookInstance>;
 
-	/**
-	 * Get the currently active notebook instance, if it exists.
-	 */
-	getActiveInstance(): IPositronNotebookInstance | null;
-
 	/**
 	 * Register a new notebook instance.
 	 * @param instance The instance to register.
@@ -68,7 +63,6 @@ class PositronNotebookService extends Disposable implements IPositronNotebookSer
 	constructor(
 		@IConfigurationService private readonly _configurationService: IConfigurationService
 	) {
-		// Call the disposable constrcutor.
 		super();
 	}
 
@@ -90,10 +84,6 @@ class PositronNotebookService extends Disposable implements IPositronNotebookSer
 		return instances;
 	}
 
-	public getActiveInstance(): IPositronNotebookInstance | null {
-		return this._activeInstance;
-	}
-
 	public registerInstance(instance: IPositronNotebookInstance): void {
 		if (!this._instanceById.has(instance.id)) {
 			this._instanceById.set(instance.id, instance);