refactor: use scala types

[Cherry-picked 794216a]

Author: ckipp01

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

@@ -11,6 +11,6 @@ import dotty.tools.dotc.rewrites.Rewrites.ActionPatch
   */
 case class CodeAction(
   title: String,
-  description: java.util.Optional[String],
-  patches: java.util.List[ActionPatch]
+  description: Option[String],
+  patches: List[ActionPatch]
 )

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

@@ -383,11 +383,10 @@ abstract class Message(val errorId: ErrorMessageID)(using Context) { self =>
    */
   def showAlways = false
 
-  /** A list of actions attatched to this message to address the issue this
+  /** A list of actions attached to this message to address the issue this
     * message represents.
     */
-  def actions(using Context): java.util.List[CodeAction] =
-    java.util.Collections.emptyList
+  def actions(using Context): List[CodeAction] = List.empty
 
   override def toString = msg
 }

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

@@ -522,12 +522,12 @@ extends SyntaxMsg(RepeatedModifierID) {
     import scala.language.unsafeNulls
     List(
       CodeAction(title = s"""Remove repeated modifier: "$modifier"""",
-        description =  java.util.Optional.empty(),
+        description = None,
         patches = List(
           ActionPatch(SourcePosition(source, span), "")
-        ).asJava
+        )
       )
-    ).asJava
+    )
 }
 
 class InterpolatedStringError()(implicit ctx:Context)
@@ -1874,13 +1874,13 @@ class OnlyFunctionsCanBeFollowedByUnderscore(tp: Type, tree: untpd.PostfixOp)(us
     val untpd.PostfixOp(qual, Ident(nme.WILDCARD)) = tree: @unchecked
     List(
       CodeAction(title = "Rewrite to function value",
-        description =  java.util.Optional.empty(),
+        description = None,
         patches = List(
           ActionPatch(SourcePosition(tree.source, Span(tree.span.start)), "(() => "),
           ActionPatch(SourcePosition(tree.source, Span(qual.span.end, tree.span.end)), ")")
-        ).asJava
+        )
       )
-    ).asJava
+    )
 }
 
 class MissingEmptyArgumentList(method: String, tree: tpd.Tree)(using Context)
@@ -1903,12 +1903,12 @@ class MissingEmptyArgumentList(method: String, tree: tpd.Tree)(using Context)
     import scala.language.unsafeNulls
     List(
       CodeAction(title = "Insert ()",
-        description =  java.util.Optional.empty(),
+        description = None,
         patches = List(
           ActionPatch(SourcePosition(tree.source, tree.span.endPos), "()"),
-        ).asJava
+        )
       )
-    ).asJava
+    )
 }
 
 class DuplicateNamedTypeParameter(name: Name)(using Context)

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

@@ -69,13 +69,13 @@ class CodeActionTest extends DottyTest:
     assertEquals(1, diagnostics.size)
 
     val diagnostic = diagnostics.head
-    val actions = diagnostic.msg.actions.asScala.toList
+    val actions = diagnostic.msg.actions.toList
     assertEquals(1, actions.size)
 
     // TODO account for more than 1 action
     val action = actions.head
     assertEquals(action.title, title)
-    val patches = action.patches.asScala.toList
+    val patches = action.patches.toList
     if patches.nonEmpty then
       patches.reduceLeft: (p1, p2) =>
         assert(p1.srcPos.span.end <= p2.srcPos.span.start, s"overlapping patches $p1 and $p2")

sbt-bridge/src/dotty/tools/xsbt/DelegatingReporter.java

@@ -7,6 +7,7 @@
 
 import scala.Tuple2;
 import scala.collection.mutable.HashMap;
+import scala.jdk.javaapi.CollectionConverters;
 
 import dotty.tools.dotc.core.Contexts.Context;
 import dotty.tools.dotc.reporting.AbstractReporter;
@@ -46,7 +47,7 @@ public void doReport(Diagnostic dia, Context ctx) {
     messageBuilder.append(message.message());
     String diagnosticCode = String.valueOf(message.errorId().errorNumber());
     boolean shouldExplain = Diagnostic.shouldExplain(dia, ctx);
-    List<CodeAction> actions = message.actions(ctx);
+    List<CodeAction> actions = CollectionConverters.asJava(message.actions(ctx));
     if (shouldExplain && !message.explanation().isEmpty()) {
       rendered.append(explanation(message, ctx));
       messageBuilder.append(System.lineSeparator()).append(explanation(message, ctx));

sbt-bridge/src/dotty/tools/xsbt/Problem.java

@@ -8,6 +8,9 @@
 import dotty.tools.dotc.rewrites.Rewrites.ActionPatch;
 import dotty.tools.dotc.util.SourcePosition;
 
+import scala.jdk.javaapi.CollectionConverters;
+import scala.jdk.javaapi.OptionConverters;
+
 import xsbti.Position;
 import xsbti.Severity;
 
@@ -75,7 +78,7 @@ public List<xsbti.Action> actions() {
       // never getting called.
       return _actions
               .stream()
-              .map(action -> new Action(action.title(), action.description(), toWorkspaceEdit(action.patches())))
+              .map(action -> new Action(action.title(), OptionConverters.toJava(action.description()), toWorkspaceEdit(CollectionConverters.asJava(action.patches()))))
               .collect(toList());
     }
   }