Merge pull request #246021 from eleanorjboyd/fond-minnow

Fix regression with open cell output in editor

Author: eleanorjboyd

src/vs/workbench/browser/labels.ts

@@ -492,31 +492,33 @@ class ResourceLabelWidget extends IconLabel {
 		if (!options.forceLabel && !isSideBySideEditor && resource?.scheme === Schemas.vscodeNotebookCellOutput) {
 			const notebookDocument = this.notebookDocumentService.getNotebook(resource);
 			const outputUriData = extractCellOutputDetails(resource);
-			if (!outputUriData?.notebook || !outputUriData.cellFragment) {
-				return;
-			}
-			const cellUri = outputUriData.notebook.with({
-				scheme: Schemas.vscodeNotebookCell,
-				fragment: outputUriData.cellFragment
-			});
-			const cellIndex = notebookDocument?.getCellIndex(cellUri);
-			const outputIndex = outputUriData.outputIndex;
-
-			if (cellIndex !== undefined && outputIndex !== undefined && typeof label.name === 'string') {
-				label.name = localize(
-					'notebookCellOutputLabel',
-					"{0} • Cell {1} • Output {2}",
-					label.name,
-					`${cellIndex + 1}`,
-					`${outputIndex + 1}`
-				);
-			} else if (cellIndex !== undefined && typeof label.name === 'string') {
-				label.name = localize(
-					'notebookCellOutputLabelSimple',
-					"{0} • Cell {1} • Output",
-					label.name,
-					`${cellIndex + 1}`
-				);
+			if (outputUriData?.cellFragment) {
+				if (!outputUriData.notebook) {
+					return;
+				}
+				const cellUri = outputUriData.notebook.with({
+					scheme: Schemas.vscodeNotebookCell,
+					fragment: outputUriData.cellFragment
+				});
+				const cellIndex = notebookDocument?.getCellIndex(cellUri);
+				const outputIndex = outputUriData.outputIndex;
+
+				if (cellIndex !== undefined && outputIndex !== undefined && typeof label.name === 'string') {
+					label.name = localize(
+						'notebookCellOutputLabel',
+						"{0} • Cell {1} • Output {2}",
+						label.name,
+						`${cellIndex + 1}`,
+						`${outputIndex + 1}`
+					);
+				} else if (cellIndex !== undefined && typeof label.name === 'string') {
+					label.name = localize(
+						'notebookCellOutputLabelSimple',
+						"{0} • Cell {1} • Output",
+						label.name,
+						`${cellIndex + 1}`
+					);
+				}
 			}
 		}
 

src/vs/workbench/services/notebook/common/notebookDocumentService.ts

@@ -79,17 +79,18 @@ export function extractCellOutputDetails(uri: URI): { notebook: URI; openIn: str
 	const outputId = params.get('outputId') ?? undefined;
 	const parsedCell = parse(uri.with({ scheme: Schemas.vscodeNotebookCell, query: null }));
 	const outputIndex = params.get('outputIndex') ? parseInt(params.get('outputIndex') || '', 10) : undefined;
-
-	if (parsedCell?.notebook === undefined || parsedCell?.handle === undefined) {
-		throw new Error('Invalid cell URI');
-	}
+	const notebookUri = parsedCell ? parsedCell.notebook : uri.with({
+		scheme: params.get('notebookScheme') || Schemas.file,
+		fragment: null,
+		query: null,
+	});
 
 	return {
-		notebook: parsedCell.notebook,
+		notebook: notebookUri,
 		openIn: openIn,
 		outputId: outputId,
 		outputIndex: outputIndex,
-		cellHandle: parsedCell.handle,
+		cellHandle: parsedCell?.handle,
 		cellFragment: uri.fragment,
 	};
 }