Merge branch 'right-pane' into arrow

Author: nakul-py

src/diff/cell.ts

@@ -69,7 +69,15 @@ class CodeMirrorSplitDiffWidget extends BaseDiffWidget {
           python(),
           EditorView.editable.of(true),
           jupyterTheme,
-          splitDiffDecorationField
+          splitDiffDecorationField,
+          EditorView.updateListener.of(update => {
+            if (update.docChanged) {
+              const newText = update.state.doc.toString();
+
+              this._modifiedCode = newText;
+              this._newSource = newText;
+            }
+          })
         ]
       },
       parent: this.node,

src/widget.ts

@@ -100,7 +100,7 @@ export abstract class BaseDiffWidget extends Widget {
    */
   public onAcceptClick(): void {
     if (this._cell) {
-      this._cell.sharedModel.setSource(this._newSource);
+      this._cell.sharedModel.setSource(this._newSource || this._originalSource);
       this._closeDiffView();
     }
   }
@@ -191,9 +191,9 @@ export abstract class BaseDiffWidget extends Widget {
   private _cell: ICellModel;
   private _cellFooterTracker: ICellFooterTracker;
   private _originalSource: string;
-  private _newSource: string;
   private _showActionButtons: boolean;
   private _openDiff: boolean;
   private _toggleButton: ToolbarButton | null = null;
   private _trans: TranslationBundle;
+  public _newSource: string;
 }