Add SafeNulls check before computing subtyping relation, fix edge cases for in-line match and if, improve formatting, and add more test

Signed-off-by: Seyon Sivatharan <[email protected]>

[Cherry-picked 70a169a]

Author: SuperCl4sh

compiler/src/dotty/tools/dotc/reporting/messages.scala

@@ -296,7 +296,7 @@ class TypeMismatch(val found: Type, expected: Type, val inTree: Option[untpd.Tre
   extends TypeMismatchMsg(found, expected)(TypeMismatchID):
 
   private val shouldSuggestNN =
-    if expected.isValueType then
+    if ctx.mode.is(Mode.SafeNulls) && expected.isValueType then
       found frozen_<:< OrNull(expected)
     else false
 
@@ -361,27 +361,25 @@ class TypeMismatch(val found: Type, expected: Type, val inTree: Option[untpd.Tre
     treeStr + "\n" + super.explain
 
   override def actions(using Context) =
-    if shouldSuggestNN then
-      inTree match {
-        case Some(tree) if tree != null =>
-          val content = tree.source.content().slice(tree.srcPos.startPos.start, tree.srcPos.endPos.end).mkString
-          val replacement = tree match
-            case Apply(fun, args) => "(" + content + ").nn"
-            case _ => content + ".nn"
-          List(
-            CodeAction(title = """Add .nn""",
+    inTree match {
+      case Some(tree) if shouldSuggestNN =>
+        val content = tree.source.content().slice(tree.srcPos.startPos.start, tree.srcPos.endPos.end).mkString
+        val replacement = tree match
+          case a @ Apply(_, _) if a.applyKind == ApplyKind.Using =>
+            content + ".nn"
+          case _ @ (Select(_, _) | Ident(_)) => content + ".nn"
+          case _ => "(" + content + ").nn"
+        List(
+          CodeAction(title = """Add .nn""",
             description = None,
             patches = List(
               ActionPatch(tree.srcPos.sourcePos, replacement)
             )
-            )
           )
-        case _ =>
-          List()
-      }
-    else
-      List()
-
+        )
+      case _ =>
+        List()
+    }
 end TypeMismatch
 
 class NotAMember(site: Type, val name: Name, selected: String, proto: Type, addendum: => String = "")(using Context)

compiler/test/dotty/tools/dotc/reporting/CodeActionTest.scala

@@ -165,7 +165,7 @@ class CodeActionTest extends DottyTest:
       ctxx = ctxx
       )
 
-  @Test def addNN =
+  @Test def addNN1 =
     val ctxx = newContext
     ctxx.setSetting(ctxx.settings.YexplicitNulls, true)
     checkCodeAction(
@@ -238,6 +238,57 @@ class CodeActionTest extends DottyTest:
           | val t: String = (s.q(s, s)).nn""".stripMargin,
       ctxx = ctxx
       )
+
+  @Test def addNN5 =
+    val ctxx = newContext
+    ctxx.setSetting(ctxx.settings.YexplicitNulls, true)
+    checkCodeAction(
+      code =
+        """val s: String | Null = ???
+          |val t: String = s match {
+          | case _: String => "foo"
+          | case _ => s
+          |}""".stripMargin,
+        title = "Add .nn",
+      expected =
+        """val s: String | Null = ???
+          |val t: String = s match {
+          | case _: String => "foo"
+          | case _ => s.nn
+          |}""".stripMargin,
+      ctxx = ctxx
+      )
+
+  @Test def addNN6 =
+    val ctxx = newContext
+    ctxx.setSetting(ctxx.settings.YexplicitNulls, true)
+    checkCodeAction(
+      code =
+        """val s: String | Null = ???
+          |val t: String = if (s != null) "foo" else s""".stripMargin,
+        title = "Add .nn",
+      expected =
+        """val s: String | Null = ???
+          |val t: String = if (s != null) "foo" else s.nn""".stripMargin,
+      ctxx = ctxx
+      )
+
+  @Test def addNN7 =
+    val ctxx = newContext
+    ctxx.setSetting(ctxx.settings.YexplicitNulls, true)
+    checkCodeAction(
+      code =
+        """given ctx: String | Null = null
+          |def f(using c: String): String = c
+          |val s: String = f(using ctx)""".stripMargin,
+        title = "Add .nn",
+      expected =
+        """given ctx: String | Null = null
+          |def f(using c: String): String = c
+          |val s: String = f(using ctx.nn)""".stripMargin,
+      ctxx = ctxx
+      )
+
   // Make sure we're not using the default reporter, which is the ConsoleReporter,
   // meaning they will get reported in the test run and that's it.
   private def newContext =