Merged branch idea241.release into idea241.x

Author: builduser

project/Common.scala

@@ -51,13 +51,9 @@ object Common {
   val projectDirectoriesSettings: Seq[Setting[?]] = Seq(
     // production sources
     Compile / sourceDirectory := baseDirectory.value / "src", // we put all source files in <subproject_dir>/src
-    Compile / scalaSource := (Compile / sourceDirectory).value, // all Scala sources are in the same directory
-    Compile / javaSource := (Compile / sourceDirectory).value, // all Java sources are in the same directory
     Compile / unmanagedSourceDirectories := Seq((Compile / sourceDirectory).value),
     // test sources
     Test / sourceDirectory := baseDirectory.value / "test", // we put all test source files in <subproject_dir>/test
-    Test / scalaSource := (Test / sourceDirectory).value, // all Scala test sources are in the same directory
-    Test / javaSource := (Test / sourceDirectory).value, // all Java test sources are in the same directory
     Test / unmanagedSourceDirectories := Seq((Test / sourceDirectory).value),
     //NOTE: this almost duplicates the logic from sbt-idea-plugin (see org.jetbrains.sbtidea.Init)
     //but it uses `:=` instead of `+=` to remove standard resource directories, which intersect with source directories
@@ -128,9 +124,7 @@ object Common {
         // NOTE: keep versions in sync with ultimate/.idea/kotlinc.xml and community/.idea/kotlinc.xml
         kotlinVersion := "1.9.22",
         kotlincJvmTarget := "17",
-        kotlinRuntimeProvided := true,
-        Compile / kotlinSource := (Compile / sourceDirectory).value, // all Kotlin source files are in the same directory as all other sources
-        Test / kotlinSource := (Test / sourceDirectory).value // all Kotlin test source files are in the same directory as all other sources
+        kotlinRuntimeProvided := true
       )
   }
 

scala/compiler-integration/src/org/jetbrains/plugins/scala/compiler/highlighting/CompilerHighlightingUpToDateChecker.scala

@@ -2,6 +2,7 @@ package org.jetbrains.plugins.scala.compiler.highlighting
 
 import com.intellij.compiler.backwardRefs.IsUpToDateCheckConsumer
 import com.intellij.openapi.project.Project
+import org.jetbrains.plugins.scala.settings.ScalaHighlightingMode
 
 /**
  * Runs once on project startup. Reports the result of the JPS up-to-date checker. Regardless of the outcome, we
@@ -11,14 +12,32 @@ import com.intellij.openapi.project.Project
  * the JPS up-to-date check runs without holding the CompilerManager compilation semaphore. This semaphore is used to
  * isolate the JPS process from the JPS code running in the Scala Compile Server as part of the compiler based
  * highlighting pipeline. These two processes share the same working directory, and it is important to write to it in
- * a mutually exclusive manner, otherwise.
+ * a mutually exclusive manner, otherwise there is a risk of corrupting the shared state and forcing possibly multiple
+ * project rebuilds until it is fully resolved.
  *
  * @see [[CompilerLockService]].
  */
 private final class CompilerHighlightingUpToDateChecker extends IsUpToDateCheckConsumer {
-  override def isApplicable(project: Project): Boolean = true
+  override def isApplicable(project: Project): Boolean = {
+    if (ScalaHighlightingMode.isShowErrorsFromCompilerEnabled(project)) {
+      // The project is a Scala project with Compiler Based Highlighting enabled. We need to wait for the JPS
+      // up-to-date check to complete before initializing the CBH system, in order to avoid state corruption of the
+      // JPS process.
+      true
+    } else {
+      // In projects where Compiler Based Highlighting is not enabled (including non-Scala projects), we do not need to
+      // wait for the up-to-date checker to run first. This also avoids showing the up-to-date message in the build
+      // window.
+      markProjectReady(project)
+      false
+    }
+  }
 
   override def isUpToDate(project: Project, isUpToDate: Boolean): Unit = {
+    markProjectReady(project)
+  }
+
+  private def markProjectReady(project: Project): Unit = {
     if (project.isDisposed) return
     CompilerLockService.instance(project).markProjectReady()
   }

scala/scala-impl/src/org/jetbrains/plugins/scala/lang/formatting/settings/TypeAnnotationsPanelBase.java

@@ -18,6 +18,7 @@
 import java.lang.reflect.Method;
 import java.util.ResourceBundle;
 
+@SuppressWarnings("deprecation")
 public abstract class TypeAnnotationsPanelBase extends ScalaCodeStylePanelBase {
 
     public static final String TAB_TITLE = ScalaBundle.message("type.annotations.panel.title");

scala/scala-impl/src/org/jetbrains/plugins/scala/settings/sections/EditorSettingsSectionPanel.java

@@ -22,6 +22,7 @@
 
 import static org.jetbrains.plugins.scala.settings.ScalaProjectSettings.getInstance;
 
+@SuppressWarnings("unchecked")
 public class EditorSettingsSectionPanel extends SettingsSectionPanel {
     private JCheckBox showImplicitConversionsInCheckBox;
     private JCheckBox showArgumentsToByNameParametersCheckBox;

scala/scala-impl/src/org/jetbrains/plugins/scala/settings/sections/PerformanceSettingsSectionPanel.java

@@ -17,6 +17,7 @@
 
 import static org.jetbrains.plugins.scala.settings.ScalaProjectSettings.getInstance;
 
+@SuppressWarnings("unchecked")
 public class PerformanceSettingsSectionPanel extends SettingsSectionPanel {
     private JSpinner implicitParametersSearchDepthSpinner;
     private JCheckBox treatDocCommentAsBlockComment;

scala/scala-impl/src/org/jetbrains/plugins/scala/settings/sections/WorksheetSettingsSectionPanel.java

@@ -1,14 +1,12 @@
 package org.jetbrains.plugins.scala.settings.sections;
 
-import com.intellij.openapi.options.ConfigurationException;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Pair;
 import com.intellij.ui.EnumComboBoxModel;
 import com.intellij.uiDesigner.core.GridConstraints;
 import com.intellij.uiDesigner.core.GridLayoutManager;
 import com.intellij.uiDesigner.core.Spacer;
 import org.jetbrains.plugins.scala.ScalaBundle;
-import org.jetbrains.plugins.scala.settings.ScalaCompileServerSettings;
 import org.jetbrains.plugins.scala.settings.ScalaProjectSettings;
 import org.jetbrains.plugins.scala.settings.SimpleMappingListCellRenderer;
 import org.jetbrains.plugins.scala.statistics.ScalaActionUsagesCollector;
@@ -20,6 +18,7 @@
 
 import static org.jetbrains.plugins.scala.settings.ScalaProjectSettings.getInstance;
 
+@SuppressWarnings("unchecked")
 public class WorksheetSettingsSectionPanel extends SettingsSectionPanel {
     private static final int WORKSHEET_RUN_DELAY_MS_MINIMUM = 500;
     private static final int WORKSHEET_RUN_DELAY_MS_MAXIMUM = 5000;

scala/scala-impl/src/org/jetbrains/plugins/scala/settings/sections/XRayModeSettingsSectionPanel.java

@@ -1,6 +1,5 @@
 package org.jetbrains.plugins.scala.settings.sections;
 
-import com.intellij.openapi.options.ConfigurationException;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.SystemInfo;
 import com.intellij.uiDesigner.core.GridConstraints;
@@ -17,6 +16,7 @@
 import java.util.Map;
 import java.util.ResourceBundle;
 
+@SuppressWarnings("unchecked")
 public class XRayModeSettingsSectionPanel extends SettingsSectionPanel {
     private JCheckBox myShowMethodChainHintsCheckbox;
     private JCheckBox myShowIndentGuidesCheckbox;