cleanup

Author: jtpio

src/diff/codemirror.ts

@@ -1,12 +1,10 @@
 import { python } from '@codemirror/lang-python';
 import { MergeView } from '@codemirror/merge';
 import { EditorView } from '@codemirror/view';
-import { ICellModel } from '@jupyterlab/cells';
 import { jupyterTheme } from '@jupyterlab/codemirror';
 import { Message } from '@lumino/messaging';
 import { Widget } from '@lumino/widgets';
 import { basicSetup } from 'codemirror';
-import { ICellFooterTracker } from 'jupyterlab-cell-input-footer';
 import { IDiffStrategy, IDiffWidgetOptions } from '../interfaces';
 import { BaseDiffWidget } from '../widget';
 
@@ -30,11 +28,9 @@ export class CodeMirrorStrategy implements IDiffStrategy {
       openDiff = true
     } = options;
 
-    const modifiedCode = newSource || cell.sharedModel.getSource();
-
     const diffWidget = new CodeMirrorDiffWidget({
-      originalCode: originalSource,
-      modifiedCode,
+      originalSource,
+      newSource,
       cell,
       cellFooterTracker,
       showActionButtons,
@@ -52,24 +48,13 @@ export class CodeMirrorStrategy implements IDiffStrategy {
  * A Lumino widget that contains a CodeMirror diff view
  */
 class CodeMirrorDiffWidget extends BaseDiffWidget {
-  private _originalCode: string;
-  private _modifiedCode: string;
-  private _mergeView: MergeView | null = null;
-
   /**
    * Construct a new CodeMirrorDiffWidget.
    */
-  constructor(options: CodeMirrorDiffWidget.IOptions) {
-    super({
-      cell: options.cell,
-      cellFooterTracker: options.cellFooterTracker,
-      originalSource: options.originalCode,
-      newSource: options.modifiedCode,
-      showActionButtons: options.showActionButtons,
-      openDiff: options.openDiff
-    });
-    this._originalCode = options.originalCode;
-    this._modifiedCode = options.modifiedCode;
+  constructor(options: IDiffWidgetOptions) {
+    super(options);
+    this._originalCode = options.originalSource;
+    this._modifiedCode = options.newSource;
     this.addClass('jp-DiffView');
   }
 
@@ -129,21 +114,8 @@ class CodeMirrorDiffWidget extends BaseDiffWidget {
       this._mergeView = null;
     }
   }
-}
 
-/**
- * A namespace for `CodeMirrorDiffWidget` statics.
- */
-namespace CodeMirrorDiffWidget {
-  /**
-   * The options used to construct a `CodeMirrorDiffWidget`.
-   */
-  export interface IOptions {
-    originalCode: string;
-    modifiedCode: string;
-    cell: ICellModel;
-    cellFooterTracker: ICellFooterTracker;
-    showActionButtons?: boolean;
-    openDiff?: boolean;
-  }
+  private _originalCode: string;
+  private _modifiedCode: string;
+  private _mergeView: MergeView | null = null;
 }

src/diff/nbdime.ts

@@ -3,8 +3,6 @@ import { IDiffEntry } from 'nbdime/lib/diff/diffentries';
 import { createPatchStringDiffModel } from 'nbdime/lib/diff/model';
 import { MergeView } from 'nbdime/lib/common/mergeview';
 import { Widget } from '@lumino/widgets';
-import { ICellModel } from '@jupyterlab/cells';
-import { ICellFooterTracker } from 'jupyterlab-cell-input-footer';
 import { BaseDiffWidget } from '../widget';
 
 /**
@@ -64,14 +62,7 @@ class NBDimeDiffWidget extends BaseDiffWidget {
    * Construct a new NBDimeDiffWidget.
    */
   constructor(options: NBDimeDiffWidget.IOptions) {
-    super({
-      cell: options.cell,
-      cellFooterTracker: options.cellFooterTracker,
-      originalSource: options.originalSource,
-      newSource: options.newSource,
-      showActionButtons: options.showActionButtons,
-      openDiff: options.openDiff
-    });
+    super(options);
 
     // Create the NBDime merge view as a child widget
     this._mergeView = new MergeView({ remote: options.remote });
@@ -93,13 +84,7 @@ namespace NBDimeDiffWidget {
   /**
    * The options used to construct a `NBDimeDiffWidget`.
    */
-  export interface IOptions {
+  export interface IOptions extends IDiffWidgetOptions {
     remote: any;
-    cell: ICellModel;
-    cellFooterTracker: ICellFooterTracker;
-    originalSource: string;
-    newSource?: string;
-    showActionButtons?: boolean;
-    openDiff?: boolean;
   }
 }

src/widget.ts

@@ -2,23 +2,16 @@ import { ICellModel } from '@jupyterlab/cells';
 import { checkIcon, ToolbarButton, undoIcon } from '@jupyterlab/ui-components';
 import { Widget } from '@lumino/widgets';
 import { ICellFooterTracker } from 'jupyterlab-cell-input-footer';
+import { IDiffWidgetOptions } from './interfaces';
 
 /**
  * Base class for diff widgets with shared action button functionality
  */
 export abstract class BaseDiffWidget extends Widget {
-  protected _cell: ICellModel;
-  protected _cellFooterTracker: ICellFooterTracker;
-  protected _originalSource: string;
-  protected _newSource: string;
-  protected _showActionButtons: boolean;
-  protected _openDiff: boolean;
-  protected _toggleButton: ToolbarButton | null = null;
-
   /**
    * Construct a new BaseDiffWidget.
    */
-  constructor(options: BaseDiffWidget.IOptions) {
+  constructor(options: IDiffWidgetOptions) {
     super();
     this._cell = options.cell;
     this._cellFooterTracker = options.cellFooterTracker;
@@ -100,13 +93,11 @@ export abstract class BaseDiffWidget extends Widget {
       className: 'jp-DiffView-toggle',
       onClick: () => {
         this.onToggleClick();
-        this._updateToggleButton();
       }
     });
 
     footer.addToolbarItemOnLeft('toggle-diff', this._toggleButton);
 
-    // Only add action buttons if showActionButtons is true
     if (this._showActionButtons) {
       const rejectButton = new ToolbarButton({
         icon: undoIcon,
@@ -128,36 +119,11 @@ export abstract class BaseDiffWidget extends Widget {
       footer.addToolbarItemOnRight('accept-diff', acceptButton);
     }
 
-    // Show the diff view based on openDiff setting
     if (this._openDiff) {
       this.show();
     } else {
       this.hide();
     }
-    this._updateToggleButton();
-  }
-
-  /**
-   * Update the toggle button label based on visibility
-   */
-  private _updateToggleButton(): void {
-    if (this._toggleButton) {
-      // Remove and re-add with new label
-      const footer = this._cellFooterTracker?.getFooter(this._cell?.id);
-      if (footer) {
-        footer.removeToolbarItem('toggle-diff');
-        this._toggleButton = new ToolbarButton({
-          label: 'Compare changes',
-          enabled: true,
-          className: 'jp-DiffView-toggle',
-          onClick: () => {
-            this.onToggleClick();
-            this._updateToggleButton();
-          }
-        });
-        footer.addToolbarItemOnLeft('toggle-diff', this._toggleButton);
-      }
-    }
   }
 
   /**
@@ -177,21 +143,12 @@ export abstract class BaseDiffWidget extends Widget {
       this._cellFooterTracker.hideFooter(cellId);
     }
   }
-}
 
-/**
- * A namespace for `BaseDiffWidget` statics.
- */
-export namespace BaseDiffWidget {
-  /**
-   * The options used to construct a `BaseDiffWidget`.
-   */
-  export interface IOptions {
-    cell: ICellModel;
-    cellFooterTracker: ICellFooterTracker;
-    originalSource: string;
-    newSource?: string;
-    showActionButtons?: boolean;
-    openDiff?: boolean;
-  }
+  protected _cell: ICellModel;
+  protected _cellFooterTracker: ICellFooterTracker;
+  protected _originalSource: string;
+  protected _newSource: string;
+  protected _showActionButtons: boolean;
+  protected _openDiff: boolean;
+  protected _toggleButton: ToolbarButton | null = null;
 }