Activate inline chat on empty code cell other than inserting new cell (microsoft#211301)

Author: rebornix

src/vs/workbench/contrib/notebook/browser/controller/chat/cellChatActions.ts

@@ -365,21 +365,24 @@ registerAction2(class extends NotebookAction {
 interface IInsertCellWithChatArgs extends INotebookActionContext {
 	input?: string;
 	autoSend?: boolean;
+	source?: string;
 }
 
-async function startChat(accessor: ServicesAccessor, context: INotebookActionContext, index: number, input?: string, autoSend?: boolean) {
+async function startChat(accessor: ServicesAccessor, context: INotebookActionContext, index: number, input?: string, autoSend?: boolean, source?: string) {
 	const configurationService = accessor.get(IConfigurationService);
 	const commandService = accessor.get(ICommandService);
 
 	if (configurationService.getValue<boolean>(NotebookSetting.cellChat)) {
 		context.notebookEditor.focusContainer();
 		NotebookChatController.get(context.notebookEditor)?.run(index, input, autoSend);
 	} else if (configurationService.getValue<boolean>(NotebookSetting.cellGenerate)) {
-		const newCell = await insertNewCell(accessor, context, CellKind.Code, 'below', true);
-		if (newCell) {
-			newCell.enableAutoLanguageDetection();
-			await context.notebookEditor.revealFirstLineIfOutsideViewport(newCell);
-			const codeEditor = context.notebookEditor.codeEditors.find(ce => ce[0] === newCell)?.[1];
+		const activeCell = context.notebookEditor.getActiveCell();
+		const targetCell = activeCell?.getTextLength() === 0 && source !== 'insertToolbar' ? activeCell : (await insertNewCell(accessor, context, CellKind.Code, 'below', true));
+
+		if (targetCell) {
+			targetCell.enableAutoLanguageDetection();
+			await context.notebookEditor.revealFirstLineIfOutsideViewport(targetCell);
+			const codeEditor = context.notebookEditor.codeEditors.find(ce => ce[0] === targetCell)?.[1];
 			if (codeEditor) {
 				codeEditor.focus();
 				commandService.executeCommand('inlineChat.start');
@@ -497,7 +500,7 @@ registerAction2(class extends NotebookAction {
 
 	async runWithContext(accessor: ServicesAccessor, context: IInsertCellWithChatArgs) {
 		const index = Math.max(0, context.cell ? context.notebookEditor.getCellIndex(context.cell) + 1 : 0);
-		await startChat(accessor, context, index, context.input, context.autoSend);
+		await startChat(accessor, context, index, context.input, context.autoSend, context.source);
 	}
 });
 

src/vs/workbench/contrib/notebook/browser/view/cellParts/cellToolbars.ts

@@ -84,6 +84,7 @@ export class BetweenCellToolbar extends CellOverlayPart {
 			ui: true,
 			cell: element,
 			notebookEditor: this._notebookEditor,
+			source: 'insertToolbar',
 			$mid: MarshalledId.NotebookCellActionContext
 		};
 		this.updateInternalLayoutNow(element);
@@ -205,6 +206,7 @@ export class CellTitleToolbarPart extends CellOverlayPart {
 			ui: true,
 			cell: element,
 			notebookEditor: this._notebookEditor,
+			source: 'cellToolbar',
 			$mid: MarshalledId.NotebookCellActionContext
 		});
 	}

src/vs/workbench/contrib/notebook/browser/viewParts/notebookEditorToolbar.ts

@@ -320,7 +320,8 @@ export class NotebookEditorWorkbenchToolbar extends Disposable {
 
 		const context = {
 			ui: true,
-			notebookEditor: this.notebookEditor
+			notebookEditor: this.notebookEditor,
+			source: 'notebookToolbar'
 		};
 
 		const actionProvider = (action: IAction, options: IActionViewItemOptions) => {