Merged branch idea251.release-vasil/scratch-npe into idea251.release

Author: builduser

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

@@ -1,16 +1,19 @@
 package org.jetbrains.plugins.scala.compiler.highlighting
 
 import com.intellij.codeInsight.daemon.impl.HighlightInfoType
-import com.intellij.openapi.module.ModuleUtilCore
+import com.intellij.openapi.application.ReadAction
 import com.intellij.openapi.progress.ProcessCanceledException
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.vfs.VirtualFile
+import com.intellij.psi.{PsiFile, PsiManager}
+import com.intellij.util.concurrency.annotations.RequiresBackgroundThread
 import org.jetbrains.jps.incremental.scala.Client.{ClientMsg, PosInfo}
 import org.jetbrains.jps.incremental.scala.MessageKind
 import org.jetbrains.plugins.scala.compiler.highlighting.BackgroundExecutorService.executeOnBackgroundThreadInNotDisposed
 import org.jetbrains.plugins.scala.compiler.highlighting.ExternalHighlighting.RangeInfo
 import org.jetbrains.plugins.scala.compiler.{CompilerEvent, CompilerEventListener}
 import org.jetbrains.plugins.scala.extensions.PathExt
+import org.jetbrains.plugins.scala.project.ProjectPsiFileExt
 import org.jetbrains.plugins.scala.settings.ScalaProjectSettings
 
 private class UpdateCompilerGeneratedStateListener(project: Project) extends CompilerEventListener {
@@ -119,10 +122,22 @@ private class UpdateCompilerGeneratedStateListener(project: Project) extends Com
   }
 
   private def scalacOptionsForFile(virtualFile: VirtualFile): Seq[String] = {
-    val module = ModuleUtilCore.findModuleForFile(virtualFile, project)
-    CompilerOptions.scalacOptions(module)
+    val psiFileOpt = findPsiFile(virtualFile)
+    val moduleOpt = psiFileOpt.flatMap(_.module)
+    moduleOpt match {
+      case Some(module) => CompilerOptions.scalacOptions(module)
+      case None => Seq.empty
+    }
   }
 
+  @RequiresBackgroundThread
+  private def findPsiFile(virtualFile: VirtualFile): Option[PsiFile] =
+    ReadAction
+      .nonBlocking[Option[PsiFile]](() => Option(PsiManager.getInstance(project).findFile(virtualFile)))
+      .inSmartMode(project)
+      .expireWhen(() => project.isDisposed)
+      .executeSynchronously()
+
   private def replaceOrAppendFileState(oldState: CompilerGeneratedState,
                                        file: VirtualFile,
                                        fileState: FileCompilerGeneratedState): CompilerGeneratedState = {

scala/worksheet/test/org/jetbrains/plugins/scala/worksheet/ScratchFileCompilerHighlightingTest.scala

@@ -0,0 +1,28 @@
+package org.jetbrains.plugins.scala.worksheet
+
+import com.intellij.ide.scratch.ScratchRootType
+import com.intellij.lang.annotation.HighlightSeverity
+import com.intellij.openapi.util.TextRange
+import org.jetbrains.plugins.scala.ScalaVersion
+import org.jetbrains.plugins.scala.compiler.highlighting.ScalaCompilerHighlightingTestBase
+import org.jetbrains.plugins.scala.util.CompilerTestUtil.runWithErrorsFromCompiler
+
+class ScratchFileCompilerHighlightingTest extends ScalaCompilerHighlightingTestBase {
+  override protected def supportedIn(version: ScalaVersion): Boolean = version == ScalaVersion.Latest.Scala_3
+
+  def testSimpleError(): Unit = runWithErrorsFromCompiler(getProject) {
+    val expected = expectedResult(
+      ExpectedHighlighting(
+        severity = HighlightSeverity.ERROR,
+        range = Some(TextRange.create(16, 19)),
+        quickFixDescriptions = Seq.empty,
+        msgPrefix = "Found:    (123 : Int)\nRequired: String"
+      )
+    )
+
+    val scratchFile =
+      ScratchRootType.getInstance().createScratchFile(getProject, "simpleError.sc", WorksheetLanguage.INSTANCE, "val x: String = 123")
+    waitUntilFileIsHighlighted(scratchFile)
+    doAssertion(scratchFile, expected)
+  }
+}