Merge branch 'master' of git.labs.intellij.net:idea/community

java/execution/impl/src/com/intellij/compiler/options/CompileStepBeforeRun.java

@@ -19,6 +19,7 @@ import com.intellij.execution.BeforeRunTask;
 import com.intellij.execution.BeforeRunTaskProvider;
 import com.intellij.execution.ExecutionBundle;
 import com.intellij.execution.configurations.RunConfiguration;
+import com.intellij.execution.configurations.RunConfigurationBase;
 import com.intellij.execution.configurations.RunProfileWithCompileBeforeLaunchOption;
 import com.intellij.execution.remote.RemoteConfiguration;
 import com.intellij.openapi.actionSystem.DataContext;
@@ -75,6 +76,10 @@ public class CompileStepBeforeRun extends BeforeRunTaskProvider<CompileStepBefor
       return true;
     }
 
+    if (configuration instanceof RunConfigurationBase && ((RunConfigurationBase)configuration).excludeCompileBeforeLaunchOption()) {
+      return true;
+    }
+
     final RunProfileWithCompileBeforeLaunchOption runConfiguration = (RunProfileWithCompileBeforeLaunchOption)configuration;
     final Semaphore done = new Semaphore();
     final boolean[] result = new boolean[1];

platform/lang-api/src/com/intellij/execution/configurations/RunConfigurationBase.java

@@ -182,4 +182,7 @@ public abstract class RunConfigurationBase extends UserDataHolderBase implements
     }
   }
 
+  public boolean excludeCompileBeforeLaunchOption() {
+    return false;
+  }
 }

platform/lang-impl/src/com/intellij/profile/codeInspection/ui/InspectionToolsConfigurable.java

@@ -346,11 +346,15 @@ public abstract class InspectionToolsConfigurable extends BaseConfigurable imple
     final SingleInspectionProfilePanel panel = getSelectedPanel();
     if (panel != null) {
       mySelectionAlarm = new Alarm(Alarm.ThreadToUse.SWING_THREAD);
-      mySelectionAlarm.addRequest(new Runnable() {
+      SwingUtilities.invokeLater(new Runnable() {
         public void run() {
-          panel.updateSelection();
+          mySelectionAlarm.addRequest(new Runnable() {
+            public void run() {
+              panel.updateSelection();
+            }
+          }, 200);
         }
-      }, 200);
+      });
 
       myShareProfileCheckBox.setSelected(panel.isProfileShared());
     }