Adopt interactive command in notebook execution errors (microsoft#182141)

Author: rebornix

src/vs/workbench/contrib/notebook/browser/controller/executeActions.ts

@@ -5,36 +5,32 @@
 
 import { Iterable } from 'vs/base/common/iterator';
 import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { CancellationTokenSource } from 'vs/base/common/cancellation';
+import { Schemas } from 'vs/base/common/network';
 import { isEqual } from 'vs/base/common/resources';
-import { ITextModel } from 'vs/editor/common/model';
-import { Range } from 'vs/editor/common/core/range';
-import { ISelection } from 'vs/editor/common/core/selection';
+import { ThemeIcon } from 'vs/base/common/themables';
+import { URI, UriComponents } from 'vs/base/common/uri';
+import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 import { ILanguageService } from 'vs/editor/common/languages/language';
 import { localize } from 'vs/nls';
 import { MenuId, registerAction2 } from 'vs/platform/actions/common/actions';
+import { ICommandService } from 'vs/platform/commands/common/commands';
 import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
 import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { ThemeIcon } from 'vs/base/common/themables';
 import { EditorsOrder } from 'vs/workbench/common/editor';
+import { IDebugService } from 'vs/workbench/contrib/debug/common/debug';
+import { InteractiveEditorController } from 'vs/workbench/contrib/interactiveEditor/browser/interactiveEditorController';
+import { CTX_INTERACTIVE_EDITOR_FOCUSED } from 'vs/workbench/contrib/interactiveEditor/common/interactiveEditor';
 import { insertCell } from 'vs/workbench/contrib/notebook/browser/controller/cellOperations';
-import { cellExecutionArgs, CellToolbarOrder, CELL_TITLE_CELL_GROUP_ID, executeNotebookCondition, getContextFromActiveEditor, getContextFromUri, INotebookActionContext, INotebookCellActionContext, INotebookCellToolbarActionContext, INotebookCommandContext, NotebookAction, NotebookCellAction, NotebookMultiCellAction, NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT, parseMultiCellExecutionArgs } from 'vs/workbench/contrib/notebook/browser/controller/coreActions';
-import { NOTEBOOK_CELL_EXECUTING, NOTEBOOK_CELL_EXECUTION_STATE, NOTEBOOK_CELL_LIST_FOCUSED, NOTEBOOK_CELL_TYPE, NOTEBOOK_HAS_RUNNING_CELL, NOTEBOOK_HAS_SOMETHING_RUNNING, NOTEBOOK_INTERRUPTIBLE_KERNEL, NOTEBOOK_IS_ACTIVE_EDITOR, NOTEBOOK_KERNEL_COUNT, NOTEBOOK_KERNEL_SOURCE_COUNT, NOTEBOOK_LAST_CELL_FAILED, NOTEBOOK_MISSING_KERNEL_EXTENSION } from 'vs/workbench/contrib/notebook/common/notebookContextKeys';
+import { CELL_TITLE_CELL_GROUP_ID, CellToolbarOrder, INotebookActionContext, INotebookCellActionContext, INotebookCellToolbarActionContext, INotebookCommandContext, NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT, NotebookAction, NotebookCellAction, NotebookMultiCellAction, cellExecutionArgs, executeNotebookCondition, getContextFromActiveEditor, getContextFromUri, parseMultiCellExecutionArgs } from 'vs/workbench/contrib/notebook/browser/controller/coreActions';
 import { CellEditState, CellFocusMode, EXECUTE_CELL_COMMAND_ID } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
 import * as icons from 'vs/workbench/contrib/notebook/browser/notebookIcons';
 import { CellKind, CellUri, NotebookSetting } from 'vs/workbench/contrib/notebook/common/notebookCommon';
+import { NOTEBOOK_CELL_EXECUTING, NOTEBOOK_CELL_EXECUTION_STATE, NOTEBOOK_CELL_LIST_FOCUSED, NOTEBOOK_CELL_TYPE, NOTEBOOK_HAS_RUNNING_CELL, NOTEBOOK_HAS_SOMETHING_RUNNING, NOTEBOOK_INTERRUPTIBLE_KERNEL, NOTEBOOK_IS_ACTIVE_EDITOR, NOTEBOOK_KERNEL_COUNT, NOTEBOOK_KERNEL_SOURCE_COUNT, NOTEBOOK_LAST_CELL_FAILED, NOTEBOOK_MISSING_KERNEL_EXTENSION } from 'vs/workbench/contrib/notebook/common/notebookContextKeys';
 import { NotebookEditorInput } from 'vs/workbench/contrib/notebook/common/notebookEditorInput';
 import { INotebookExecutionStateService } from 'vs/workbench/contrib/notebook/common/notebookExecutionStateService';
+import { ICellRange } from 'vs/workbench/contrib/notebook/common/notebookRange';
 import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { Schemas } from 'vs/base/common/network';
-import { IDebugService } from 'vs/workbench/contrib/debug/common/debug';
-import { CTX_INTERACTIVE_EDITOR_FOCUSED, IInteractiveEditorRequest, IInteractiveEditorService } from 'vs/workbench/contrib/interactiveEditor/common/interactiveEditor';
-import { ICellRange } from 'vs/workbench/contrib/notebook/common/notebookRange';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { InteractiveEditorController } from 'vs/workbench/contrib/interactiveEditor/browser/interactiveEditorController';
-import { EditOperation } from 'vs/editor/common/core/editOperation';
 
 const EXECUTE_NOTEBOOK_COMMAND_ID = 'notebook.execute';
 const CANCEL_NOTEBOOK_COMMAND_ID = 'notebook.cancelExecution';
@@ -810,55 +806,18 @@ registerAction2(class FixCellErrorction extends NotebookCellAction<ICellRange> {
 			try {
 				err = <ErrorLike>JSON.parse(textDecoder.decode(output.data.buffer));
 
-				if (!err.message) {
-					return;
-				}
-				const textModel = context.notebookEditor.activeCodeEditor?.getModel() as ITextModel | null;
-
-				if (!textModel) {
-					return;
-				}
-
-				const interactiveEditorService = accessor.get(IInteractiveEditorService);
-				const provider = Iterable.first(interactiveEditorService.getAllProvider());
-				if (!provider) {
+				if (!err.name && !err.message) {
 					return;
 				}
 
+				const errString = [err.name, err.message].filter(Boolean).join(': ');
 				context.notebookEditor.showProgress();
 
-				const _ctsSession: CancellationTokenSource = new CancellationTokenSource();
-
-				const range = textModel.getFullModelRange();
-				const selection: ISelection = {
-					selectionStartLineNumber: range.startLineNumber,
-					selectionStartColumn: range.startColumn,
-					positionLineNumber: range.endLineNumber,
-					positionColumn: range.endColumn
-				};
-
-				const session = await provider.prepareInteractiveEditorSession(textModel, selection, _ctsSession.token);
-
-				if (!session) {
-					context.notebookEditor.hideProgress();
-					return;
-				}
-
-				const request: IInteractiveEditorRequest = {
-					prompt: `/fix ${err.message}`,
-					selection: selection,
-					wholeRange: textModel.getFullModelRange()
-				};
-
-				const reply = await provider.provideResponse(session, request, _ctsSession.token);
-
-				if (reply && reply.type === 'editorEdit') {
-					textModel.pushStackElement();
-					const edits = reply.edits.map(edit => EditOperation.replace(Range.lift(edit.range), edit.text));
-					textModel.pushEditOperations(null, edits, () => null);
-					textModel.pushStackElement();
-				}
-
+				const commandService = accessor.get(ICommandService);
+				await commandService.executeCommand('interactiveEditor.start', {
+					autoSend: true,
+					message: `/fix ${errString}`,
+				});
 				context.notebookEditor.hideProgress();
 			} catch (e) {
 				console.log(e);