Merge pull request #403 from scala/backport-lts-3.3-23083

Backport "Improved edit span for import" to 3.3 LTS

Author: tgodzik

compiler/src/dotty/tools/dotc/transform/CheckUnused.scala

@@ -670,6 +670,7 @@ object CheckUnused:
       else
         // If the rest of the line is blank, include it in the final edit position. (Delete trailing whitespace.)
         // If for deletion, and the prefix of the line is also blank, then include that, too. (Del blank line.)
+        // If deleting a blank line and surrounded by blank lines, remove an adjoining blank line.
         def editPosAt(srcPos: SrcPos, forDeletion: Boolean): SrcPos =
           val start = srcPos.span.start
           val end = srcPos.span.end
@@ -682,7 +683,21 @@ object CheckUnused:
           val bump = if (deleteLine) 1 else 0 // todo improve to include offset of next line, endline + 1
           val p0 = srcPos.span
           val p1 = if (next >= 0 && emptyRight) p0.withEnd(next + bump) else p0
-          val p2 = if (deleteLine) p1.withStart(prev + 1) else p1
+          val p2 =
+            if deleteLine then
+              var newStart = prev + 1
+              if srcPos.line > 1 then
+                val source = srcPos.sourcePos.source
+                import source.{lineToOffset, lineToOffsetOpt, offsetToLine}
+                val startLine = offsetToLine(start)
+                val endLine = offsetToLine(end)
+                val preceding = lineToOffset(startLine - 1)
+                lineToOffsetOpt(endLine + 2) match
+                case Some(succeeding) if lineToOffset(startLine) - preceding == 1 && succeeding - end == 2 =>
+                  newStart = preceding
+                case _ =>
+              p1.withStart(newStart)
+            else p1
           srcPos.sourcePos.withSpan(p2)
         def actionsOf(actions: (SrcPos, String)*): List[CodeAction] =
           val patches = actions.map((srcPos, replacement) => ActionPatch(srcPos.sourcePos, replacement)).toList

presentation-compiler/src/main/dotty/tools/pc/PcConvertToNamedLambdaParameters.scala

@@ -30,11 +30,11 @@ final class PcConvertToNamedLambdaParameters(
   import PcConvertToNamedLambdaParameters._
 
   def convertToNamedLambdaParameters: ju.List[l.TextEdit] = {
-    val uri = params.uri
+    val uri = params.uri.nn
     val filePath = Paths.get(uri)
     driver.run(
       uri,
-      SourceFile.virtual(filePath.toString, params.text),
+      SourceFile.virtual(filePath.toString, params.text.nn),
     )
     given newctx: Context = driver.localContext(params)
     val pos = driver.sourcePosition(params)

tests/rewrites/unused.check

@@ -53,3 +53,16 @@ package p11:
 package p12:
   import java.lang.System, java.lang.Runnable
   class C extends Runnable { def run() = System.out.println() }
+
+package p13:
+  import java.lang.{Runnable,
+
+                    System}, System.out
+  class C extends Runnable { def run() = out.println() }
+
+package p14:
+  import collection.mutable
+
+  import mutable.ListBuffer
+
+  def buf = ListBuffer.empty[String]

tests/rewrites/unused.scala

@@ -59,3 +59,20 @@ package p11:
 package p12:
   import collection.mutable, java.lang.System, java.lang.Runnable
   class C extends Runnable { def run() = System.out.println() }
+
+package p13:
+  import java.lang.{Runnable,
+
+                    Thread, // leave one blank line instead of two
+
+                    System}, System.out
+  class C extends Runnable { def run() = out.println() }
+
+package p14:
+  import collection.mutable
+
+  import java.lang.{Runnable, Thread}
+
+  import mutable.ListBuffer
+
+  def buf = ListBuffer.empty[String]

tests/warn/i23033.scala

@@ -9,5 +9,3 @@ object Test {
 }
 object Useful:
   given [T](using @unused ec: ExecutionContext): AnyRef with {}
-object Syntax:
-  given [T] => (@unused ec: ExecutionContext) => AnyRef