Do not enable notifications if disabled

SonarSource · Dec 17, 2020 · 3092f8d · 3092f8d
1 parent ae73a22
commit 3092f8d
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 9 deletions.
diff --git a/....core/src/org/sonarlint/eclipse/core/internal/engine/connected/ConnectedEngineFacade.java b/....core/src/org/sonarlint/eclipse/core/internal/engine/connected/ConnectedEngineFacade.java
@@ -633,4 +633,8 @@ public List<ServerIssue> downloadServerIssues(ProjectBinding projectBinding, Str
   public List<ServerIssue> getServerIssues(ProjectBinding projectBinding, String filePath) {
     return withEngine(engine -> engine.getServerIssues(projectBinding, filePath)).orElse(emptyList());
   }
+
+  public ProjectBinding calculatePathPrefixes(String projectKey, List<String> ideFilePaths) {
+    return withEngine(engine -> engine.calculatePathPrefixes(projectKey, ideFilePaths)).orElse(new ProjectBinding(projectKey, "", ""));
+  }
 }
diff --git a/...nt.eclipse.core/src/org/sonarlint/eclipse/core/internal/jobs/ProjectStorageUpdateJob.java b/...nt.eclipse.core/src/org/sonarlint/eclipse/core/internal/jobs/ProjectStorageUpdateJob.java
@@ -29,23 +29,23 @@
 
 public class ProjectStorageUpdateJob extends Job {
 
-  private final String serverId;
+  private final String connectionId;
   private final String projectKey;
 
-  public ProjectStorageUpdateJob(String serverId, String projectKey) {
-    super("Update SonarLint binding data for project '" + projectKey + "' on '" + serverId + "'");
-    this.serverId = serverId;
+  public ProjectStorageUpdateJob(String connectionId, String projectKey) {
+    super("Update SonarLint binding data for project '" + projectKey + "' on '" + connectionId + "'");
+    this.connectionId = connectionId;
     this.projectKey = projectKey;
   }
 
   @Override
   protected IStatus run(IProgressMonitor monitor) {
     try {
-      Optional<IConnectedEngineFacade> server = SonarLintCorePlugin.getServersManager().findById(serverId);
+      Optional<IConnectedEngineFacade> server = SonarLintCorePlugin.getServersManager().findById(connectionId);
       server.ifPresent(s -> s.updateProjectStorage(projectKey, monitor));
       return Status.OK_STATUS;
     } catch (Exception e) {
-      return new Status(IStatus.ERROR, SonarLintCorePlugin.PLUGIN_ID, "Unable to update SonarLint binding data for project '" + projectKey + "' on '" + serverId + "'", e);
+      return new Status(IStatus.ERROR, SonarLintCorePlugin.PLUGIN_ID, "Unable to update SonarLint binding data for project '" + projectKey + "' on '" + connectionId + "'", e);
     }
   }
 }
diff --git a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/SonarLintUiPlugin.java b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/SonarLintUiPlugin.java
@@ -297,9 +297,13 @@ public static void startupAsync() {
   public static void subscribeToNotifications(ISonarLintProject project) {
     SonarLintCorePlugin.getServersManager()
       .resolveBinding(project)
-      .ifPresent(binding -> SonarLintCorePlugin.getInstance()
-        .notificationsManager()
-        .subscribe(project, getDefault().listenerFactory().create(binding.getEngineFacade())));
+      .ifPresent(binding -> {
+        if (!binding.getEngineFacade().areNotificationsDisabled()) {
+          SonarLintCorePlugin.getInstance()
+            .notificationsManager()
+            .subscribe(project, getDefault().listenerFactory().create(binding.getEngineFacade()));
+        }
+      });
   }
 
   public static void unsubscribeToNotifications(ISonarLintProject project) {

diff --git a/...ui/src/org/sonarlint/eclipse/ui/internal/binding/wizard/project/ProjectBindingWizard.java b/...ui/src/org/sonarlint/eclipse/ui/internal/binding/wizard/project/ProjectBindingWizard.java
@@ -191,6 +191,7 @@ public boolean performFinish() {
       String oldServerId = projectConfig.getProjectBinding().map(EclipseProjectBinding::connectionId).orElse(null);
       String oldProjectKey = projectConfig.getProjectBinding().map(EclipseProjectBinding::projectKey).orElse(null);
       if (!Objects.equals(serverId, oldServerId) || !Objects.equals(projectKey, oldProjectKey)) {
+        // We can ignore path prefixes for now, they will be update by the ProjectStorageUpdateJob
         projectConfig.setProjectBinding(new EclipseProjectBinding(serverId, projectKey, "", ""));
         changed = true;
       }