Use histogram to get more relevant diffs

Author: paleite

src/git.test.ts

@@ -56,7 +56,7 @@ describe("getDiffForFile", () => {
     const diffFromFile = getDiffForFile("./mockfile.js", true);
 
     const expectedArguments =
-      'git --no-pager diff --diff-filter=ACM --relative --staged --unified=0 "1234567"';
+      'git diff --diff-algorithm=histogram --diff-filter=ACM --relative --staged --unified=0 "1234567"';
     expect(
       mockedChildProcess.execSync.mock.calls[
         mockedChildProcess.execSync.mock.calls.length - 1

src/git.ts

@@ -23,6 +23,7 @@ const getDiffForFile = (filePath: string, staged = false): string => {
     const command = [
       "git",
       "diff",
+      "--diff-algorithm=histogram",
       "--diff-filter=ACM",
       "--relative",
       staged && "--staged",
@@ -48,6 +49,7 @@ const getDiffFileList = (): string[] => {
     const command = [
       "git",
       "diff",
+      "--diff-algorithm=histogram",
       "--diff-filter=ACM",
       "--name-only",
       "--relative",
@@ -69,7 +71,6 @@ const getDiffFileList = (): string[] => {
 
 let gitFileListCache: string[] | undefined;
 const getGitFileList = (): string[] => {
-  console.log("getGitFileList");
   if (RUNNING_INSIDE_VSCODE || gitFileListCache === undefined) {
     const command = ["git", "ls-files"].filter(Boolean).join(" ");
 

src/processors.test.ts

@@ -1,7 +1,6 @@
 import * as child_process from "child_process";
 import type { Linter } from "eslint";
 import { mocked } from "jest-mock";
-import * as git from "./git";
 import { diff, diffConfig, staged, stagedConfig } from "./processors";
 import {
   diff as fixtureDiff,
@@ -11,12 +10,15 @@ import { postprocessArguments } from "./__fixtures__/postprocessArguments";
 
 jest.mock("child_process");
 const mockedChildProcess = mocked(child_process, true);
-const mockFilename = '/mock filename with quotes ", semicolons ; and spaces.js';
-mockedChildProcess.execSync.mockReturnValue(Buffer.from(mockFilename));
-const mockedGit = mocked(git, true);
-mockedGit.getDiffFileList = jest
-  .fn()
-  .mockReturnValue([mockFilename, "README.md"]);
+mockedChildProcess.execSync.mockReturnValue(
+  Buffer.from('/mock filename ", ; .js')
+);
+jest.mock("./git", () => ({
+  ...jest.requireActual("./git"),
+  getDiffFileList: jest
+    .fn()
+    .mockReturnValue(['/mock filename ", ; .js', "README.md"]),
+}));
 
 const [messages, filename] = postprocessArguments;
 

src/processors.ts

@@ -75,7 +75,7 @@ const getPostProcessor =
       .reduce((a, b) => a.concat(b), []);
   };
 
-const getProcessors = (staged = false): Linter.Processor => ({
+const getProcessors = (staged = false): Required<Linter.Processor> => ({
   preprocess: getPreProcessor(staged),
   postprocess: getPostProcessor(staged),
   supportsAutofix: true,