Address review comments

Author: DonJayamanne

src/vs/workbench/api/browser/mainThreadChatSessions.ts

@@ -419,13 +419,13 @@ export class MainThreadChatSessions extends Disposable implements MainThreadChat
 			}
 		};
 
-		if (originalEditor) {
-			// Prefetch the chat session content to make the subsequent editor swap quick
-			const newSession = await this._chatSessionsService.getOrCreateChatSession(
-				URI.revive(modifiedResource),
-				CancellationToken.None,
-			);
+		// Prefetch the chat session content to make the subsequent editor swap quick
+		const newSession = await this._chatSessionsService.getOrCreateChatSession(
+			URI.revive(modifiedResource),
+			CancellationToken.None,
+		);
 
+		if (originalEditor) {
 			newSession.transferredState = originalEditor instanceof ChatEditorInput
 				? { editingSession: originalEditor.transferOutEditingSession(), inputState: originalModel?.inputModel.toJSON() }
 				: undefined;
@@ -440,17 +440,13 @@ export class MainThreadChatSessions extends Disposable implements MainThreadChat
 			return;
 		}
 
-		{
-			const newSession = await this._chatSessionsService.getOrCreateChatSession(modifiedResource, CancellationToken.None);
-			// If chat editor is in the side panel, then those are not listed as editors.
-			// In that case we need to transfer editing session using the original model.
-			const originalModel = this._chatService.getSession(originalResource);
-			if (originalModel) {
-				newSession.transferredState = {
-					editingSession: originalModel.editingSession,
-					inputState: originalModel.inputModel.toJSON()
-				};
-			}
+		// If chat editor is in the side panel, then those are not listed as editors.
+		// In that case we need to transfer editing session using the original model.
+		if (originalModel) {
+			newSession.transferredState = {
+				editingSession: originalModel.editingSession,
+				inputState: originalModel.inputModel.toJSON()
+			};
 		}
 
 		const chatViewWidget = this._chatWidgetService.getWidgetBySessionResource(originalResource);