SLI-1313 Avoid slow operations when opening project settings (#977)

SonarSource · Mar 6, 2024 · 8823c9e · 8823c9e
1 parent 97a906f
commit 8823c9e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/src/main/java/org/sonarlint/intellij/config/project/SonarLintProjectBindPanel.java b/src/main/java/org/sonarlint/intellij/config/project/SonarLintProjectBindPanel.java
@@ -67,6 +67,7 @@
 import static java.awt.GridBagConstraints.NONE;
 import static java.awt.GridBagConstraints.WEST;
 import static java.util.Optional.ofNullable;
+import static org.sonarlint.intellij.util.ThreadUtilsKt.computeOnPooledThread;
 
 public class SonarLintProjectBindPanel {
   private static final String CONNECTION_EMPTY_TEXT = "<No connections configured>";
@@ -289,7 +290,8 @@ public void actionPerformed(ActionEvent e) {
   private void actionConfigureConnections() {
     var allSettings = Settings.KEY.getData(DataManager.getInstance().getDataContext(rootPanel));
     if (allSettings != null) {
-      final var globalConfigurable = allSettings.find(SonarLintGlobalConfigurable.class);
+      final var globalConfigurable = computeOnPooledThread("Find Global Configurable Task",
+        () -> allSettings.find(SonarLintGlobalConfigurable.class));
       if (globalConfigurable != null) {
         allSettings.select(globalConfigurable);
       }

diff --git a/src/main/java/org/sonarlint/intellij/config/project/SonarLintProjectConfigurable.java b/src/main/java/org/sonarlint/intellij/config/project/SonarLintProjectConfigurable.java
@@ -31,6 +31,7 @@
 import javax.swing.JComponent;
 import org.jetbrains.annotations.Nls;
 import org.jetbrains.concurrency.Promise;
+import org.jetbrains.concurrency.Promises;
 import org.sonarlint.intellij.analysis.AnalysisSubmitter;
 import org.sonarlint.intellij.config.global.ServerConnection;
 import org.sonarlint.intellij.config.global.SonarLintGlobalConfigurable;
@@ -43,6 +44,7 @@
 import static org.sonarlint.intellij.common.util.SonarLintUtils.getService;
 import static org.sonarlint.intellij.config.Settings.getGlobalSettings;
 import static org.sonarlint.intellij.config.Settings.getSettingsFor;
+import static org.sonarlint.intellij.util.ThreadUtilsKt.computeOnPooledThread;
 
 /**
  * Coordinates creation of models and visual components from persisted settings.
@@ -119,15 +121,16 @@ public void reset() {
 
   private static Promise<List<ServerConnection>> getServersFromApplicationConfigurable() {
     return DataManager.getInstance().getDataContextFromFocusAsync()
-      .then(dataContext -> {
+      .thenAsync(dataContext -> {
         var allSettings = Settings.KEY.getData(dataContext);
         if (allSettings != null) {
-          final var globalConfigurable = allSettings.find(SonarLintGlobalConfigurable.class);
+          final var globalConfigurable = computeOnPooledThread("Find Global Configurable Task",
+            () -> allSettings.find(SonarLintGlobalConfigurable.class));
           if (globalConfigurable != null) {
-            return globalConfigurable.getCurrentConnections();
+            return Promises.resolvedPromise(globalConfigurable.getCurrentConnections());
           }
         }
-        return null;
+        return Promises.resolvedPromise(null);
       });
   }