- r converting GenericDiffReporterBase to handle command options

approvals · Sep 30, 2024 · 58b39c7 · 58b39c7
1 parent 20f1648
commit 58b39c7
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/lib/Reporting/GenericDiffReporterBase.ts b/lib/Reporting/GenericDiffReporterBase.ts
@@ -11,6 +11,7 @@ export default class GenericDiffReporterBase implements Reporter {
   public exePath: string = "";
   private _reporterFileLookedUp: boolean;
   public setCommandArgs: (approved: string, received: string) => string[] = ((a: string, r: string) => [r,a]);
+  public modifyCommandOptions: (commandOptions: any) => any = ((c) => c);
   private _reporterFileLookedUpAndFound: boolean;
 
     constructor(name: string) {
@@ -135,7 +136,7 @@ export default class GenericDiffReporterBase implements Reporter {
   }
 
     getCommandArguments(approved: string, received: string, options: Partial<Config> = {}) {
-        const cmdOptions = options.cmdOptionOverrides;
+        const cmdOptions = this.modifyCommandOptions(options.cmdOptionOverrides);
         const args = options.cmdArgs || this.setCommandArgs(approved, received);
         return {cmdOptions, args};
     }

diff --git a/lib/Reporting/Reporters/vimdiffReporter.ts b/lib/Reporting/Reporters/vimdiffReporter.ts
@@ -13,5 +13,13 @@ export default class Reporter extends GenericDiffReporterBase {
     this.setCommandArgs = (approved, received) => {
       return ["-d", received, approved];
     };
+    this.modifyCommandOptions = (cmdOptions) => {
+      if (!cmdOptions) {
+        cmdOptions = {};
+      }
+
+      cmdOptions.stdio = "inherit";
+      return cmdOptions;
+    };
   }
 }
diff --git a/test/Reporting/Reporters/VimDiffReporterTests.ts b/test/Reporting/Reporters/VimDiffReporterTests.ts
@@ -15,6 +15,10 @@ describe("Reporter", function () {
 
       const args = reporter.getCommandArguments(approved, received);
       assert.deepEqual(expectedCommand, args.args);
+      assert.deepEqual(args.cmdOptions, {
+        stdio: 'inherit',
+      });
+
     });
   });
 });