Remove template from DiffModel

Author: navn-r

src/commandsAndMenu.tsx

@@ -419,7 +419,7 @@ export function addCommands(
   /**
    * Git display diff command - internal command
    *
-   * @params model {Git.Diff.IModel<string>}: The diff model to display
+   * @params model {Git.Diff.IModel: The diff model to display
    * @params isText {boolean}: Optional, whether the content is a plain text
    * @params isMerge {boolean}: Optional, whether the diff is a merge conflict
    * @returns the main area widget or null
@@ -429,7 +429,7 @@ export function addCommands(
     caption: trans.__('Display a file diff.'),
     execute: async args => {
       const { model, isText } = args as any as {
-        model: Git.Diff.IModel<string>;
+        model: Git.Diff.IModel;
         isText?: boolean;
       };
 
@@ -633,10 +633,7 @@ export function addCommands(
           : { git: diffContext.currentRef };
 
         // Base props used for Diff Model
-        const props: Omit<
-          Git.Diff.IModel<string>,
-          'changed' | 'hasConflict'
-        > = {
+        const props: Omit<Git.Diff.IModel, 'changed' | 'hasConflict'> = {
           challenger: {
             content: async () => {
               return requestAPI<Git.IDiffContent>(
@@ -697,7 +694,7 @@ export function addCommands(
         }
 
         // Create the diff widget
-        const model = new DiffModel<string>(props);
+        const model = new DiffModel(props);
 
         const widget = await commands.execute(CommandIDs.gitShowDiff, {
           model,

src/components/diff/NotebookDiff.ts

@@ -75,7 +75,7 @@ interface INbdimeMergeDiff {
  * @returns Diff notebook widget
  */
 export const createNotebookDiff = async (
-  model: Git.Diff.IModel<string>,
+  model: Git.Diff.IModel,
   renderMime: IRenderMimeRegistry,
   toolbar?: Toolbar
 ): Promise<NotebookDiff> => {
@@ -116,7 +116,7 @@ export const createNotebookDiff = async (
  * NotebookDiff widget
  */
 export class NotebookDiff extends Panel implements Git.Diff.IDiffWidget {
-  constructor(model: Git.Diff.IModel<string>, renderMime: IRenderMimeRegistry) {
+  constructor(model: Git.Diff.IModel, renderMime: IRenderMimeRegistry) {
     super();
     const getReady = new PromiseDelegate<void>();
     this._isReady = getReady.promise;
@@ -335,7 +335,7 @@ export class NotebookDiff extends Panel implements Git.Diff.IDiffWidget {
 
   protected _areUnchangedCellsHidden = false;
   protected _isReady: Promise<void>;
-  protected _model: Git.Diff.IModel<string>;
+  protected _model: Git.Diff.IModel;
   protected _renderMime: IRenderMimeRegistry;
   protected _scroller: Panel;
   protected _nbdWidget: NotebookMergeWidget | NotebookDiffWidget;

src/components/diff/PlainTextDiff.ts

@@ -14,8 +14,8 @@ import { MergeView as LocalMergeView, mergeView } from './mergeview';
  * @param toolbar MainAreaWidget toolbar
  * @returns PlainText diff widget
  */
-export const createPlainTextDiff: Git.Diff.ICallback<string> = async (
-  model: Git.Diff.IModel<string>,
+export const createPlainTextDiff: Git.Diff.ICallback = async (
+  model: Git.Diff.IModel,
   toolbar?: Toolbar
 ): Promise<PlainTextDiff> => {
   const widget = new PlainTextDiff(model);
@@ -27,7 +27,7 @@ export const createPlainTextDiff: Git.Diff.ICallback<string> = async (
  * Plain Text Diff widget
  */
 export class PlainTextDiff extends Widget implements Git.Diff.IDiffWidget {
-  constructor(model: Git.Diff.IModel<string>) {
+  constructor(model: Git.Diff.IModel) {
     super({
       node: PlainTextDiff.createNode(
         model.reference.label,
@@ -256,7 +256,7 @@ export class PlainTextDiff extends Widget implements Git.Diff.IDiffWidget {
   protected _container: HTMLElement;
   protected _isReady: Promise<void>;
   protected _mergeView: MergeView.MergeViewEditor;
-  protected _model: Git.Diff.IModel<string>;
+  protected _model: Git.Diff.IModel;
 
   private _reference: string | null = null;
   private _challenger: string | null = null;

src/components/diff/model.ts

@@ -5,14 +5,14 @@ import { Git } from '../../tokens';
 /**
  * Base DiffModel class
  */
-export class DiffModel<T> implements IDisposable, Git.Diff.IModel<T> {
-  constructor(props: Omit<Git.Diff.IModel<T>, 'changed' | 'hasConflict'>) {
+export class DiffModel implements IDisposable, Git.Diff.IModel {
+  constructor(props: Omit<Git.Diff.IModel, 'changed' | 'hasConflict'>) {
     this._challenger = props.challenger;
     this._filename = props.filename;
     this._reference = props.reference;
     this._base = props.base;
 
-    this._changed = new Signal<DiffModel<T>, Git.Diff.IModelChange>(this);
+    this._changed = new Signal<DiffModel, Git.Diff.IModelChange>(this);
   }
 
   /**
@@ -22,16 +22,16 @@ export class DiffModel<T> implements IDisposable, Git.Diff.IModel<T> {
    * on challenger change except for the content; i.e. the content
    * is not fetch to check if it changed.
    */
-  get changed(): ISignal<DiffModel<T>, Git.Diff.IModelChange> {
+  get changed(): ISignal<DiffModel, Git.Diff.IModelChange> {
     return this._changed;
   }
 
   /**
    * Helper to compare diff contents.
    */
   private _didContentChange(
-    a: Git.Diff.IContent<T>,
-    b: Git.Diff.IContent<T>
+    a: Git.Diff.IContent,
+    b: Git.Diff.IContent
   ): boolean {
     return (
       a.label !== b.label || a.source !== b.source || a.updateAt !== b.updateAt
@@ -41,10 +41,10 @@ export class DiffModel<T> implements IDisposable, Git.Diff.IModel<T> {
   /**
    * Challenger description
    */
-  get challenger(): Git.Diff.IContent<T> {
+  get challenger(): Git.Diff.IContent {
     return this._challenger;
   }
-  set challenger(v: Git.Diff.IContent<T>) {
+  set challenger(v: Git.Diff.IContent) {
     const emitSignal = this._didContentChange(this._challenger, v);
 
     if (emitSignal) {
@@ -63,10 +63,10 @@ export class DiffModel<T> implements IDisposable, Git.Diff.IModel<T> {
   /**
    * Reference description
    */
-  get reference(): Git.Diff.IContent<T> {
+  get reference(): Git.Diff.IContent {
     return this._reference;
   }
-  set reference(v: Git.Diff.IContent<T>) {
+  set reference(v: Git.Diff.IContent) {
     const emitSignal = this._didContentChange(this._reference, v);
 
     if (emitSignal) {
@@ -81,7 +81,7 @@ export class DiffModel<T> implements IDisposable, Git.Diff.IModel<T> {
    * Note: The base diff content is only provided during
    * merge conflicts (three-way diff).
    */
-  get base(): Git.Diff.IContent<T> | undefined {
+  get base(): Git.Diff.IContent | undefined {
     return this._base;
   }
 
@@ -110,11 +110,11 @@ export class DiffModel<T> implements IDisposable, Git.Diff.IModel<T> {
     Signal.clearData(this);
   }
 
-  protected _reference: Git.Diff.IContent<T>;
-  protected _challenger: Git.Diff.IContent<T>;
-  protected _base?: Git.Diff.IContent<T>;
+  protected _reference: Git.Diff.IContent;
+  protected _challenger: Git.Diff.IContent;
+  protected _base?: Git.Diff.IContent;
 
-  private _changed: Signal<DiffModel<T>, Git.Diff.IModelChange>;
+  private _changed: Signal<DiffModel, Git.Diff.IModelChange>;
   private _isDisposed = false;
   private _filename: string;
 }

src/index.ts

@@ -209,7 +209,7 @@ async function activate(
   gitExtension.registerDiffProvider(
     'Nbdime',
     ['.ipynb'],
-    (model: Git.Diff.IModel<string>, toolbar?: Toolbar) =>
+    (model: Git.Diff.IModel, toolbar?: Toolbar) =>
       createNotebookDiff(model, renderMime, toolbar)
   );
 

src/model.ts

@@ -14,7 +14,7 @@ import { decodeStage } from './utils';
 const DEFAULT_REFRESH_INTERVAL = 3000; // ms
 // Available diff providers
 const DIFF_PROVIDERS: {
-  [key: string]: { name: string; callback: Git.Diff.ICallback<any> };
+  [key: string]: { name: string; callback: Git.Diff.ICallback };
 } = {};
 
 /**
@@ -24,7 +24,7 @@ const DIFF_PROVIDERS: {
  */
 export function getDiffProvider(
   filename: string
-): Git.Diff.ICallback<any> | undefined {
+): Git.Diff.ICallback | undefined {
   return DIFF_PROVIDERS[PathExt.extname(filename)?.toLocaleLowerCase()]
     ?.callback;
 }
@@ -1129,10 +1129,10 @@ export class GitExtension implements IGitExtension {
    * @param fileExtensions File type list
    * @param callback Callback to use for the provided file types
    */
-  registerDiffProvider<T>(
+  registerDiffProvider(
     name: string,
     fileExtensions: string[],
-    callback: Git.Diff.ICallback<T>
+    callback: Git.Diff.ICallback
   ): void {
     fileExtensions.forEach(fileExtension => {
       DIFF_PROVIDERS[fileExtension.toLocaleLowerCase()] = { name, callback };

src/tokens.ts

@@ -372,10 +372,10 @@ export interface IGitExtension extends IDisposable {
    * @param fileExtensions File extensions list
    * @param callback Callback to use for the provided file types
    */
-  registerDiffProvider<T>(
+  registerDiffProvider(
     name: string,
     fileExtensions: string[],
-    callback: Git.Diff.ICallback<T>
+    callback: Git.Diff.ICallback
   ): void;
 
   /**
@@ -490,24 +490,22 @@ export namespace Git {
     /**
      * Callback to generate a comparison widget
      *
-     * T is the content type to be compared
-     *
      * The toolbar is the one of the MainAreaWidget in which the diff widget
      * will be displayed.
      */
-    export type ICallback<T> = (
-      model: IModel<T>,
+    export type ICallback = (
+      model: IModel,
       toolbar?: Toolbar
     ) => Promise<IDiffWidget>;
 
     /**
      * Content and its context for diff
      */
-    export interface IContent<T> {
+    export interface IContent {
       /**
        * Asynchronous content getter for the source
        */
-      content: () => Promise<T>;
+      content: () => Promise<string>;
       /**
        * Content label
        *
@@ -550,27 +548,27 @@ export namespace Git {
     /**
      * DiffModel properties
      */
-    export interface IModel<T> {
+    export interface IModel {
       /**
        * Challenger data
        */
-      challenger: IContent<T>;
+      challenger: IContent;
       /**
        * Signal emitted when the reference or the challenger changes
        */
-      readonly changed: ISignal<IModel<T>, IModelChange>;
+      readonly changed: ISignal<IModel, IModelChange>;
       /**
        * File of the name being diff at reference state
        */
       readonly filename: string;
       /**
        * Reference data
        */
-      reference: IContent<T>;
+      reference: IContent;
       /**
        * Optional base data, used only during merge conflicts
        */
-      base?: IContent<T>;
+      base?: IContent;
       /**
        * Helper to check if the file has conflicts.
        */

tests/test-components/DiffModel.spec.tsx

@@ -4,7 +4,7 @@ import { DiffModel } from '../../src/components/diff/model';
 import { Git } from '../../src/tokens';
 
 describe('DiffModel', () => {
-  let model: DiffModel<string>;
+  let model: DiffModel;
 
   /**
    * Helper to test changed signal.