Merge pull request #2817 from tgodzik/position-imports-comment

Fix issues when importing in an empty package
scalameta · May 24, 2021 · 8bf50c7 · 8bf50c7
2 parents 10c680a + b853078
commit 8bf50c7
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 0 deletions.
diff --git a/mtags/src/main/scala-3/scala/meta/internal/pc/AutoImports.scala b/mtags/src/main/scala-3/scala/meta/internal/pc/AutoImports.scala
@@ -217,6 +217,8 @@ object AutoImports {
           pkg.stats.takeWhile(_.isInstanceOf[Import]).lastOption
         val (lineNumber, padTop) = lastImportStatement match {
           case Some(stm) => (stm.endPos.line + 1, false)
+          case None if pkg.pid.symbol.isEmptyPackage =>
+            (0, false)
           case None =>
             val pos = pkg.pid.endPos
             val line =

diff --git a/tests/cross/src/test/scala/tests/pc/AutoImportsSuite.scala b/tests/cross/src/test/scala/tests/pc/AutoImportsSuite.scala
@@ -40,6 +40,27 @@ class AutoImportsSuite extends BaseAutoImportsSuite {
        |""".stripMargin
   )
 
+  checkEdit(
+    "basic-edit-comment",
+    """|/**
+       | * @param code
+       | * @return
+       |*/
+       |object A {
+       |  <<Future>>.successful(2)
+       |}
+       |""".stripMargin,
+    """|import scala.concurrent.Future
+       |/**
+       | * @param code
+       | * @return
+       |*/
+       |object A {
+       |  Future.successful(2)
+       |}
+       |""".stripMargin
+  )
+
   checkEdit(
     "symbol-no-prefix",
     """|package a