Replace the listInstances method with utility functions

Author: nstrayer

src/vs/workbench/contrib/inlineChat/browser/inlineChatNotebook.ts

@@ -17,7 +17,7 @@ import { NotebookTextDiffEditor } from '../../notebook/browser/diff/notebookDiff
 import { NotebookMultiTextDiffEditor } from '../../notebook/browser/diff/notebookMultiDiffEditor.js';
 // --- Start Positron ---
 // Imports to support inline chat in Positron notebooks.
-import { IPositronNotebookService } from '../../positronNotebook/browser/positronNotebookService.js';
+import { getAllPositronNotebookInstances } from '../../positronNotebook/browser/notebookUtils.js';
 // --- End Positron ---
 
 export class InlineChatNotebookContribution {
@@ -28,10 +28,6 @@ export class InlineChatNotebookContribution {
 		@IInlineChatSessionService sessionService: IInlineChatSessionService,
 		@IEditorService editorService: IEditorService,
 		@INotebookEditorService notebookEditorService: INotebookEditorService,
-		// --- Start Positron ---
-		// Imports to support inline chat in Positron notebooks.
-		@IPositronNotebookService positronNotebookService: IPositronNotebookService,
-		// --- End Positron ---
 	) {
 
 		this._store.add(sessionService.registerSessionKeyComputer(Schemas.vscodeNotebookCell, {
@@ -68,7 +64,7 @@ export class InlineChatNotebookContribution {
 				// --- Start Positron ---
 				// To support inline chat in Positron notebooks:
 				// construct a session comparison key from the corresponding notebook
-				for (const positronInstance of positronNotebookService.listInstances(data.notebook)) {
+				for (const positronInstance of getAllPositronNotebookInstances(editorService, data.notebook)) {
 					const candidate = `<positron-notebook>${positronInstance.id}#${uri}`;
 					if (!fallback) {
 						fallback = candidate;
@@ -120,7 +116,7 @@ export class InlineChatNotebookContribution {
 			// --- Start Positron ---
 			// To support inline chat in Positron notebooks:
 			// cancel existing chat sessions when a new one is started.
-			for (const positronInstance of positronNotebookService.listInstances(candidate.notebook)) {
+			for (const positronInstance of getAllPositronNotebookInstances(editorService, candidate.notebook)) {
 				if (positronInstance.hasCodeEditor(newSessionEditor)) {
 					for (const { editor } of positronInstance.cells.get()) {
 						if (editor && editor !== newSessionEditor) {

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

@@ -142,7 +142,7 @@ import { getFormattedNotebookMetadataJSON } from '../common/model/notebookMetada
 import { NotebookOutputEditor } from './outputEditor/notebookOutputEditor.js';
 import { NotebookOutputEditorInput } from './outputEditor/notebookOutputEditorInput.js';
 // --- Start Positron ---
-import { IPositronNotebookService } from '../../positronNotebook/browser/positronNotebookService.js';
+import { hasConnectedNotebookForUri } from '../../positronNotebook/browser/notebookUtils.js';
 // --- End Positron ---
 
 /*--------------------------------------------------------------------------------------------- */
@@ -774,9 +774,6 @@ class NotebookEditorManager implements IWorkbenchContribution {
 	constructor(
 		@IEditorService private readonly _editorService: IEditorService,
 		@INotebookEditorModelResolverService private readonly _notebookEditorModelService: INotebookEditorModelResolverService,
-		// --- Start Positron ---
-		@IPositronNotebookService private readonly _positronNotebookService: IPositronNotebookService,
-		// --- End Positron ---
 		@IEditorGroupsService editorGroups: IEditorGroupsService
 	) {
 		// OPEN notebook editor for models that have turned dirty without being visible in an editor
@@ -808,8 +805,7 @@ class NotebookEditorManager implements IWorkbenchContribution {
 				// --- Start Positron ---
 				// Make sure that we dont try and open the same editor twice if we're using positron
 				// notebooks.
-				const positronInstances = this._positronNotebookService.listInstances(model.resource);
-				if (positronInstances.some(instance => instance.connectedToEditor)) {
+				if (hasConnectedNotebookForUri(this._editorService, model.resource)) {
 					continue;
 				}
 				// --- End Positron ---

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

@@ -3,6 +3,8 @@
  *  Licensed under the Elastic License 2.0. See LICENSE.txt for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { URI } from '../../../../base/common/uri.js';
+import { isEqual } from '../../../../base/common/resources.js';
 import { IEditorService } from '../../../services/editor/common/editorService.js';
 import { IPositronNotebookInstance } from './IPositronNotebookInstance.js';
 import { PositronNotebookEditor } from './PositronNotebookEditor.js';
@@ -26,3 +28,56 @@ export function getActiveNotebook(editorService: IEditorService): IPositronNoteb
 	const activeNotebook = (activeEditorPane as PositronNotebookEditor).notebookInstance;
 	return activeNotebook;
 }
+
+/**
+ * Checks if any notebook instance for a given URI is connected to an editor.
+ *
+ * @param editorService The editor service
+ * @param uri The notebook URI to check
+ * @returns True if any notebook instance for this URI is connected to an editor, false otherwise
+ */
+export function hasConnectedNotebookForUri(
+	editorService: IEditorService,
+	uri: URI
+): boolean {
+	for (const editorPane of editorService.visibleEditorPanes) {
+		if (editorPane.getId() === POSITRON_NOTEBOOK_EDITOR_ID) {
+			const notebookEditor = editorPane as PositronNotebookEditor;
+			const instance = notebookEditor.notebookInstance;
+
+			if (instance && isEqual(instance.uri, uri) && instance.connectedToEditor) {
+				return true;
+			}
+		}
+	}
+	return false;
+}
+
+/**
+ * Retrieves all Positron notebook instances from visible editor panes.
+ *
+ * @param editorService The editor service
+ * @param uri Optional URI to filter instances by
+ * @returns Array of all notebook instances, optionally filtered by URI
+ */
+export function getAllPositronNotebookInstances(
+	editorService: IEditorService,
+	uri?: URI
+): IPositronNotebookInstance[] {
+	const instances: IPositronNotebookInstance[] = [];
+
+	for (const editorPane of editorService.visibleEditorPanes) {
+		if (editorPane.getId() === POSITRON_NOTEBOOK_EDITOR_ID) {
+			const notebookEditor = editorPane as PositronNotebookEditor;
+			const instance = notebookEditor.notebookInstance;
+
+			if (instance) {
+				if (!uri || isEqual(instance.uri, uri)) {
+					instances.push(instance);
+				}
+			}
+		}
+	}
+
+	return instances;
+}

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

@@ -4,13 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { Disposable } from '../../../../base/common/lifecycle.js';
-import { URI } from '../../../../base/common/uri.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
 import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
 import { IPositronNotebookInstance } from './IPositronNotebookInstance.js';
 import { usingPositronNotebooks as utilUsingPositronNotebooks } from '../common/positronNotebookCommon.js';
-import { isEqual } from '../../../../base/common/resources.js';
 
 export const IPositronNotebookService = createDecorator<IPositronNotebookService>('positronNotebookService');
 export interface IPositronNotebookService {
@@ -24,12 +22,6 @@ export interface IPositronNotebookService {
 	 */
 	initialize(): void;
 
-	/**
-	 * Get all notebook instances currently running.
-	 * @param uri The optional notebook URI to filter instances by.
-	 */
-	listInstances(uri?: URI): Array<IPositronNotebookInstance>;
-
 	/**
 	 * Register a new notebook instance.
 	 * @param instance The instance to register.
@@ -76,14 +68,6 @@ class PositronNotebookService extends Disposable implements IPositronNotebookSer
 		// Placeholder.
 	}
 
-	public listInstances(uri?: URI): Array<IPositronNotebookInstance> {
-		let instances = Array.from(this._instanceById.values());
-		if (uri) {
-			instances = instances.filter(instance => isEqual(instance.uri, uri));
-		}
-		return instances;
-	}
-
 	public registerInstance(instance: IPositronNotebookInstance): void {
 		if (!this._instanceById.has(instance.id)) {
 			this._instanceById.set(instance.id, instance);