eslint
diff --git a/Collapse file: lib/cli-engine/lint-result-cache.js
‎lib/cli-engine/lint-result-cache.js‎
Copy file name to clipboard
+47-29Lines changed: 47 additions & 29 deletions b/Collapse file: lib/cli-engine/lint-result-cache.js
‎lib/cli-engine/lint-result-cache.js‎
Copy file name to clipboard
+47-29Lines changed: 47 additions & 29 deletions
diff --git a/Collapse file: lib/eslint/eslint-helpers.js
‎lib/eslint/eslint-helpers.js‎
Copy file name to clipboard
+6-3Lines changed: 6 additions & 3 deletions b/Collapse file: lib/eslint/eslint-helpers.js
‎lib/eslint/eslint-helpers.js‎
Copy file name to clipboard
+6-3Lines changed: 6 additions & 3 deletions
@@ -17,6 +17,12 @@ const hash = require("./hash");
 
 const debug = require("debug")("eslint:lint-result-cache");
 
+//------------------------------------------------------------------------------
+// Typedefs
+//------------------------------------------------------------------------------
+
+/** @typedef {import("../types").Linter.Config} Config */
+
 //-----------------------------------------------------------------------------
 // Helpers
 //-----------------------------------------------------------------------------
@@ -40,7 +46,7 @@ function isValidCacheStrategy(cacheStrategy) {
 
 /**
  * Calculates the hash of the config
- * @param {ConfigArray} config The config.
+ * @param {Config} config The config.
  * @returns {string} The hash of the config
  */
 function hashOfConfigFor(config) {
@@ -96,38 +102,13 @@ class LintResultCache {
 	 * cache. If the file is present and has not been changed, rebuild any
 	 * missing result information.
 	 * @param {string} filePath The file for which to retrieve lint results.
-	 * @param {ConfigArray} config The config of the file.
+	 * @param {Config} config The config of the file.
 	 * @returns {Object|null} The rebuilt lint results, or null if the file is
 	 *   changed or not in the filesystem.
 	 */
 	getCachedLintResults(filePath, config) {
-		/*
-		 * Cached lint results are valid if and only if:
-		 * 1. The file is present in the filesystem
-		 * 2. The file has not changed since the time it was previously linted
-		 * 3. The ESLint configuration has not changed since the time the file
-		 *    was previously linted
-		 * If any of these are not true, we will not reuse the lint results.
-		 */
-		const fileDescriptor = this.fileEntryCache.getFileDescriptor(filePath);
-		const hashOfConfig = hashOfConfigFor(config);
-		const changed =
-			fileDescriptor.changed ||
-			fileDescriptor.meta.hashOfConfig !== hashOfConfig;
+		const cachedResults = this.getValidCachedLintResults(filePath, config);
 
-		if (fileDescriptor.notFound) {
-			debug(`File not found on the file system: ${filePath}`);
-			return null;
-		}
-
-		if (changed) {
-			debug(`Cache entry not found or no longer valid: ${filePath}`);
-			return null;
-		}
-
-		const cachedResults = fileDescriptor.meta.results;
-
-		// Just in case, not sure if this can ever happen.
 		if (!cachedResults) {
 			return cachedResults;
 		}
@@ -151,14 +132,51 @@ class LintResultCache {
 		return results;
 	}
 
+	/**
+	 * Retrieve cached lint results for a given file path, if present in the
+	 * cache and still valid.
+	 * @param {string} filePath The file for which to retrieve lint results.
+	 * @param {Config} config The config of the file.
+	 * @returns {Object|null} The cached lint results if present in the cache
+	 * and still valid; null otherwise.
+	 */
+	getValidCachedLintResults(filePath, config) {
+		/*
+		 * Cached lint results are valid if and only if:
+		 * 1. The file is present in the filesystem
+		 * 2. The file has not changed since the time it was previously linted
+		 * 3. The ESLint configuration has not changed since the time the file
+		 *    was previously linted
+		 * If any of these are not true, we will not reuse the lint results.
+		 */
+		const fileDescriptor = this.fileEntryCache.getFileDescriptor(filePath);
+
+		if (fileDescriptor.notFound) {
+			debug(`File not found on the file system: ${filePath}`);
+			return null;
+		}
+
+		const hashOfConfig = hashOfConfigFor(config);
+		const changed =
+			fileDescriptor.changed ||
+			fileDescriptor.meta.hashOfConfig !== hashOfConfig;
+
+		if (changed) {
+			debug(`Cache entry not found or no longer valid: ${filePath}`);
+			return null;
+		}
+
+		return fileDescriptor.meta.results;
+	}
+
 	/**
 	 * Set the cached lint results for a given file path, after removing any
 	 * information that will be both unnecessary and difficult to serialize.
 	 * Avoids caching results with an "output" property (meaning fixes were
 	 * applied), to prevent potentially incorrect results if fixes are not
 	 * written to disk.
 	 * @param {string} filePath The file for which to set lint results.
-	 * @param {ConfigArray} config The config of the file.
+	 * @param {Config} config The config of the file.
 	 * @param {Object} result The lint result to be set for the file.
 	 * @returns {void}
 	 */
 
@@ -29,6 +29,7 @@ const createDebug = require("debug");
 
 const Minimatch = minimatch.Minimatch;
 const MINIMATCH_OPTIONS = { dot: true };
+const hrtimeBigint = process.hrtime.bigint;
 
 //-----------------------------------------------------------------------------
 // Types
@@ -55,13 +56,13 @@ const MINIMATCH_OPTIONS = { dot: true };
  */
 
 //------------------------------------------------------------------------------
-// Internal Helpers
+// Debug Helpers
 //------------------------------------------------------------------------------
 
-const hrtimeBigint = process.hrtime.bigint;
-
+// Add %t formatter to print bigint nanosecond times in milliseconds.
 createDebug.formatters.t = timeDiff =>
 	`${(timeDiff + 500_000n) / 1_000_000n} ms`;
+
 const debug = createDebug(
 	`eslint:eslint-helpers${isMainThread ? "" : `:thread-${threadId}`}`,
 );
@@ -1437,6 +1438,8 @@ function createConfigLoader(
 //-----------------------------------------------------------------------------
 
 module.exports = {
+	createDebug,
+
 	findFiles,
 
 	isNonEmptyString,