Merged branch idea251.release into idea251.x

Author: builduser

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

@@ -31,7 +31,7 @@ import org.jetbrains.plugins.scala.compiler.highlighting.ExternalHighlighting.Ra
 import org.jetbrains.plugins.scala.editor.DocumentExt
 import org.jetbrains.plugins.scala.extensions.{IteratorExt, ObjectExt, Parent, PsiElementExt, executeOnPooledThread, invokeLater}
 import org.jetbrains.plugins.scala.lang.psi.api.base.{ScReference, ScStableCodeReference}
-import org.jetbrains.plugins.scala.lang.psi.api.expr.ScMethodCall
+import org.jetbrains.plugins.scala.lang.psi.api.expr.MethodInvocation
 import org.jetbrains.plugins.scala.lang.psi.api.toplevel.imports.usages.ImportUsed
 import org.jetbrains.plugins.scala.lang.psi.api.toplevel.imports.usages.ImportUsed.UnusedImportReportedByCompilerKey
 import org.jetbrains.plugins.scala.lang.psi.api.toplevel.imports.{ScImportExpr, ScImportOrExportStmt, ScImportSelector}
@@ -83,7 +83,7 @@ private final class ExternalHighlightersService(project: Project) { self =>
           psiFile
             .depthFirst(_.getTextRange.contains(range)) // Optimized iteration
             .filter(_.getTextRange == range)
-            .find(e => e.is[ScMethodCall, ScStableCodeReference])
+            .find(e => e.is[MethodInvocation, ScStableCodeReference])
             .foreach { e =>
               // Skip if the same value already exists
               if (!CompilerType(e).contains(tpe)) {

scala/compiler-plugin/scala-2.12/src/CompilerPlugin.scala

@@ -39,9 +39,9 @@ class CompilerPlugin(val global: Global) extends Plugin {
       private val transformer = new Transformer() {
         override def transform(tree: Tree): Tree = {
           tree.attachments.get[analyzer.MacroExpansionAttachment] match {
-            case Some(analyzer.MacroExpansionAttachment(expandee, expanded: Tree)) if isWhiteboxMacro(global)(expandee.symbol) && expanded.tpe != null =>
+            case Some(analyzer.MacroExpansionAttachment(expandee, expanded: Tree)) if isWhiteboxMacro(global)(expandee.symbol) =>
               // If there's a type mismatch, the type checker replaces the tree type with an ErrorType (see TyperErrorGen.issueError)
-              val tpe = if (expanded.tpe.isError) typer.typed(expandee).tpe else expanded.tpe
+              val tpe = if (tree.tpe.isError) typer.typed(expandee).tpe else tree.tpe
               val s = LiteralTypePattern.replaceAllIn(tpe.toString, _.group(1))
               // echo is not binary compatible between 2.13.11 and 2.13.12 (overloading vs default argument)
               reporter.info(expandee.pos, TypePrefix + s + TypeSuffix, force = true)

scala/compiler-plugin/scala-2.12/test/CompilerPluginTest.scala

@@ -54,6 +54,12 @@ class CompilerPluginTest {
     usage("val v = Macros.id(Set(1, 2, 3))"))(
     info("Macros.id(Set(1, 2, 3))", tpe("scala.collection.immutable.Set[Int]")))
 
+  // Expected type
+
+  @Test def expectedType(): Unit = assertMessagesAre(Id,
+    usage("val v = Macros.id(123): Int"))(
+    info("Macros.id(123)", tpe("123")))
+
   // Multiple
 
   @Test def multipleTypes(): Unit = assertMessagesAre(Id,

scala/compiler-plugin/scala-2.13/src/CompilerPlugin.scala

@@ -39,9 +39,9 @@ class CompilerPlugin(val global: Global) extends Plugin {
       private val transformer = new Transformer() {
         override def transform(tree: Tree): Tree = {
           tree.attachments.get[analyzer.MacroExpansionAttachment] match {
-            case Some(analyzer.MacroExpansionAttachment(expandee, expanded: Tree)) if isWhiteboxMacro(global)(expandee.symbol) && expanded.tpe != null =>
+            case Some(analyzer.MacroExpansionAttachment(expandee, expanded: Tree)) if isWhiteboxMacro(global)(expandee.symbol) =>
               // If there's a type mismatch, the type checker replaces the tree type with an ErrorType (see TyperErrorGen.issueError)
-              val tpe = if (expanded.tpe.isError) typer.typed(expandee).tpe else expanded.tpe
+              val tpe = if (tree.tpe.isError) typer.typed(expandee).tpe else tree.tpe
               val s = LiteralTypePattern.replaceAllIn(tpe.toString, _.group(1))
               // echo is not binary compatible between 2.13.11 and 2.13.12 (overloading vs default argument)
               reporter.info(expandee.pos, TypePrefix + s + TypeSuffix, force = true)

scala/compiler-plugin/scala-2.13/test/CompilerPluginTest.scala

@@ -54,6 +54,12 @@ class CompilerPluginTest {
     usage("val v = Macros.id(Set(1, 2, 3))"))(
     info("Macros.id(Set(1, 2, 3))", tpe("scala.collection.immutable.Set[Int]")))
 
+  // Expected type
+
+  @Test def expectedType(): Unit = assertMessagesAre(Id,
+    usage("val v = Macros.id(123): Int"))(
+    info("Macros.id(123)", tpe("123")))
+
   // Multiple
 
   @Test def multipleTypes(): Unit = assertMessagesAre(Id,

scala/compiler-plugin/scala-3.3/test/CompilerPluginTest.scala

@@ -46,6 +46,12 @@ class CompilerPluginTest {
     "val _ = id(Set(1, 2, 3))")(
     info("id(Set(1, 2, 3))", tpe("_root_.scala.collection.immutable.Set[_root_.scala.Int]")))
 
+  // Expected type
+
+  @Test def expectedType(): Unit = assertMessagesAre(Id,
+    "val _ = id(123): Int")(
+    info("id(123)", tpe("123")))
+
   // Multiple
 
   @Test def multipleTypes(): Unit = assertMessagesAre(Id,

scala/decompiler/test/org/jetbrains/plugins/scala/decompiler/Main.scala

@@ -5,6 +5,15 @@ import java.nio.file.{Files, Path, Paths}
 import java.util.jar.JarInputStream
 import scala.util.chaining.scalaUtilChainingOps
 
+/**
+ * A helper to quickly assess the effect of non-trivial ScalaSigPrinter modifications.
+ *
+ * Although the corresponding code is tested both by the DecompilerTest (unit) and TextToTextTestBase (integration) tests,
+ * the former rely on predefined test cases, while the latter only ensure correctness, without a diff.
+ *
+ * You may only want to use this if you intend to modify the decompiler implementation extensively.
+ * First, you should run the TextToTextTestBase tests to download the Ivy artifacts and also to adjust the OutputDir.
+ */
 object Main {
   sealed abstract class Mode
   object Mode {

scala/tasty-reader/test/Main.scala

@@ -5,6 +5,15 @@ import java.nio.file.{Files, Path, Paths}
 import java.util.jar.JarInputStream
 import scala.util.chaining.scalaUtilChainingOps
 
+/**
+ * A helper to quickly assess the effect of non-trivial TreePrinter modifications.
+ *
+ * Although the corresponding code is tested both by the DecompilerTest (unit) and TextToTextTestBase (integration) tests,
+ * the former rely on predefined test cases, while the latter only ensure correctness, without a diff.
+ *
+ * You may only want to use this if you intend to modify the decompiler implementation extensively.
+ * First, you should run the TextToTextTestBase tests to download the Ivy artifacts and also to adjust the OutputDir.
+ */
 object Main {
   enum Mode { case Parse, Test, Benchmark }