New code for pre commit, fix count when filtering & current file resolve

SonarSource · Oct 6, 2023 · c117ebd · c117ebd
1 parent c5b98f3
commit c117ebd
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 10 deletions.
diff --git a/src/main/java/org/sonarlint/intellij/actions/SonarLintToolWindow.java b/src/main/java/org/sonarlint/intellij/actions/SonarLintToolWindow.java
@@ -184,8 +184,7 @@ public void refreshViews() {
     var hotspotContent = getSecurityHotspotContent();
     if (hotspotContent != null) {
       var hotspotsPanel = (SecurityHotspotsPanel) hotspotContent.getComponent();
-      hotspotsPanel.refreshView();
-      hotspotContent.setDisplayName(buildTabName(hotspotsPanel.getSecurityHotspotCount(), SonarLintToolWindowFactory.SECURITY_HOTSPOTS_TAB_TITLE));
+      hotspotContent.setDisplayName(buildTabName(hotspotsPanel.refreshView(), SonarLintToolWindowFactory.SECURITY_HOTSPOTS_TAB_TITLE));
     }
 
     var taintContent = getTaintVulnerabilitiesContent();

diff --git a/src/main/java/org/sonarlint/intellij/trigger/SonarLintCheckinHandler.java b/src/main/java/org/sonarlint/intellij/trigger/SonarLintCheckinHandler.java
@@ -44,11 +44,13 @@
 import org.sonarlint.intellij.actions.SonarLintToolWindow;
 import org.sonarlint.intellij.analysis.AnalysisResult;
 import org.sonarlint.intellij.analysis.AnalysisSubmitter;
+import org.sonarlint.intellij.cayc.CleanAsYouCodeService;
 import org.sonarlint.intellij.common.util.SonarLintUtils;
 import org.sonarlint.intellij.finding.issue.LiveIssue;
 import org.sonarsource.sonarlint.core.commons.IssueSeverity;
 import org.sonarsource.sonarlint.core.commons.Language;
 
+import static org.sonarlint.intellij.common.util.SonarLintUtils.getService;
 import static org.sonarlint.intellij.config.Settings.getGlobalSettings;
 
 public class SonarLintCheckinHandler extends CheckinHandler {
@@ -103,15 +105,18 @@ private void handleError(Exception e, int numFiles) {
 
   private ReturnResult processResult(AnalysisResult result) {
     var issuesPerFile = result.getFindings().getIssuesPerFile();
+    var shouldFocusOnNewCode = getService(CleanAsYouCodeService.class).shouldFocusOnNewCode(project);
 
     var numIssues = issuesPerFile.entrySet().stream()
       .flatMap(e -> e.getValue().stream())
       .filter(Predicate.not(LiveIssue::isResolved))
+      .filter(issue -> !shouldFocusOnNewCode || issue.isOnNewCode())
       .count();
 
     var numBlockerIssues = issuesPerFile.entrySet().stream()
       .flatMap(e -> e.getValue().stream())
       .filter(Predicate.not(LiveIssue::isResolved))
+      .filter(issue -> !shouldFocusOnNewCode || issue.isOnNewCode())
       .filter(i -> IssueSeverity.BLOCKER.equals(i.getUserSeverity()))
       .count();
 
@@ -122,7 +127,11 @@ private ReturnResult processResult(AnalysisResult result) {
     var numFiles = issuesPerFile.keySet().size();
 
     var issues = issuesPerFile.values().stream().flatMap(Collection::stream).collect(Collectors.toList());
-    var numSecretsIssues = issues.stream().filter(issue -> issue.getRuleKey().startsWith(Language.SECRETS.getLanguageKey())).count();
+    var numSecretsIssues = issues.stream()
+      .filter(issue -> !shouldFocusOnNewCode || issue.isOnNewCode())
+      .filter(issue -> issue.getRuleKey()
+        .startsWith(Language.SECRETS.getLanguageKey()))
+      .count();
     var msg = createMessage(numFiles, numIssues, numBlockerIssues, numSecretsIssues);
 
     var choice = showYesNoCancel(msg);

diff --git a/src/main/java/org/sonarlint/intellij/ui/CurrentFilePanel.java b/src/main/java/org/sonarlint/intellij/ui/CurrentFilePanel.java
@@ -104,6 +104,7 @@ public CurrentFilePanel(Project project) {
 
   public void allowResolvedIssues(boolean allowResolved) {
     treeBuilder.allowResolvedIssues(allowResolved);
+    oldTreeBuilder.allowResolvedIssues(allowResolved);
     refreshModel();
   }
 

diff --git a/src/main/java/org/sonarlint/intellij/ui/SecurityHotspotsPanel.java b/src/main/java/org/sonarlint/intellij/ui/SecurityHotspotsPanel.java
@@ -89,11 +89,6 @@ public class SecurityHotspotsPanel extends SimpleToolWindowPanel implements Disp
   private SecurityHotspotsLocalDetectionSupport status;
   private int securityHotspotCount;
   private Map<VirtualFile, Collection<LiveSecurityHotspot>> currentFindings;
-
-  public int getSecurityHotspotCount() {
-    return securityHotspotCount;
-  }
-
   private int oldSecurityHotspotCount;
   private JBPanelWithEmptyText notSupportedPanel;
   private AnAction sonarConfigureProject;
@@ -400,9 +395,11 @@ public void dispose() {
     // Nothing to do
   }
 
-  public void refreshView() {
+  public int refreshView() {
     if (currentFindings != null) {
-      updateHotspots(currentFindings);
+      return updateHotspots(currentFindings);
     }
+    return 0;
   }
+
 }