undo unnecessary changes, add -Wunsued:all, remove unused

scala · Jul 3, 2023 · 8563404 · 8563404
1 parent 5ee339d
commit 8563404
Show file tree

Hide file tree

Showing 15 changed files with 13 additions and 30 deletions.
diff --git a/presentation-compiler/src/main/dotty/tools/pc/AutoImports.scala b/presentation-compiler/src/main/dotty/tools/pc/AutoImports.scala
@@ -2,7 +2,6 @@ package dotty.tools.pc
 
 import scala.annotation.tailrec
 import scala.jdk.CollectionConverters.*
-import scala.meta.internal.mtags.KeywordWrapper
 import scala.meta.internal.pc.AutoImportPosition
 import scala.meta.pc.PresentationCompilerConfig
 

diff --git a/presentation-compiler/src/main/dotty/tools/pc/PcCollector.scala b/presentation-compiler/src/main/dotty/tools/pc/PcCollector.scala
@@ -315,8 +315,8 @@ abstract class PcCollector[T](
       case _ => resultAllOccurences().toList
 
   def resultAllOccurences(): Set[T] =
-    def noTreeFilter = (tree: Tree) => true
-    def noSoughtFilter = (f: Symbol => Boolean) => true
+    def noTreeFilter = (_: Tree) => true
+    def noSoughtFilter = (_: Symbol => Boolean) => true
 
     traverseSought(noTreeFilter, noSoughtFilter)
 

diff --git a/presentation-compiler/src/main/dotty/tools/pc/PcDefinitionProvider.scala b/presentation-compiler/src/main/dotty/tools/pc/PcDefinitionProvider.scala
@@ -9,7 +9,6 @@ import scala.meta.pc.DefinitionResult
 import scala.meta.pc.OffsetParams
 import scala.meta.pc.SymbolSearch
 
-import dotty.tools.dotc.CompilationUnit
 import dotty.tools.dotc.ast.NavigateAST
 import dotty.tools.dotc.ast.tpd.*
 import dotty.tools.dotc.ast.untpd
@@ -43,8 +42,6 @@ class PcDefinitionProvider(
       uri,
       SourceFile.virtual(filePath.toString, params.text)
     )
-    val unit = driver.currentCtx.run.units.head
-    val tree = unit.tpdTree
 
     val pos = driver.sourcePosition(params)
     val path =
@@ -56,7 +53,7 @@ class PcDefinitionProvider(
       if findTypeDef then findTypeDefinitions(path, pos, indexedContext)
       else findDefinitions(path, pos, indexedContext)
 
-    if result.locations().isEmpty() then fallbackToUntyped(unit, pos)(using ctx)
+    if result.locations().isEmpty() then fallbackToUntyped(pos)(using ctx)
     else result
   end definitions
 
@@ -72,7 +69,7 @@ class PcDefinitionProvider(
    * @param pos cursor position
    * @return definition result
    */
-  private def fallbackToUntyped(unit: CompilationUnit, pos: SourcePosition)(
+  private def fallbackToUntyped(pos: SourcePosition)(
       using ctx: Context
   ) =
     lazy val untpdPath = NavigateAST

diff --git a/presentation-compiler/src/main/dotty/tools/pc/completions/KeywordsCompletions.scala b/presentation-compiler/src/main/dotty/tools/pc/completions/KeywordsCompletions.scala
@@ -20,7 +20,7 @@ object KeywordsCompletions:
       comments: List[Comment]
   )(using ctx: Context): List[CompletionValue] =
     lazy val notInComment =
-      checkIfNotInComment(completionPos.cursorPos, path, comments)
+      checkIfNotInComment(completionPos.cursorPos, comments)
 
     path match
       case Nil if completionPos.query.isEmpty =>
@@ -69,9 +69,8 @@ object KeywordsCompletions:
 
   private def checkIfNotInComment(
       pos: SourcePosition,
-      path: List[Tree],
       comments: List[Comment]
-  )(using ctx: Context): Boolean =
+  ): Boolean =
     !comments.exists(_.span.contains(pos.span))
 
   private def isPackage(enclosing: List[Tree]): Boolean =

diff --git a/presentation-compiler/src/main/dotty/tools/pc/completions/MatchCaseCompletions.scala b/presentation-compiler/src/main/dotty/tools/pc/completions/MatchCaseCompletions.scala
@@ -241,7 +241,6 @@ object CaseKeywordCompletion:
       completionPos,
       clientSupportsSnippets
     )
-    val result = ListBuffer.empty[CompletionValue]
     val tpe = selector.tpe.widen.bounds.hi match
       case tr @ TypeRef(_, _) => tr.underlying
       case t => t

diff --git a/presentation-compiler/src/main/dotty/tools/pc/printer/ShortenedTypePrinter.scala b/presentation-compiler/src/main/dotty/tools/pc/printer/ShortenedTypePrinter.scala
@@ -2,13 +2,9 @@ package dotty.tools.pc.printer
 
 import scala.collection.mutable
 import scala.meta.internal.jdk.CollectionConverters.*
-import scala.meta.internal.metals.Report
 import scala.meta.internal.metals.ReportContext
 import scala.meta.pc.SymbolDocumentation
 import scala.meta.pc.SymbolSearch
-import scala.util.Failure
-import scala.util.Success
-import scala.util.Try
 
 import dotty.tools.dotc.core.Contexts.Context
 import dotty.tools.dotc.core.Flags
@@ -24,13 +20,8 @@ import dotty.tools.dotc.core.Types.Type
 import dotty.tools.pc.IndexedContext
 import dotty.tools.pc.Params
 import dotty.tools.pc.utils.MtagsEnrichments.*
-import dotty.tools.dotc.printing.PlainPrinter
 import dotty.tools.dotc.printing.Texts.Text
-import dotty.tools.dotc.core.Decorators.show
 import dotty.tools.dotc.printing.RefinedPrinter
-import dotty.tools.dotc.printing.Formatting.ShownDef.ctxShow
-import dotty.tools.dotc.typer.ImportInfo
-import dotty.tools.dotc.core.Annotations.Annotation
 import dotty.tools.pc.IndexedContext.Result
 import dotty.tools.pc.AutoImports.AutoImportsGenerator
 import org.eclipse.lsp4j.TextEdit

diff --git a/presentation-compiler/test/dotty/tools/pc/base/BasePcDefinitionSuite.scala b/presentation-compiler/test/dotty/tools/pc/base/BasePcDefinitionSuite.scala
@@ -1,6 +1,5 @@
 package dotty.tools.pc.base
 
-import java.net.URI
 import java.nio.file.Paths
 
 import scala.meta.internal.metals.CompilerOffsetParams

diff --git a/presentation-compiler/test/dotty/tools/pc/tests/NoIndentSuite.scala b/presentation-compiler/test/dotty/tools/pc/tests/NoIndentSuite.scala
@@ -3,7 +3,6 @@ package dotty.tools.pc.tests
 import java.nio.file.Path
 
 import dotty.tools.pc.base.{BaseCompletionSuite, BaseExtractMethodSuite}
-import dotty.tools.pc.utils.MockEntries
 
 import org.junit.Test
 

diff --git a/presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionOverrideSuite.scala b/presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionOverrideSuite.scala
@@ -890,7 +890,7 @@ class CompletionOverrideSuite extends BaseCompletionSuite:
       topLines = Some(3)
     )
 
-  @Test def `pathdependent` =
+  @Test def `path-dependent` =
     checkEdit(
       """|trait Over {
          |  object Outer {

diff --git a/presentation-compiler/test/dotty/tools/pc/tests/edit/AutoImplementAbstractMembersSuite.scala b/presentation-compiler/test/dotty/tools/pc/tests/edit/AutoImplementAbstractMembersSuite.scala
@@ -1134,7 +1134,7 @@ class AutoImplementAbstractMembersSuite extends BaseCodeActionSuite:
          |""".stripMargin
     )
 
-  @Test def `testtest` =
+  @Test def `path-dependent-type-arg` =
     checkEdit(
       """|package a
          |import scala.deriving.Mirror

diff --git a/presentation-compiler/test/dotty/tools/pc/tests/hover/HoverNamedArgSuite.scala b/presentation-compiler/test/dotty/tools/pc/tests/hover/HoverNamedArgSuite.scala
@@ -5,7 +5,7 @@ import scala.meta.pc.SymbolDocumentation
 import dotty.tools.pc.base.BaseHoverSuite
 import dotty.tools.pc.utils.MockEntries
 
-import org.junit.{Ignore, Test}
+import org.junit.Test
 
 class HoverNamedArgSuite extends BaseHoverSuite:
 

diff --git a/presentation-compiler/test/dotty/tools/pc/tests/hover/HoverRangeSuite.scala b/presentation-compiler/test/dotty/tools/pc/tests/hover/HoverRangeSuite.scala
@@ -235,7 +235,7 @@ class HoverRangeSuite extends BaseHoverSuite:
          |inline transparent def foo(i: Int): Foo""".stripMargin.hoverRange
     )
 
-  @Test def `deptypes` =
+  @Test def `dep-types` =
     check(
       """|trait A
          |object A1 extends A

diff --git a/presentation-compiler/test/dotty/tools/pc/tests/hover/HoverTermSuite.scala b/presentation-compiler/test/dotty/tools/pc/tests/hover/HoverTermSuite.scala
@@ -400,10 +400,10 @@ class HoverTermSuite extends BaseHoverSuite:
 
   @Test def `annot` =
     check(
-      """|
+      """|import scala.annotation.tailrec
          |
          |object O {
-         |  @<<scala.annotation.tail@@rec>>
+         |  @<<tail@@rec>>
          |  def hello(n: Int): Int = {
          |    if (i == 0) 0
          |    else hello( n - 1)

diff --git a/presentation-compiler/test/dotty/tools/pc/utils/TestingWorkspaceSearch.scala b/presentation-compiler/test/dotty/tools/pc/utils/TestingWorkspaceSearch.scala
@@ -16,7 +16,6 @@ import dotty.tools.dotc.core.Symbols.*
 import dotty.tools.dotc.interactive.InteractiveDriver
 import dotty.tools.dotc.semanticdb.SemanticSymbolBuilder
 import dotty.tools.pc.CompilerSearchVisitor
-import java.nio.file.Files
 
 object TestingWorkspaceSearch:
   def empty: TestingWorkspaceSearch = new TestingWorkspaceSearch(Nil)

diff --git a/project/Build.scala b/project/Build.scala
@@ -1156,6 +1156,7 @@ object Build {
     val mtagsVersion = "0.11.12+45-45df705d-SNAPSHOT" // Will be set to stable release after 0.11.13 is published
 
     Seq(
+      scalacOptions += "-Wunused:all",
       libraryDependencies ++= Seq(
         "org.lz4" % "lz4-java" % "1.8.0",
         "io.get-coursier" % "interface" % "1.0.13",