Add WasTypedInfix sticky attachment and push it to Apply nodes that are typed infix

Author: SuperCl4sh

compiler/src/dotty/tools/dotc/ast/Desugar.scala

@@ -67,6 +67,8 @@ object desugar {
    */
   val TrailingForMap: Property.Key[Unit] = Property.StickyKey()
 
+  val WasTypedInfix: Property.Key[Unit] = Property.StickyKey()
+
   /** What static check should be applied to a Match? */
   enum MatchCheck {
     case None, Exhaustive, IrrefutablePatDef, IrrefutableGenFrom
@@ -1667,10 +1669,12 @@ object desugar {
         case _ =>
           Apply(sel, arg :: Nil)
 
-    if op.name.isRightAssocOperatorName then
+    val apply = if op.name.isRightAssocOperatorName then
       makeOp(right, left, Span(op.span.start, right.span.end))
     else
       makeOp(left, right, Span(left.span.start, op.span.end, op.span.start))
+    apply.pushAttachment(WasTypedInfix, ())
+    return apply
   }
 
   /** Translate throws type `A throws E1 | ... | En` to

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

@@ -14,6 +14,7 @@ import printing.Highlighting.*
 import printing.Formatting
 import ErrorMessageID.*
 import ast.Trees
+import ast.desugar
 import config.{Feature, MigrationVersion, ScalaVersion}
 import transform.patmat.Space
 import transform.patmat.SpaceEngine
@@ -370,7 +371,7 @@ class TypeMismatch(val found: Type, expected: Type, val inTree: Option[untpd.Tre
       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 =>
+          case a @ Apply(_, _) if !a.hasAttachment(desugar.WasTypedInfix) =>
             content + ".nn"
           case _ @ (Select(_, _) | Ident(_)) => content + ".nn"
           case _ => "(" + content + ").nn"

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

@@ -249,7 +249,7 @@ class CodeActionTest extends DottyTest:
           |  def q(s2: String, s3: String): String | Null = null
           |}
           | val s: String = ???
-          | val t: String = (s.q(s, s)).nn""".stripMargin,
+          | val t: String = s.q(s, s).nn""".stripMargin,
       ctxx = ctxx
       )