Fix caching issues for VSCode hosts

Author: paleite

src/git.test.ts

@@ -106,10 +106,9 @@ describe("getDiffFileList", () => {
   it("should get the list of staged files", () => {
     jest.mock("child_process").resetAllMocks();
     mockedChildProcess.execSync.mockReturnValueOnce(Buffer.from(diffFileList));
-    const staged = false;
     expect(mockedChildProcess.execSync).toHaveBeenCalledTimes(0);
-    const fileListA = getDiffFileList(staged);
-    const fileListB = getDiffFileList(staged);
+    const fileListA = getDiffFileList();
+    const fileListB = getDiffFileList();
 
     expect(mockedChildProcess.execSync).toHaveBeenCalledTimes(1);
     expect(fileListA).toEqual(

src/git.ts

@@ -2,6 +2,8 @@ import * as child_process from "child_process";
 import * as path from "path";
 import { Range } from "./Range";
 
+const RUNNING_INSIDE_VSCODE = process.env.VSCODE_CLI !== undefined;
+
 const sanitizeFilePath = (filePath: string) =>
   JSON.stringify(path.resolve(filePath));
 
@@ -17,10 +19,9 @@ const getCachedDiff = (filePath: string, staged: boolean) =>
 
 const getDiffForFile = (filePath: string, staged = false): string => {
   let diff = getCachedDiff(filePath, staged);
-  if (diff === undefined) {
+  if (RUNNING_INSIDE_VSCODE || diff === undefined) {
     const command = [
       "git",
-      "--no-pager",
       "diff",
       "--diff-filter=ACM",
       "--relative",
@@ -42,16 +43,15 @@ const getDiffForFile = (filePath: string, staged = false): string => {
 };
 
 let diffFileListCache: string[] | undefined;
-const getDiffFileList = (staged = false): string[] => {
-  if (diffFileListCache === undefined) {
+const getDiffFileList = (): string[] => {
+  if (RUNNING_INSIDE_VSCODE || diffFileListCache === undefined) {
     const command = [
       "git",
-      "--no-pager",
       "diff",
       "--diff-filter=ACM",
       "--name-only",
       "--relative",
-      staged && "--staged",
+    "--staged",
       JSON.stringify(process.env.ESLINT_PLUGIN_DIFF_COMMIT ?? "HEAD"),
     ]
       .filter(Boolean)
@@ -69,7 +69,8 @@ const getDiffFileList = (staged = false): string[] => {
 
 let gitFileListCache: string[] | undefined;
 const getGitFileList = (): string[] => {
-  if (gitFileListCache === undefined) {
+  console.log("getGitFileList");
+  if (RUNNING_INSIDE_VSCODE || gitFileListCache === undefined) {
     const command = ["git", "ls-files"].filter(Boolean).join(" ");
 
     gitFileListCache = child_process
@@ -86,7 +87,6 @@ const getGitFileList = (): string[] => {
 const hasCleanIndex = (filePath: string): boolean => {
   const command = [
     "git",
-    "--no-pager",
     "diff",
     "--quiet",
     "--relative",
@@ -109,7 +109,7 @@ let untrackedFileListCache: string[] | undefined;
 const getUntrackedFileList = (staged = false): string[] => {
   if (staged) {
     untrackedFileListCache = [];
-  } else if (untrackedFileListCache === undefined) {
+  } else if (RUNNING_INSIDE_VSCODE || untrackedFileListCache === undefined) {
     const command = ["git", "ls-files", "--exclude-standard", "--others"]
       .filter(Boolean)
       .join(" ");

src/processors.ts

@@ -21,14 +21,15 @@ const getPreProcessor =
   (staged = false) =>
   (text: string, filename: string) => {
     const shouldBeProcessed =
-      getDiffFileList(staged).includes(filename) ||
-      getUntrackedFileList(staged).includes(filename);
-
+      process.env.VSCODE_CLI !== undefined ||
+      !staged ||
+      getDiffFileList().includes(filename);
     return shouldBeProcessed ? [text] : [];
   };
 
-const isLineWithinRange = (line: number) => (range: Range) =>
-  range.isWithinRange(line);
+const isLineWithinRange = (line: number) => (range: Range) => {
+  return range.isWithinRange(line);
+};
 
 const getPostProcessor =
   (staged = false) =>