bugfix: Fix off by one error when doing reveal

scalameta · Nov 8, 2023 · b5177c9 · b5177c9
1 parent d45eca1
commit b5177c9
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/metals/src/main/scala/scala/meta/internal/tvp/MetalsTreeViewProvider.scala b/metals/src/main/scala/scala/meta/internal/tvp/MetalsTreeViewProvider.scala
@@ -159,7 +159,7 @@ class MetalsTreeViewProvider(
       val closestSymbol = occurrences.minBy { occ =>
         val startLine = occ.range.fold(Int.MaxValue)(_.startLine)
         val distance = math.abs(pos.getLine - startLine)
-        val isLeading = pos.getLine() > startLine
+        val isLeading = pos.getLine() >= startLine
         (!isLeading, distance)
       }
       val result =

diff --git a/mtags/src/main/scala/scala/meta/internal/metals/JdkSources.scala b/mtags/src/main/scala/scala/meta/internal/metals/JdkSources.scala
@@ -27,9 +27,7 @@ object JdkSources {
   ): Either[NoSourcesAvailable, AbsolutePath] = {
     val paths = candidates(userJavaHome)
     paths.find(_.isFile) match {
-      case Some(value) =>
-        logger.info("Found JDK sources: " + value)
-        Right(value.dealias)
+      case Some(value) => Right(value.dealias)
       case None => Left(NoSourcesAvailable(paths))
     }
   }

diff --git a/tests/unit/src/test/scala/tests/ScalaToplevelSuite.scala b/tests/unit/src/test/scala/tests/ScalaToplevelSuite.scala
@@ -620,10 +620,12 @@ class ScalaToplevelSuite extends BaseSuite {
               .map(_.symbol)
               .toList
           case Toplevel =>
-            val input = AbsolutePath(Files.createTempFile("mtags", ".java"))
+            val dir = AbsolutePath(Files.createTempDirectory("mtags"))
+            val input = dir.resolve("Test.scala")
             input.writeText(code)
             val obtained = Mtags.topLevelSymbols(input, dialect)
             input.delete()
+            dir.delete()
             obtained
         }
       assertNoDiff(

diff --git a/tests/unit/src/test/scala/tests/TreeViewLspSuite.scala b/tests/unit/src/test/scala/tests/TreeViewLspSuite.scala
@@ -337,8 +337,7 @@ class TreeViewLspSuite extends BaseLspSuite("tree-view") {
               |        Text symbol-object
               |        TextMacros symbol-interface
               |        Util symbol-object
-              |        File symbol-class
-              |          value symbol-field
+              |        File symbol-object
               |""".stripMargin,
         )
         assertNoDiff(