SLCORE-1302 Do not include client file exclusions when bound (#1400)

Author: nquinquenel

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

@@ -88,6 +88,7 @@ public static Set<URI> getVCSChangedFiles(@Nullable Path baseDir) {
       var untracked = status.getUntracked().stream().filter(f -> !f.equals(GITIGNORE_FILENAME));
       return Stream.concat(uncommitted, untracked)
         .map(workTreePath::resolve)
+        .filter(path -> path.normalize().startsWith(baseDir.normalize()))
         .map(Path::toUri)
         .collect(Collectors.toSet());
     } catch (GitAPIException | GitException e) {

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

@@ -433,4 +433,32 @@ void should_return_empty_blame_result_if_no_commits_in_repo() throws IOException
     }
   }
 
+  @Test
+  void it_should_only_return_files_under_baseDir() throws IOException, GitAPIException {
+    // Create files in root and in a subfolder
+    var rootFile = "rootFile.txt";
+    var subDir = projectDirPath.resolve("subdir");
+    Files.createDirectories(subDir);
+    var subFile = subDir.resolve("subFile.txt");
+    createFile(projectDirPath, rootFile, "root");
+    createFile(subDir, "subFile.txt", "sub");
+
+    // Add and commit both files
+    git.add().addFilepattern(rootFile).call();
+    git.add().addFilepattern("subdir/subFile.txt").call();
+    commit(git, rootFile);
+    commit(git, "subdir/subFile.txt");
+
+    // Modify both files (so they appear as changed)
+    modifyFile(projectDirPath.resolve(rootFile), "root", "changed");
+    modifyFile(subFile, "sub", "changed");
+
+    // getVCSChangedFiles for subdir should only return subFile
+    var changedFiles = getVCSChangedFiles(subDir);
+
+    assertThat(changedFiles)
+      .contains(subFile.toUri())
+      .doesNotContain(projectDirPath.resolve(rootFile).toUri());
+  }
+
 }

backend/core/src/main/java/org/sonarsource/sonarlint/core/BindingCandidatesFinder.java

@@ -68,7 +68,7 @@ private Optional<ConfigurationScopeSharedContext> checkIfScopeIsGoodCandidateFor
     ConfigurationScope scope, String connectionId, String projectKey, SonarLintCancelMonitor cancelMonitor) {
     cancelMonitor.checkCanceled();
 
-    var cluesAndConnections = bindingClueProvider.collectBindingCluesWithConnections(scope.getId(), Set.of(connectionId), cancelMonitor);
+    var cluesAndConnections = bindingClueProvider.collectBindingCluesWithConnections(scope.id(), Set.of(connectionId), cancelMonitor);
 
     var cluesWithMatchingProjectKey = cluesAndConnections.stream()
       .filter(c -> projectKey.equals(c.getBindingClue().getSonarProjectKey()))
@@ -79,18 +79,18 @@ private Optional<ConfigurationScopeSharedContext> checkIfScopeIsGoodCandidateFor
       var isFromSharedConfiguration = cluesWithMatchingProjectKey.stream().anyMatch(c -> c.getBindingClue().isFromSharedConfiguration());
       return Optional.of(new ConfigurationScopeSharedContext(scope, isFromSharedConfiguration));
     }
-    var configScopeName = scope.getName();
+    var configScopeName = scope.name();
     if (isNotBlank(configScopeName) && isConfigScopeNameCloseEnoughToSonarProject(configScopeName, connectionId, projectKey, cancelMonitor)) {
       return Optional.of(new ConfigurationScopeSharedContext(scope, false));
     }
     return Optional.empty();
   }
 
   private static Set<ConfigurationScopeSharedContext> filterOutLeafCandidates(Set<ConfigurationScopeSharedContext> candidates) {
-    var candidateIds = candidates.stream().map(ConfigurationScopeSharedContext::getConfigurationScope).map(ConfigurationScope::getId).collect(Collectors.toSet());
+    var candidateIds = candidates.stream().map(ConfigurationScopeSharedContext::getConfigurationScope).map(ConfigurationScope::id).collect(Collectors.toSet());
     return candidates.stream().filter(bindableConfig -> {
       var scope = bindableConfig.getConfigurationScope();
-      var parentId = scope.getParentId();
+      var parentId = scope.parentId();
       return parentId == null || !candidateIds.contains(parentId);
     }).collect(Collectors.toSet());
   }

backend/core/src/main/java/org/sonarsource/sonarlint/core/BindingSuggestionProvider.java

@@ -78,7 +78,7 @@ public BindingSuggestionProvider(ConfigurationRepository configRepository, Conne
   @EventListener
   public void bindingConfigChanged(BindingConfigChangedEvent event) {
     // Check if binding suggestion was switched on
-    if (!event.newConfig().isBindingSuggestionDisabled() && event.previousConfig().isBindingSuggestionDisabled()) {
+    if (!event.newConfig().bindingSuggestionDisabled() && event.previousConfig().bindingSuggestionDisabled()) {
       suggestBindingForGivenScopesAndAllConnections(Set.of(event.configScopeId()));
     }
   }
@@ -170,7 +170,7 @@ private List<BindingSuggestionDto> suggestBindingForEligibleScope(String checked
       }
     }
     if (suggestions.isEmpty()) {
-      var configScopeName = Optional.ofNullable(configRepository.getConfigurationScope(checkedConfigScopeId)).map(ConfigurationScope::getName).orElse(null);
+      var configScopeName = Optional.ofNullable(configRepository.getConfigurationScope(checkedConfigScopeId)).map(ConfigurationScope::name).orElse(null);
       if (isNotBlank(configScopeName)) {
         var cluesWithoutProjectKey = cluesAndConnections.stream().filter(c -> c.getBindingClue().getSonarProjectKey() == null).toList();
         for (var bindingClueWithConnections : cluesWithoutProjectKey) {
@@ -216,15 +216,15 @@ private boolean isScopeEligibleForBindingSuggestion(String configScopeId) {
       LOG.debug("Configuration scope '{}' is gone.", configScopeId);
       return false;
     }
-    if (!configScope.isBindable()) {
+    if (!configScope.bindable()) {
       LOG.debug("Configuration scope '{}' is not bindable.", configScopeId);
       return false;
     }
     if (isValidBinding(bindingConfiguration)) {
       LOG.debug("Configuration scope '{}' is already bound.", configScopeId);
       return false;
     }
-    if (bindingConfiguration.isBindingSuggestionDisabled()) {
+    if (bindingConfiguration.bindingSuggestionDisabled()) {
       LOG.debug("Configuration scope '{}' has binding suggestions disabled.", configScopeId);
       return false;
     }

backend/core/src/main/java/org/sonarsource/sonarlint/core/ConfigurationService.java

@@ -59,7 +59,7 @@ public void didAddConfigurationScopes(List<ConfigurationScopeDto> addedScopes) {
       if (previous != null) {
         LOG.error("Duplicate configuration scope registered: {}", addedDto.getId());
       } else {
-        LOG.debug("Added configuration scope '{}'", configScopeInReferential.getId());
+        LOG.debug("Added configuration scope '{}'", configScopeInReferential.id());
         addedIds.add(new ConfigurationScopeWithBinding(configScopeInReferential, bindingConfigInReferential));
       }
     }
@@ -102,7 +102,7 @@ public void connectionRemoved(ConnectionConfigurationRemovedEvent event) {
     var bindingConfigurationByConfigScope = repository.removeBindingForConnection(event.getRemovedConnectionId());
     bindingConfigurationByConfigScope.forEach((configScope, bindingConfiguration) ->
       applicationEventPublisher.publishEvent(new BindingConfigChangedEvent(configScope, bindingConfiguration,
-        BindingConfiguration.noBinding(bindingConfiguration.isBindingSuggestionDisabled()))));
+        BindingConfiguration.noBinding(bindingConfiguration.bindingSuggestionDisabled()))));
   }
 
   @CheckForNull

backend/core/src/main/java/org/sonarsource/sonarlint/core/SharedConnectedModeSettingsProvider.java

@@ -58,8 +58,8 @@ public SharedConnectedModeSettingsProvider(ConfigurationRepository configuration
   public String getSharedConnectedModeConfigFileContents(String configScopeId) {
     var bindingConfiguration = configurationRepository.getBindingConfiguration(configScopeId);
     if (bindingConfiguration != null && bindingConfiguration.isBound()) {
-      var projectKey = bindingConfiguration.getSonarProjectKey();
-      var connectionId = bindingConfiguration.getConnectionId();
+      var projectKey = bindingConfiguration.sonarProjectKey();
+      var connectionId = bindingConfiguration.connectionId();
 
       var connection =  Objects.requireNonNull(connectionRepository.getConnectionById(Objects.requireNonNull(connectionId)));
       telemetryService.exportedConnectedMode();

backend/core/src/main/java/org/sonarsource/sonarlint/core/VersionSoonUnsupportedHelper.java

@@ -75,7 +75,7 @@ public void configurationScopesAdded(ConfigurationScopesAddedWithBindingEvent ev
   @EventListener
   public void bindingConfigChanged(BindingConfigChangedEvent event) {
     var configScopeId = event.configScopeId();
-    var connectionId = event.newConfig().getConnectionId();
+    var connectionId = event.newConfig().connectionId();
     if (connectionId != null) {
       queueCheckIfSoonUnsupported(connectionId, configScopeId);
     }

backend/core/src/main/java/org/sonarsource/sonarlint/core/analysis/AnalysisService.java

@@ -513,7 +513,7 @@ public void onConfigurationScopeAdded(ConfigurationScopesAddedWithBindingEvent e
   public void onConfigurationScopeRemoved(ConfigurationScopeRemovedEvent event) {
     var removedConfigurationScopeId = event.getRemovedConfigurationScopeId();
     analysisReadinessByConfigScopeId.remove(removedConfigurationScopeId);
-    schedulerCache.unregisterModule(removedConfigurationScopeId, event.getRemovedBindingConfiguration().getConnectionId());
+    schedulerCache.unregisterModule(removedConfigurationScopeId, event.getRemovedBindingConfiguration().connectionId());
   }
 
   @EventListener

backend/core/src/main/java/org/sonarsource/sonarlint/core/embedded/server/RequestHandlerBindingAssistant.java

@@ -43,17 +43,12 @@
 import org.sonarsource.sonarlint.core.repository.config.ConfigurationRepository;
 import org.sonarsource.sonarlint.core.repository.connection.ConnectionConfigurationRepository;
 import org.sonarsource.sonarlint.core.rpc.protocol.SonarLintRpcClient;
-import org.sonarsource.sonarlint.core.rpc.protocol.backend.connection.common.TransientSonarCloudConnectionDto;
-import org.sonarsource.sonarlint.core.rpc.protocol.backend.connection.common.TransientSonarQubeConnectionDto;
 import org.sonarsource.sonarlint.core.rpc.protocol.client.binding.AssistBindingParams;
 import org.sonarsource.sonarlint.core.rpc.protocol.client.binding.NoBindingSuggestionFoundParams;
 import org.sonarsource.sonarlint.core.rpc.protocol.client.connection.AssistCreatingConnectionParams;
 import org.sonarsource.sonarlint.core.rpc.protocol.client.connection.AssistCreatingConnectionResponse;
 import org.sonarsource.sonarlint.core.rpc.protocol.client.message.MessageType;
 import org.sonarsource.sonarlint.core.rpc.protocol.client.message.ShowMessageParams;
-import org.sonarsource.sonarlint.core.rpc.protocol.common.Either;
-import org.sonarsource.sonarlint.core.rpc.protocol.common.TokenDto;
-import org.sonarsource.sonarlint.core.rpc.protocol.common.UsernamePasswordDto;
 
 public class RequestHandlerBindingAssistant {
 
@@ -229,7 +224,7 @@ NewBinding assistBinding(String connectionId, boolean isSonarCloud, String proje
       return new NewBinding(connectionId, null);
     }
     var bindableConfig = configScopeCandidates.iterator().next();
-    var future = client.assistBinding(new AssistBindingParams(connectionId, projectKey, bindableConfig.getConfigurationScope().getId(),
+    var future = client.assistBinding(new AssistBindingParams(connectionId, projectKey, bindableConfig.getConfigurationScope().id(),
       bindableConfig.isFromSharedConfiguration()));
     cancelMonitor.onCancel(() -> future.cancel(true));
     var response = future.join();

backend/core/src/main/java/org/sonarsource/sonarlint/core/event/ConfigurationScopeRemovedEvent.java

@@ -32,7 +32,7 @@ public ConfigurationScopeRemovedEvent(ConfigurationScope removedConfigurationSco
   }
 
   public String getRemovedConfigurationScopeId() {
-    return removedConfigurationScope.getId();
+    return removedConfigurationScope.id();
   }
 
   public ConfigurationScope getRemovedConfigurationScope() {