Fix Pressing enter in console with console run keystroke set to enter…

… creates a newline and runs (jupyterlab#15869)

* fix: cells editorOptions return extensions option

* fix: remove editorExtensions function

* fix: call preventDefault() only when Enter key is pressed in the console and INTERACTION_MODE=terminal

---------

Co-authored-by: yelipei <yelipei@qianxin.com>

packages/cells/src/widget.ts

@@ -204,6 +204,7 @@ export class Cell<T extends ICellModel = ICellModel> extends Widget {
 
     // For cells disable searching with CodeMirror search panel.
     this._editorConfig = { searchWithCM: false, ...options.editorConfig };
+    this._editorExtensions = options.editorExtensions ?? [];
     this._placeholder = true;
     this._inViewport = false;
     this.placeholder = options.placeholder ?? true;
@@ -615,7 +616,7 @@ export class Cell<T extends ICellModel = ICellModel> extends Widget {
    * @returns Editor options
    */
   protected getEditorOptions(): InputArea.IOptions['editorOptions'] {
-    return { config: this.editorConfig };
+    return { config: this.editorConfig, extensions: this._editorExtensions };
   }
 
   /**
@@ -694,6 +695,7 @@ export class Cell<T extends ICellModel = ICellModel> extends Widget {
   protected _displayChanged = new Signal<this, void>(this);
 
   private _editorConfig: Record<string, any> = {};
+  private _editorExtensions: Extension[] = [];
   private _input: InputArea | null;
   private _inputHidden = false;
   private _inputWrapper: Widget | null;

packages/console/src/widget.ts

@@ -92,6 +92,11 @@ const JUPYTER_CELL_MIME = 'application/vnd.jupyter.cells';
  * The data attribute added to a widget that can undo.
  */
 const UNDOER = 'jpUndoer';
+/**
+ * The data attribute Whether the console interaction mimics the notebook
+ * or terminal keyboard shortcuts.
+ */
+const INTERACTION_MODE = 'jpInteractionMode';
 
 /**
  * A widget containing a Jupyter console.
@@ -789,6 +794,7 @@ export class CodeConsole extends Widget {
    * Create the options used to initialize a code cell widget.
    */
   private _createCodeCellOptions(): CodeCell.IOptions {
+    const { node } = this;
     const contentFactory = this.contentFactory;
     const modelFactory = this.modelFactory;
     const model = modelFactory.createCodeCell({});
@@ -798,7 +804,10 @@ export class CodeConsole extends Widget {
     // Suppress the default "Enter" key handling.
     const onKeyDown = EditorView.domEventHandlers({
       keydown: (event: KeyboardEvent, view: EditorView) => {
-        if (event.keyCode === 13) {
+        if (
+          event.keyCode === 13 &&
+          node.dataset[INTERACTION_MODE] === 'terminal'
+        ) {
           event.preventDefault();
           return true;
         }