From 4828af44b858c825b44732eb24a5c4ceca9ca8b6 Mon Sep 17 00:00:00 2001
From: xudan16 <xudan16@huawei.com>
Date: Wed, 18 Jun 2025 19:26:47 +0800
Subject: [PATCH] fix linter merge problems with homecheck

Issue: https://gitee.com/openharmony/arkcompiler_ets_frontend/issues/ICG629

Signed-off-by: xudan16 <xudan16@huawei.com>
---
 ets2panda/linter/src/cli/LinterCLI.ts | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/ets2panda/linter/src/cli/LinterCLI.ts b/ets2panda/linter/src/cli/LinterCLI.ts
index e45d56a7d5..355850ed9e 100644
--- a/ets2panda/linter/src/cli/LinterCLI.ts
+++ b/ets2panda/linter/src/cli/LinterCLI.ts
@@ -110,12 +110,27 @@ function mergeLintProblems(
       return onlyArkts2SyntaxRules.has(problem.ruleTag);
     });
   }
-  if (cmdOptions.scanWholeProjectInHomecheck && !cmdOptions.inputFiles.includes(filePath)) {
-    filteredProblems = problems.filter((problem) => {
-      return problem.rule.includes('s2d');
-    });
-  }
   mergedProblems.get(filePath)!.push(...filteredProblems);
+
+  if (cmdOptions.scanWholeProjectInHomecheck) {
+    for (const file of mergedProblems.keys()) {
+      if (cmdOptions.inputFiles.includes(file)) {
+        continue;
+      }
+      const totalProblems = mergedProblems.get(file);
+      if (totalProblems === undefined) {
+        continue;
+      }
+      filteredProblems = totalProblems.filter((problem) => {
+          return problem.rule.includes('s2d');
+      });
+      if (filteredProblems.length > 0) {
+        mergedProblems.set(file, filteredProblems);
+      } else {
+        mergedProblems.delete(file);
+      }
+    }
+  }
 }
 
 async function generateReportFile(reportData, reportPath?: string): Promise<void> {
-- 
Gitee