Adding inlineDiffs for unified-cell diffs

Author: nakul-py

src/diff/base-unified-diff.ts

@@ -34,6 +34,11 @@ export interface IBaseUnifiedDiffOptions {
    * Whether to show accept/reject buttons
    */
   showActionButtons?: boolean;
+
+  /**
+   * Whether to allow inline diffs
+   */
+  allowInlineDiffs?: boolean;
 }
 
 /**
@@ -49,6 +54,7 @@ export abstract class BaseUnifiedDiffManager {
     this._newSource = options.newSource;
     this.trans = options.trans;
     this.showActionButtons = options.showActionButtons ?? true;
+    this.allowInlineDiffs = options.allowInlineDiffs ?? false;
     this._isInitialized = false;
     this._isDisposed = false;
     this._diffCompartment = new Compartment();
@@ -166,7 +172,8 @@ export abstract class BaseUnifiedDiffManager {
       newSource: this._newSource,
       isInitialized: this._isInitialized,
       sharedModel: this.getSharedModel(),
-      onChunkChange: () => this.deactivate()
+      onChunkChange: () => this.deactivate(),
+      allowInlineDiffs: this.allowInlineDiffs
     });
 
     this._isInitialized = true;
@@ -182,6 +189,7 @@ export abstract class BaseUnifiedDiffManager {
   protected editor: CodeMirrorEditor;
   protected trans: TranslationBundle;
   protected showActionButtons: boolean;
+  protected allowInlineDiffs: boolean;
   protected acceptAllButton: ToolbarButton | null = null;
   protected rejectAllButton: ToolbarButton | null = null;
   private _originalSource: string;

src/diff/utils.ts

@@ -40,9 +40,7 @@ export function createMergeExtension(
 ): Extension {
   return unifiedMergeView({
     original: originalSource,
-    ...options,
-    // TODO: make configurable
-    // allowInlineDiffs: true,
+    allowInlineDiffs: options?.allowInlineDiffs ?? false,
     mergeControls: (
       type: 'accept' | 'reject',
       action: (e: MouseEvent) => void
@@ -98,6 +96,11 @@ export interface IApplyDiffOptions {
    * Optional callback when chunks are resolved
    */
   onChunkChange?: () => void;
+
+  /**
+   * Whether to allow inline diffs
+   */
+  allowInlineDiffs?: boolean;
 }
 
 /**
@@ -111,10 +114,13 @@ export function applyDiff(options: IApplyDiffOptions): void {
     newSource,
     isInitialized,
     sharedModel,
-    onChunkChange
+    onChunkChange,
+    allowInlineDiffs = false
   } = options;
 
-  const mergeExtension = createMergeExtension(originalSource);
+  const mergeExtension = createMergeExtension(originalSource, {
+    allowInlineDiffs
+  });
 
   // Create an update listener to track chunk resolution
   const updateListener = EditorView.updateListener.of(update => {

src/plugin.ts

@@ -218,6 +218,12 @@ const unifiedCellDiffPlugin: JupyterFrontEndPlugin<void> = {
                 'Whether to show action buttons for chunk acceptance'
               )
             },
+            allowInlineDiffs: {
+              type: 'boolean',
+              description: trans.__(
+                'Enable inline diffs (true) or disable (false)'
+              )
+            },
             notebookPath: {
               type: 'string',
               description: trans.__('Path to the notebook containing the cell')
@@ -232,6 +238,7 @@ const unifiedCellDiffPlugin: JupyterFrontEndPlugin<void> = {
           originalSource,
           newSource,
           showActionButtons = true,
+          allowInlineDiffs = false,
           notebookPath
         } = args;
 
@@ -280,6 +287,7 @@ const unifiedCellDiffPlugin: JupyterFrontEndPlugin<void> = {
           originalSource,
           newSource,
           showActionButtons,
+          allowInlineDiffs,
           trans
         });
         cellDiffManagers.set(cell.id, manager);