SLCORE-1212 Don't fail on git blaming newly created file

Author: kirill-knize-sonarsource

backend/commons/src/main/java/org/sonarsource/sonarlint/core/commons/util/git/GitUtils.java

@@ -55,6 +55,7 @@
 import org.sonarsource.sonarlint.core.commons.SonarLintGitIgnore;
 import org.sonarsource.sonarlint.core.commons.Version;
 import org.sonarsource.sonarlint.core.commons.log.SonarLintLogger;
+import org.sonarsource.sonarlint.core.commons.util.git.exceptions.GitRepoNotFoundException;
 
 import static java.util.Optional.ofNullable;
 import static org.eclipse.jgit.lib.Constants.GITIGNORE_FILENAME;

backend/commons/src/main/java/org/sonarsource/sonarlint/core/commons/util/git/ProcessWrapperFactory.java

@@ -30,6 +30,8 @@
 import java.util.function.Consumer;
 import javax.annotation.Nullable;
 import org.sonarsource.sonarlint.core.commons.log.SonarLintLogger;
+import org.sonarsource.sonarlint.core.commons.util.git.exceptions.GitRepoNotFoundException;
+import org.sonarsource.sonarlint.core.commons.util.git.exceptions.NoSuchPathException;
 
 import static java.lang.String.format;
 import static java.lang.String.join;
@@ -74,7 +76,15 @@ private static void processInputStream(InputStream inputStream, Consumer<String>
     }
 
     private static boolean isNotAGitRepo(LinkedList<String> output) {
-      return output.stream().anyMatch(line -> line.contains("not a git repository"));
+      return outputContains(output, "not a git repository");
+    }
+
+    private static boolean noSuchPath(LinkedList<String> output) {
+      return outputContains(output, "no such path");
+    }
+
+    private static boolean outputContains(LinkedList<String> output, String text) {
+      return output.stream().anyMatch(line -> line.contains(text));
     }
 
     public void execute() throws IOException {
@@ -104,8 +114,10 @@ public void execute() throws IOException {
         int exit = p.waitFor();
         if (exit != 0) {
           if (isNotAGitRepo(output)) {
-            var dirStr = baseDir != null ? baseDir.toString() : "null";
-            throw new GitRepoNotFoundException(dirStr);
+            throw new GitRepoNotFoundException(getBaseDir());
+          }
+          if (noSuchPath(output)) {
+            throw new NoSuchPathException(getBaseDir());
           }
           var gitBlameOutput = join(System.lineSeparator(), output);
           throw new IllegalStateException(format("Command execution exited with code: %d and error message: %s", exit, gitBlameOutput));
@@ -117,6 +129,10 @@ public void execute() throws IOException {
         p.destroy();
       }
     }
+
+    private String getBaseDir() {
+      return baseDir != null ? baseDir.toString() : "null";
+    }
   }
 
 }

backend/commons/src/main/java/org/sonarsource/sonarlint/core/commons/util/git/exceptions/GitException.java

@@ -0,0 +1,32 @@
+/*
+ * SonarLint Core - Commons
+ * Copyright (C) 2016-2025 SonarSource SA
+ * mailto:info AT sonarsource DOT com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+package org.sonarsource.sonarlint.core.commons.util.git.exceptions;
+
+public class GitException extends IllegalStateException {
+  private final String path;
+
+  public GitException(String path) {
+    this.path = path;
+  }
+
+  public String getPath() {
+    return path;
+  }
+}

backend/commons/src/main/java/org/sonarsource/sonarlint/core/commons/util/git/GitRepoNotFoundException.java backend/commons/src/main/java/org/sonarsource/sonarlint/core/commons/util/git/exceptions/GitRepoNotFoundException.java

@@ -17,16 +17,12 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonarsource.sonarlint.core.commons.util.git;
+package org.sonarsource.sonarlint.core.commons.util.git.exceptions;
 
-public class GitRepoNotFoundException extends IllegalStateException {
-  private final String path;
+public class GitRepoNotFoundException extends GitException {
 
   public GitRepoNotFoundException(String path) {
-    this.path = path;
+    super(path);
   }
 
-  public String getPath() {
-    return path;
-  }
 }

backend/commons/src/main/java/org/sonarsource/sonarlint/core/commons/util/git/exceptions/NoSuchPathException.java

@@ -0,0 +1,26 @@
+/*
+ * SonarLint Core - Commons
+ * Copyright (C) 2016-2025 SonarSource SA
+ * mailto:info AT sonarsource DOT com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+package org.sonarsource.sonarlint.core.commons.util.git.exceptions;
+
+public class NoSuchPathException extends GitException {
+  public NoSuchPathException(String path) {
+    super(path);
+  }
+}

backend/commons/src/main/java/org/sonarsource/sonarlint/core/commons/util/git/exceptions/package-info.java

@@ -0,0 +1,23 @@
+/*
+ * SonarLint Core - Commons
+ * Copyright (C) 2016-2025 SonarSource SA
+ * mailto:info AT sonarsource DOT com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+@ParametersAreNonnullByDefault
+package org.sonarsource.sonarlint.core.commons.util.git.exceptions;
+
+import javax.annotation.ParametersAreNonnullByDefault;

backend/commons/src/test/java/org/sonarsource/sonarlint/core/commons/util/git/GitUtilsTest.java

@@ -53,6 +53,7 @@
 import org.sonarsource.sonarlint.core.commons.LogTestStartAndEnd;
 import org.sonarsource.sonarlint.core.commons.log.LogOutput;
 import org.sonarsource.sonarlint.core.commons.log.SonarLintLogTester;
+import org.sonarsource.sonarlint.core.commons.util.git.exceptions.NoSuchPathException;
 
 import static java.util.function.Predicate.not;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -123,6 +124,17 @@ void it_should_blame_file() throws IOException, GitAPIException {
       .allMatch(date -> date.equals(c1));
   }
 
+  @Test
+  void it_should_not_blame_new_file() throws IOException {
+    createFile(projectDirPath, "fileA", "line1", "line2", "line3");
+
+    var fileAPath = projectDirPath.resolve("fileA");
+    var filePaths = Set.of(fileAPath);
+    var fileUris = Set.of(fileAPath.toUri());
+    var now = Instant.now();
+    assertThrows(NoSuchPathException.class, () -> getBlameResult(projectDirPath, filePaths, fileUris, path -> "", now));
+  }
+
   @Test
   void it_should_fallback_to_jgit_blame() throws IOException, GitAPIException {
     createFile(projectDirPath, "fileA", "line1", "line2", "line3");

backend/core/src/main/java/org/sonarsource/sonarlint/core/tracking/TrackingService.java

@@ -44,7 +44,7 @@
 import org.sonarsource.sonarlint.core.commons.RuleType;
 import org.sonarsource.sonarlint.core.commons.SonarLintBlameResult;
 import org.sonarsource.sonarlint.core.commons.log.SonarLintLogger;
-import org.sonarsource.sonarlint.core.commons.util.git.GitRepoNotFoundException;
+import org.sonarsource.sonarlint.core.commons.util.git.exceptions.GitException;
 import org.sonarsource.sonarlint.core.file.PathTranslationService;
 import org.sonarsource.sonarlint.core.local.only.LocalOnlyIssueStorageService;
 import org.sonarsource.sonarlint.core.newcode.NewCodeService;
@@ -282,8 +282,8 @@ private IntroductionDateProvider getIntroductionDateProvider(String configuratio
         var thresholdDate = newCodeDefinition.map(NewCodeDefinition::getThresholdDate).orElse(NewCodeDefinition.withAlwaysNew().getThresholdDate());
         var sonarLintBlameResult = getBlameResult(baseDir, fileRelativePaths, fileUris, fileContentProvider, thresholdDate);
         return (filePath, lineNumbers) -> determineIntroductionDate(filePath, lineNumbers, sonarLintBlameResult);
-      } catch (GitRepoNotFoundException e) {
-        LOG.info("Git Repository not found for {}. The path {} is not in a Git repository", configurationScopeId, e.getPath());
+      } catch (GitException e) {
+        LOG.info("Could not get git blame data for file {} in {}. ", e.getPath(), configurationScopeId);
       } catch (Exception e) {
         LOG.error("Cannot access blame info for " + configurationScopeId, e);
       }