Remove unused imports, fields

Author: rochala

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

@@ -5,7 +5,7 @@ import scala.annotation.tailrec
 
 import dotc.*
 import ast.*, tpd.*
-import core.*, Contexts.*, Decorators.*, Flags.*, Names.*, Symbols.*, Types.*
+import core.*, Contexts.*, Flags.*, Names.*, Symbols.*, Types.*
 import interactive.*
 import util.*
 import util.SourcePosition

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

@@ -24,7 +24,6 @@ import dotty.tools.dotc.interactive.InteractiveDriver
 import dotty.tools.dotc.util.SourceFile
 import dotty.tools.dotc.util.SourcePosition
 import dotty.tools.dotc.util.Spans.Span
-import dotty.tools.pc.IndexedContext
 
 import org.eclipse.lsp4j.InlayHint
 import org.eclipse.lsp4j.InlayHintKind

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

@@ -6,20 +6,14 @@ import dotty.tools.dotc.core.Flags
 import dotty.tools.dotc.core.Symbols.*
 import dotty.tools.dotc.interactive.Interactive
 import dotty.tools.dotc.interactive.InteractiveDriver
-import dotty.tools.dotc.parsing.Tokens.closingRegionTokens
-import dotty.tools.dotc.reporting.ErrorMessageID
-import dotty.tools.dotc.reporting.ExpectedTokenButFound
 import dotty.tools.dotc.util.Signatures
 import dotty.tools.dotc.util.SourceFile
-import dotty.tools.dotc.util.Spans
-import dotty.tools.dotc.util.Spans.Span
 import dotty.tools.pc.printer.ShortenedTypePrinter
 import dotty.tools.pc.printer.ShortenedTypePrinter.IncludeDefaultParam
 import dotty.tools.pc.utils.MtagsEnrichments.*
 import org.eclipse.lsp4j as l
 
 import scala.jdk.CollectionConverters.*
-import scala.jdk.OptionConverters.*
 import scala.meta.internal.metals.ReportContext
 import scala.meta.pc.OffsetParams
 import scala.meta.pc.SymbolDocumentation

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

@@ -196,8 +196,8 @@ class CompletionProvider(
       item
     end mkItem
 
-    val completionTextSuffix = completion.snippetSuffix.toSuffix
-    val completionTextPrefix = completion.snippetSuffix.toPrefix
+    val completionTextSuffix = completion.snippetAffix.toSuffix
+    val completionTextPrefix = completion.snippetAffix.toPrefix
 
     lazy val isInStringInterpolation =
       path match
@@ -280,7 +280,7 @@ class CompletionProvider(
       case _ =>
         val nameText = completion.insertText.getOrElse(ident.backticked(backtickSoftKeyword))
         val nameWithAffixes = completionTextPrefix + nameText + completionTextSuffix
-        val insertText = if completion.snippetSuffix.nonEmpty && isInStringInterpolation then
+        val insertText = if completion.snippetAffix.nonEmpty && isInStringInterpolation then
           "{" + nameWithAffixes + "}"
         else nameWithAffixes
         mkItem(insertText, range = completion.range)

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

@@ -40,7 +40,7 @@ enum CompletionSource:
 sealed trait CompletionValue:
   def label: String
   def insertText: Option[String] = None
-  def snippetSuffix: CompletionAffix = CompletionAffix.empty
+  def snippetAffix: CompletionAffix = CompletionAffix.empty
   def additionalEdits: List[TextEdit] = Nil
   def range: Option[Range] = None
   def filterText: Option[String] = None
@@ -96,7 +96,7 @@ object CompletionValue:
     override def labelWithDescription(
         printer: ShortenedTypePrinter
     )(using Context): String =
-      if symbol.isConstructor then s"${snippetSuffix.toPrefix}${label}${description(printer)}"
+      if symbol.isConstructor then s"${snippetAffix.toPrefix}${label}${description(printer)}"
       else if symbol.is(Method) then s"${label}${description(printer)}"
       else if symbol.is(Mutable) then s"$label: ${description(printer)}"
       else if symbol.is(Package) || symbol.is(Module) || symbol.isClass then
@@ -107,7 +107,7 @@ object CompletionValue:
       else s"$label: ${description(printer)}"
 
     protected def labelWithSuffix(printer: ShortenedTypePrinter)(using Context): String =
-      if snippetSuffix.addLabelSnippet
+      if snippetAffix.addLabelSnippet
       then
         val printedParams = symbol.info.typeParams.map(p =>
           p.paramName.decoded ++ printer.tpe(p.paramInfo)
@@ -123,28 +123,28 @@ object CompletionValue:
   case class Compiler(
       label: String,
       denotation: Denotation,
-      override val snippetSuffix: CompletionAffix
+      override val snippetAffix: CompletionAffix
   ) extends Symbolic:
     override def completionItemDataKind: Integer = CompletionSource.CompilerKind.ordinal
 
   case class Scope(
       label: String,
       denotation: Denotation,
-      override val snippetSuffix: CompletionAffix,
+      override val snippetAffix: CompletionAffix,
   ) extends Symbolic:
     override def completionItemDataKind: Integer = CompletionSource.ScopeKind.ordinal
 
   case class Workspace(
       label: String,
       denotation: Denotation,
-      override val snippetSuffix: CompletionAffix,
+      override val snippetAffix: CompletionAffix,
       override val importSymbol: Symbol
   ) extends Symbolic:
     override def completionItemDataKind: Integer = CompletionSource.WorkspaceKind.ordinal
 
     override def labelWithDescription(printer: ShortenedTypePrinter)(using Context): String =
       if symbol.isConstructor || symbol.name == nme.apply then
-        s"${snippetSuffix.toPrefix}${label}${description(printer)} - ${printer.fullNameString(importSymbol.effectiveOwner)}"
+        s"${snippetAffix.toPrefix}${label}${description(printer)} - ${printer.fullNameString(importSymbol.effectiveOwner)}"
       else if symbol.is(Method) then
         s"${labelWithSuffix(printer)} - ${printer.fullNameString(symbol.effectiveOwner)}"
       else if symbol.is(Package) || symbol.is(Module) || symbol.isClass then
@@ -157,7 +157,7 @@ object CompletionValue:
   case class ImplicitClass(
       label: String,
       denotation: Denotation,
-      override val snippetSuffix: CompletionAffix,
+      override val snippetAffix: CompletionAffix,
       override val importSymbol: Symbol,
   ) extends Symbolic:
     override def completionItemKind(using Context): CompletionItemKind =
@@ -172,7 +172,7 @@ object CompletionValue:
   case class Extension(
       label: String,
       denotation: Denotation,
-      override val snippetSuffix: CompletionAffix
+      override val snippetAffix: CompletionAffix
   ) extends Symbolic:
     override def completionItemKind(using Context): CompletionItemKind =
       CompletionItemKind.Method
@@ -257,6 +257,7 @@ object CompletionValue:
     override def completionItemKind(using Context): CompletionItemKind =
       CompletionItemKind.Folder
 
+  // TODO remove this type and return `Compiler`, `Workspace` instead
   case class Interpolator(
       denotation: Denotation,
       label: String,

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

@@ -13,7 +13,6 @@ import scala.meta.pc.*
 
 import dotty.tools.dotc.ast.tpd.*
 import dotty.tools.dotc.ast.untpd
-import dotty.tools.dotc.ast.NavigateAST
 import dotty.tools.dotc.core.Comments.Comment
 import dotty.tools.dotc.core.Constants.Constant
 import dotty.tools.dotc.core.Contexts.*
@@ -34,18 +33,6 @@ import dotty.tools.pc.completions.OverrideCompletions.OverrideExtractor
 import dotty.tools.pc.buildinfo.BuildInfo
 import dotty.tools.pc.utils.MtagsEnrichments.*
 import dotty.tools.dotc.core.Denotations.SingleDenotation
-import dotty.tools.dotc.interactive.Interactive
-
-import java.nio.file.Path
-import java.nio.file.Paths
-import scala.collection.mutable
-import scala.meta.internal.metals.ReportContext
-import scala.meta.internal.mtags.CoursierComplete
-import scala.meta.internal.pc.CompletionFuzzy
-import scala.meta.internal.pc.IdentifierComparator
-import scala.meta.internal.pc.MemberOrdering
-import scala.meta.pc.*
-import scala.collection.concurrent.TrieMap
 
 class Completions(
     text: String,
@@ -138,7 +125,6 @@ class Completions(
           case Select(qual, _) :: _ if qual.typeOpt.isErroneous =>
             (allAdvanced, SymbolSearch.Result.COMPLETE)
           case Select(qual, _) :: _ =>
-            val compilerCompletions = Completion.rawCompletions(completionPos.originalCursorPosition, completionMode, completionPos.query, path, adjustedPath)
             val (compiler, result) = enrichedCompilerCompletions(qual.typeOpt.widenDealias)
             (allAdvanced ++ compiler, result)
           case _ =>
@@ -531,7 +517,7 @@ class Completions(
                 CompletionValue.Workspace(
                   label = undoBacktick(sym.decodedName),
                   denotation = sym,
-                  snippetSuffix = CompletionAffix.empty,
+                  snippetAffix = CompletionAffix.empty,
                   importSymbol = sym
                 )
               )
@@ -618,7 +604,7 @@ class Completions(
     symbolicCompletionsMap.foreach: (name, denots) =>
       lazy val existsTypeWithSuffix: Boolean = symbolicCompletionsMap
         .get(name.toTypeName)
-        .forall(_.forall(sym => sym.snippetSuffix.suffixes.nonEmpty))
+        .forall(_.forall(sym => sym.snippetAffix.suffixes.nonEmpty))
 
       if completionMode.is(Mode.Term) && !completionMode.is(Mode.ImportOrExport) then
         typeResultMappings += name -> denots
@@ -648,7 +634,7 @@ class Completions(
               val sym = symOnly.symbol
               val name = SemanticdbSymbols.symbolName(sym)
               val suffix =
-                if symOnly.snippetSuffix.addLabelSnippet then "[]" else ""
+                if symOnly.snippetAffix.addLabelSnippet then "[]" else ""
               val id = name + suffix
               val include = includeSymbol(sym)
               (id, include)

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

@@ -12,9 +12,7 @@ import dotty.tools.dotc.core.Contexts.Context
 import dotty.tools.dotc.core.Flags
 import dotty.tools.dotc.core.Flags.*
 import dotty.tools.dotc.core.Symbols.Symbol
-import dotty.tools.dotc.util.Spans
 import dotty.tools.dotc.core.Types.Type
-import dotty.tools.dotc.util.SourcePosition
 import dotty.tools.pc.CompilerSearchVisitor
 import dotty.tools.pc.IndexedContext
 import dotty.tools.pc.utils.MtagsEnrichments.*

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

@@ -15,7 +15,6 @@ import dotty.tools.toOption
 import dotty.tools.dotc.ast.tpd.*
 import dotty.tools.dotc.core.Constants.Constant
 import dotty.tools.dotc.core.Contexts.Context
-import dotty.tools.dotc.core.Definitions
 import dotty.tools.dotc.core.Denotations.Denotation
 import dotty.tools.dotc.core.Flags
 import dotty.tools.dotc.core.Flags.*
@@ -24,7 +23,6 @@ import dotty.tools.dotc.core.Symbols.NoSymbol
 import dotty.tools.dotc.core.Symbols.Symbol
 import dotty.tools.dotc.core.Types.AndType
 import dotty.tools.dotc.core.Types.ClassInfo
-import dotty.tools.dotc.core.Types.NoType
 import dotty.tools.dotc.core.Types.OrType
 import dotty.tools.dotc.core.Types.Type
 import dotty.tools.dotc.core.Types.TypeRef

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

@@ -2,7 +2,6 @@ package dotty.tools.pc.completions
 
 import scala.util.Try
 
-import dotty.tools.dotc.ast.NavigateAST
 import dotty.tools.dotc.ast.Trees.ValDef
 import dotty.tools.dotc.ast.tpd.*
 import dotty.tools.dotc.ast.untpd
@@ -439,4 +438,4 @@ case class JustSymbol(symbol: Symbol)(using Context) extends ParamSymbol:
   def info: Type = symbol.info
 
 case class RefinedSymbol(symbol: Symbol, name: Name, info: Type)
-    extends ParamSymbol
+    extends ParamSymbol