From d8d3ea21d3798377b4e3c8d65e9ad1d48f611533 Mon Sep 17 00:00:00 2001
From: Rhys Arkins <rhys@arkins.net>
Date: Thu, 6 Jul 2023 15:41:29 +0200
Subject: [PATCH] fix: log packageRule when recommending matchDepX (#23216)

---
 lib/util/package-rules/package-names.ts    | 5 +++--
 lib/util/package-rules/package-patterns.ts | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/lib/util/package-rules/package-names.ts b/lib/util/package-rules/package-names.ts
index 8e647a8014..ec93dd8d67 100644
--- a/lib/util/package-rules/package-names.ts
+++ b/lib/util/package-rules/package-names.ts
@@ -6,8 +6,9 @@ import { Matcher } from './base';
 export class PackageNameMatcher extends Matcher {
   override matches(
     { depName, packageName }: PackageRuleInputConfig,
-    { matchPackageNames }: PackageRule
+    packageRule: PackageRule
   ): boolean | null {
+    const { matchPackageNames } = packageRule;
     if (is.undefined(matchPackageNames)) {
       return null;
     }
@@ -21,7 +22,7 @@ export class PackageNameMatcher extends Matcher {
 
     if (matchPackageNames.includes(depName)) {
       logger.once.warn(
-        { packageName, depName },
+        { packageRule, packageName, depName },
         'Use matchDepNames instead of matchPackageNames'
       );
       return true;
diff --git a/lib/util/package-rules/package-patterns.ts b/lib/util/package-rules/package-patterns.ts
index a7fc03e2c0..986208de6b 100644
--- a/lib/util/package-rules/package-patterns.ts
+++ b/lib/util/package-rules/package-patterns.ts
@@ -21,8 +21,9 @@ function matchPatternsAgainstName(
 export class PackagePatternsMatcher extends Matcher {
   override matches(
     { depName, packageName }: PackageRuleInputConfig,
-    { matchPackagePatterns }: PackageRule
+    packageRule: PackageRule
   ): boolean | null {
+    const { matchPackagePatterns } = packageRule;
     if (is.undefined(matchPackagePatterns)) {
       return null;
     }
@@ -39,7 +40,7 @@ export class PackagePatternsMatcher extends Matcher {
     }
     if (matchPatternsAgainstName(matchPackagePatterns, depName)) {
       logger.once.warn(
-        { packageName, depName },
+        { packageRule, packageName, depName },
         'Use matchDepPatterns instead of matchPackagePatterns'
       );
       return true;
-- 
GitLab