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

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

Hide file tree

Showing 22 changed files with 256 additions and 130 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/ExtractMethodProvider.scala b/presentation-compiler/src/main/dotty/tools/pc/ExtractMethodProvider.scala
@@ -51,7 +51,8 @@ final class ExtractMethodProvider(
  val newctx = driver.currentCtx.fresh.setCompilationUnit(unit)
  Interactive.contextOfPath(path)(using newctx)
  val indexedCtx = IndexedContext(locatedCtx)
- val printer = ShortenedTypePrinter(search, IncludeDefaultParam.Never)(using indexedCtx)
+ val printer =
+ ShortenedTypePrinter(search, IncludeDefaultParam.Never)(using indexedCtx)
  def prettyPrint(tpe: Type) =
  def prettyPrintReturnType(tpe: Type): String =
  tpe match

diff --git a/presentation-compiler/src/main/dotty/tools/pc/HoverProvider.scala b/presentation-compiler/src/main/dotty/tools/pc/HoverProvider.scala
@@ -89,7 +89,9 @@ object HoverProvider:
  ctx.fresh.setCompilationUnit(unit)
  Interactive.contextOfPath(enclosing)(using newctx)
  case None => ctx
- val printer = ShortenedTypePrinter(search, IncludeDefaultParam.Include)(using IndexedContext(printerContext))
+ val printer = ShortenedTypePrinter(search, IncludeDefaultParam.Include)(
+ using IndexedContext(printerContext)
+ )
  MetalsInteractive.enclosingSymbolsWithExpressionType(
  enclosing,
  pos,

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,8 +69,8 @@ class PcDefinitionProvider(
  * @param pos cursor position
  * @return definition result
  */
- private def fallbackToUntyped(unit: CompilationUnit, pos: SourcePosition)(
- using ctx: Context
+ private def fallbackToUntyped(pos: SourcePosition)(using
+ ctx: Context
  ) =
  lazy val untpdPath = NavigateAST
  .untypedPath(pos.span)

diff --git a/presentation-compiler/src/main/dotty/tools/pc/completions/CompletionProvider.scala b/presentation-compiler/src/main/dotty/tools/pc/completions/CompletionProvider.scala
@@ -150,7 +150,10 @@ class CompletionProvider(
  path: List[Tree],
  indexedContext: IndexedContext
  )(using ctx: Context): CompletionItem =
- val printer = ShortenedTypePrinter(search, IncludeDefaultParam.ResolveLater)(using indexedContext)
+ val printer =
+ ShortenedTypePrinter(search, IncludeDefaultParam.ResolveLater)(using
+ indexedContext
+ )
  val editRange = completionPos.toEditRange
 
  // For overloaded signatures we get multiple symbols, so we need

diff --git a/presentation-compiler/src/main/dotty/tools/pc/completions/CompletionValue.scala b/presentation-compiler/src/main/dotty/tools/pc/completions/CompletionValue.scala
@@ -34,7 +34,9 @@ sealed trait CompletionValue:
  /**
  * Label with potentially attached description.
  */
- def labelWithDescription(printer: ShortenedTypePrinter)(using Context): String =
+ def labelWithDescription(printer: ShortenedTypePrinter)(using
+ Context
+ ): String =
  label
  def lspTags(using Context): List[CompletionItemTag] = Nil
 end CompletionValue
@@ -83,7 +85,9 @@ object CompletionValue:
  else s"${label}${description(printer)}"
  else s"${label}: ${description(printer)}"
 
- override def description(printer: ShortenedTypePrinter)(using Context): String =
+ override def description(printer: ShortenedTypePrinter)(using
+ Context
+ ): String =
  printer.completionSymbol(symbol)
  end Symbolic
 
@@ -111,7 +115,9 @@ object CompletionValue:
  ) extends Symbolic:
  override def completionItemKind(using Context): CompletionItemKind =
  CompletionItemKind.Method
- override def description(printer: ShortenedTypePrinter)(using Context): String =
+ override def description(printer: ShortenedTypePrinter)(using
+ Context
+ ): String =
  s"${printer.completionSymbol(symbol)} (extension)"
 
  /**
@@ -148,7 +154,9 @@ object CompletionValue:
  override def insertText: Option[String] = Some(label.replace("$", "$$"))
  override def completionItemKind(using Context): CompletionItemKind =
  CompletionItemKind.Field
- override def description(printer: ShortenedTypePrinter)(using Context): String =
+ override def description(printer: ShortenedTypePrinter)(using
+ Context
+ ): String =
  ": " + printer.tpe(tpe)
 
  override def labelWithDescription(printer: ShortenedTypePrinter)(using
@@ -199,7 +207,9 @@ object CompletionValue:
  isWorkspace: Boolean = false,
  isExtension: Boolean = false
  ) extends Symbolic:
- override def description(printer: ShortenedTypePrinter)(using Context): String =
+ override def description(
+ printer: ShortenedTypePrinter
+ )(using Context): String =
  if isExtension then s"${printer.completionSymbol(symbol)} (extension)"
  else super.description(printer)
  end Interpolator
@@ -212,7 +222,9 @@ object CompletionValue:
  ) extends CompletionValue:
  override def completionItemKind(using Context): CompletionItemKind =
  CompletionItemKind.Enum
- override def description(printer: ShortenedTypePrinter)(using Context): String =
+ override def description(printer: ShortenedTypePrinter)(using
+ Context
+ ): String =
  desc
 
  case class CaseKeyword(
@@ -239,7 +251,9 @@ object CompletionValue:
  override def completionItemKind(using Context): CompletionItemKind =
  CompletionItemKind.Snippet
 
- override def description(printer: ShortenedTypePrinter)(using Context): String =
+ override def description(printer: ShortenedTypePrinter)(using
+ Context
+ ): String =
  description
  override def insertMode: Option[InsertTextMode] = Some(InsertTextMode.AsIs)
 

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