Skip to content

Commit aa7542f

Browse files
committed
undo unnecessary changes, add -Wunsued:all, remove unused
1 parent 5ee339d commit aa7542f

22 files changed

+256
-130
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package dotty.tools.pc
22

33
import scala.annotation.tailrec
44
import scala.jdk.CollectionConverters.*
5-
import scala.meta.internal.mtags.KeywordWrapper
65
import scala.meta.internal.pc.AutoImportPosition
76
import scala.meta.pc.PresentationCompilerConfig
87

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,8 @@ final class ExtractMethodProvider(
5151
val newctx = driver.currentCtx.fresh.setCompilationUnit(unit)
5252
Interactive.contextOfPath(path)(using newctx)
5353
val indexedCtx = IndexedContext(locatedCtx)
54-
val printer = ShortenedTypePrinter(search, IncludeDefaultParam.Never)(using indexedCtx)
54+
val printer =
55+
ShortenedTypePrinter(search, IncludeDefaultParam.Never)(using indexedCtx)
5556
def prettyPrint(tpe: Type) =
5657
def prettyPrintReturnType(tpe: Type): String =
5758
tpe match

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,9 @@ object HoverProvider:
8989
ctx.fresh.setCompilationUnit(unit)
9090
Interactive.contextOfPath(enclosing)(using newctx)
9191
case None => ctx
92-
val printer = ShortenedTypePrinter(search, IncludeDefaultParam.Include)(using IndexedContext(printerContext))
92+
val printer = ShortenedTypePrinter(search, IncludeDefaultParam.Include)(
93+
using IndexedContext(printerContext)
94+
)
9395
MetalsInteractive.enclosingSymbolsWithExpressionType(
9496
enclosing,
9597
pos,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -315,8 +315,8 @@ abstract class PcCollector[T](
315315
case _ => resultAllOccurences().toList
316316

317317
def resultAllOccurences(): Set[T] =
318-
def noTreeFilter = (tree: Tree) => true
319-
def noSoughtFilter = (f: Symbol => Boolean) => true
318+
def noTreeFilter = (_: Tree) => true
319+
def noSoughtFilter = (_: Symbol => Boolean) => true
320320

321321
traverseSought(noTreeFilter, noSoughtFilter)
322322

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import scala.meta.pc.DefinitionResult
99
import scala.meta.pc.OffsetParams
1010
import scala.meta.pc.SymbolSearch
1111

12-
import dotty.tools.dotc.CompilationUnit
1312
import dotty.tools.dotc.ast.NavigateAST
1413
import dotty.tools.dotc.ast.tpd.*
1514
import dotty.tools.dotc.ast.untpd
@@ -43,8 +42,6 @@ class PcDefinitionProvider(
4342
uri,
4443
SourceFile.virtual(filePath.toString, params.text)
4544
)
46-
val unit = driver.currentCtx.run.units.head
47-
val tree = unit.tpdTree
4845

4946
val pos = driver.sourcePosition(params)
5047
val path =
@@ -56,7 +53,7 @@ class PcDefinitionProvider(
5653
if findTypeDef then findTypeDefinitions(path, pos, indexedContext)
5754
else findDefinitions(path, pos, indexedContext)
5855

59-
if result.locations().isEmpty() then fallbackToUntyped(unit, pos)(using ctx)
56+
if result.locations().isEmpty() then fallbackToUntyped(pos)(using ctx)
6057
else result
6158
end definitions
6259

@@ -72,8 +69,8 @@ class PcDefinitionProvider(
7269
* @param pos cursor position
7370
* @return definition result
7471
*/
75-
private def fallbackToUntyped(unit: CompilationUnit, pos: SourcePosition)(
76-
using ctx: Context
72+
private def fallbackToUntyped(pos: SourcePosition)(using
73+
ctx: Context
7774
) =
7875
lazy val untpdPath = NavigateAST
7976
.untypedPath(pos.span)

presentation-compiler/src/main/dotty/tools/pc/completions/CompletionProvider.scala

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,10 @@ class CompletionProvider(
150150
path: List[Tree],
151151
indexedContext: IndexedContext
152152
)(using ctx: Context): CompletionItem =
153-
val printer = ShortenedTypePrinter(search, IncludeDefaultParam.ResolveLater)(using indexedContext)
153+
val printer =
154+
ShortenedTypePrinter(search, IncludeDefaultParam.ResolveLater)(using
155+
indexedContext
156+
)
154157
val editRange = completionPos.toEditRange
155158

156159
// For overloaded signatures we get multiple symbols, so we need

presentation-compiler/src/main/dotty/tools/pc/completions/CompletionValue.scala

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,9 @@ sealed trait CompletionValue:
3434
/**
3535
* Label with potentially attached description.
3636
*/
37-
def labelWithDescription(printer: ShortenedTypePrinter)(using Context): String =
37+
def labelWithDescription(printer: ShortenedTypePrinter)(using
38+
Context
39+
): String =
3840
label
3941
def lspTags(using Context): List[CompletionItemTag] = Nil
4042
end CompletionValue
@@ -83,7 +85,9 @@ object CompletionValue:
8385
else s"${label}${description(printer)}"
8486
else s"${label}: ${description(printer)}"
8587

86-
override def description(printer: ShortenedTypePrinter)(using Context): String =
88+
override def description(printer: ShortenedTypePrinter)(using
89+
Context
90+
): String =
8791
printer.completionSymbol(symbol)
8892
end Symbolic
8993

@@ -111,7 +115,9 @@ object CompletionValue:
111115
) extends Symbolic:
112116
override def completionItemKind(using Context): CompletionItemKind =
113117
CompletionItemKind.Method
114-
override def description(printer: ShortenedTypePrinter)(using Context): String =
118+
override def description(printer: ShortenedTypePrinter)(using
119+
Context
120+
): String =
115121
s"${printer.completionSymbol(symbol)} (extension)"
116122

117123
/**
@@ -148,7 +154,9 @@ object CompletionValue:
148154
override def insertText: Option[String] = Some(label.replace("$", "$$"))
149155
override def completionItemKind(using Context): CompletionItemKind =
150156
CompletionItemKind.Field
151-
override def description(printer: ShortenedTypePrinter)(using Context): String =
157+
override def description(printer: ShortenedTypePrinter)(using
158+
Context
159+
): String =
152160
": " + printer.tpe(tpe)
153161

154162
override def labelWithDescription(printer: ShortenedTypePrinter)(using
@@ -199,7 +207,9 @@ object CompletionValue:
199207
isWorkspace: Boolean = false,
200208
isExtension: Boolean = false
201209
) extends Symbolic:
202-
override def description(printer: ShortenedTypePrinter)(using Context): String =
210+
override def description(
211+
printer: ShortenedTypePrinter
212+
)(using Context): String =
203213
if isExtension then s"${printer.completionSymbol(symbol)} (extension)"
204214
else super.description(printer)
205215
end Interpolator
@@ -212,7 +222,9 @@ object CompletionValue:
212222
) extends CompletionValue:
213223
override def completionItemKind(using Context): CompletionItemKind =
214224
CompletionItemKind.Enum
215-
override def description(printer: ShortenedTypePrinter)(using Context): String =
225+
override def description(printer: ShortenedTypePrinter)(using
226+
Context
227+
): String =
216228
desc
217229

218230
case class CaseKeyword(
@@ -239,7 +251,9 @@ object CompletionValue:
239251
override def completionItemKind(using Context): CompletionItemKind =
240252
CompletionItemKind.Snippet
241253

242-
override def description(printer: ShortenedTypePrinter)(using Context): String =
254+
override def description(printer: ShortenedTypePrinter)(using
255+
Context
256+
): String =
243257
description
244258
override def insertMode: Option[InsertTextMode] = Some(InsertTextMode.AsIs)
245259

presentation-compiler/src/main/dotty/tools/pc/completions/KeywordsCompletions.scala

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ object KeywordsCompletions:
2020
comments: List[Comment]
2121
)(using ctx: Context): List[CompletionValue] =
2222
lazy val notInComment =
23-
checkIfNotInComment(completionPos.cursorPos, path, comments)
23+
checkIfNotInComment(completionPos.cursorPos, comments)
2424

2525
path match
2626
case Nil if completionPos.query.isEmpty =>
@@ -69,9 +69,8 @@ object KeywordsCompletions:
6969

7070
private def checkIfNotInComment(
7171
pos: SourcePosition,
72-
path: List[Tree],
7372
comments: List[Comment]
74-
)(using ctx: Context): Boolean =
73+
): Boolean =
7574
!comments.exists(_.span.contains(pos.span))
7675

7776
private def isPackage(enclosing: List[Tree]): Boolean =

presentation-compiler/src/main/dotty/tools/pc/completions/MatchCaseCompletions.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,6 @@ object CaseKeywordCompletion:
241241
completionPos,
242242
clientSupportsSnippets
243243
)
244-
val result = ListBuffer.empty[CompletionValue]
245244
val tpe = selector.tpe.widen.bounds.hi match
246245
case tr @ TypeRef(_, _) => tr.underlying
247246
case t => t

0 commit comments

Comments
 (0)