rename MtagsEnrichments to InteractiveEnrichments, rename metalsDealias to deepDealias, dealias type members of structural types

Author: rochala

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

@@ -13,7 +13,7 @@ import dotty.tools.dotc.core.Names.*
 import dotty.tools.dotc.core.Symbols.*
 import dotty.tools.dotc.util.SourcePosition
 import dotty.tools.dotc.util.Spans
-import dotty.tools.pc.utils.MtagsEnrichments.*
+import dotty.tools.pc.utils.InteractiveEnrichments.*
 
 import org.eclipse.lsp4j as l
 

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

@@ -15,7 +15,7 @@ import dotty.tools.dotc.interactive.InteractiveDriver
 import dotty.tools.dotc.util.SourceFile
 import dotty.tools.pc.AutoImports.*
 import dotty.tools.pc.completions.CompletionPos
-import dotty.tools.pc.utils.MtagsEnrichments.*
+import dotty.tools.pc.utils.InteractiveEnrichments.*
 
 import org.eclipse.lsp4j as l
 

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

@@ -9,7 +9,7 @@ import dotty.tools.dotc.core.Contexts.Context
 import dotty.tools.dotc.core.Flags.*
 import dotty.tools.dotc.core.Symbols.*
 import dotty.tools.dotc.core.Types.TermRef
-import dotty.tools.pc.utils.MtagsEnrichments.*
+import dotty.tools.pc.utils.InteractiveEnrichments.*
 
 import org.eclipse.lsp4j.CompletionItem
 
@@ -62,7 +62,7 @@ object CompletionItemResolver extends ItemResolver:
     if companion == NoSymbol || gsym.is(JavaDefined) then
       if gsymDoc.isEmpty() then
         if gsym.isAliasType then
-          fullDocstring(gsym.info.metalsDealias.typeSymbol, search)
+          fullDocstring(gsym.info.deepDealias.typeSymbol, search)
         else if gsym.is(Method) then
           gsym.info.finalResultType match
             case tr @ TermRef(_, sym) =>

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

@@ -12,7 +12,7 @@ import dotty.tools.dotc.core.Types.MethodType
 import dotty.tools.dotc.interactive.Interactive
 import dotty.tools.dotc.interactive.InteractiveDriver
 import dotty.tools.dotc.util.SourceFile
-import dotty.tools.pc.utils.MtagsEnrichments.*
+import dotty.tools.pc.utils.InteractiveEnrichments.*
 
 import org.eclipse.lsp4j as l
 

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

@@ -23,7 +23,7 @@ import dotty.tools.dotc.util.SourceFile
 import dotty.tools.dotc.util.SourcePosition
 import dotty.tools.pc.printer.ShortenedTypePrinter
 import dotty.tools.pc.printer.ShortenedTypePrinter.IncludeDefaultParam
-import dotty.tools.pc.utils.MtagsEnrichments.*
+import dotty.tools.pc.utils.InteractiveEnrichments.*
 
 import org.eclipse.lsp4j.TextEdit
 import org.eclipse.lsp4j as l

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

@@ -23,7 +23,7 @@ import dotty.tools.dotc.util.SourceFile
 import dotty.tools.dotc.util.SourcePosition
 import dotty.tools.pc.printer.ShortenedTypePrinter
 import dotty.tools.pc.printer.ShortenedTypePrinter.IncludeDefaultParam
-import dotty.tools.pc.utils.MtagsEnrichments.*
+import dotty.tools.pc.utils.InteractiveEnrichments.*
 
 object HoverProvider:
 
@@ -106,7 +106,7 @@ object HoverProvider:
             if symbol.name == nme.selectDynamic || symbol.name == nme.applyDynamic =>
           fallbackToDynamics(path, printer)
         case symbolTpes @ ((symbol, tpe) :: _) =>
-          val exprTpw = tpe.widenTermRefExpr.metalsDealias
+          val exprTpw = tpe.widenTermRefExpr.deepDealias
           val hoverString =
             tpw match
               // https://github.com/scala/scala3/issues/8891
@@ -121,7 +121,7 @@ object HoverProvider:
                   if tpe != NoType then tpe
                   else tpw
 
-                printer.hoverSymbol(sym, finalTpe)
+                printer.hoverSymbol(sym, finalTpe.deepDealias)
             end match
           end hoverString
 
@@ -185,9 +185,9 @@ object HoverProvider:
             findRefinement(parent)
           case _ => None
 
-      val refTpe = sel.typeOpt.widen.metalsDealias match
+      val refTpe = sel.typeOpt.widen.deepDealias match
         case r: RefinedType => Some(r)
-        case t: (TermRef | TypeProxy) => Some(t.termSymbol.info.metalsDealias)
+        case t: (TermRef | TypeProxy) => Some(t.termSymbol.info.deepDealias)
         case _ => None
 
       refTpe.flatMap(findRefinement).asJava

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

@@ -13,7 +13,7 @@ import dotty.tools.dotc.core.Types.*
 import dotty.tools.dotc.interactive.Interactive
 import dotty.tools.dotc.typer.ImportInfo
 import dotty.tools.pc.IndexedContext.Result
-import dotty.tools.pc.utils.MtagsEnrichments.*
+import dotty.tools.pc.utils.InteractiveEnrichments.*
 
 sealed trait IndexedContext:
   given ctx: Context
@@ -75,7 +75,7 @@ sealed trait IndexedContext:
     )
 
   private def isTypeAliasOf(alias: Symbol, queriedSym: Symbol): Boolean =
-    alias.isAliasType && alias.info.metalsDealias.typeSymbol  == queriedSym
+    alias.isAliasType && alias.info.deepDealias.typeSymbol  == queriedSym
 
   final def isEmpty: Boolean = this match
     case IndexedContext.Empty => true

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

@@ -24,7 +24,7 @@ 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 dotty.tools.pc.utils.InteractiveEnrichments.*
 
 import org.eclipse.lsp4j.TextEdit
 import org.eclipse.lsp4j as l
@@ -101,7 +101,7 @@ final class InferredTypeProvider(
           case _ => true
       if isInScope(tpe)
       then tpe
-      else tpe.metalsDealias
+      else tpe.deepDealias
 
     val printer = ShortenedTypePrinter(
       symbolSearch,

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

@@ -240,7 +240,7 @@ object MetalsInteractive:
     end match
   end enclosingSymbolsWithExpressionType
 
-  import dotty.tools.pc.utils.MtagsEnrichments.*
+  import dotty.tools.pc.utils.InteractiveEnrichments.*
 
   private def recoverError(
       tree: Tree,

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

@@ -26,7 +26,7 @@ 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.utils.MtagsEnrichments.*
+import dotty.tools.pc.utils.InteractiveEnrichments.*
 
 abstract class PcCollector[T](
     driver: InteractiveDriver,

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

@@ -19,7 +19,7 @@ import dotty.tools.dotc.interactive.Interactive
 import dotty.tools.dotc.interactive.InteractiveDriver
 import dotty.tools.dotc.util.SourceFile
 import dotty.tools.dotc.util.SourcePosition
-import dotty.tools.pc.utils.MtagsEnrichments.*
+import dotty.tools.pc.utils.InteractiveEnrichments.*
 
 import org.eclipse.lsp4j.Location
 

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

@@ -6,7 +6,7 @@ import dotty.tools.dotc.ast.tpd.*
 import dotty.tools.dotc.core.Symbols.*
 import dotty.tools.dotc.interactive.InteractiveDriver
 import dotty.tools.dotc.util.SourcePosition
-import dotty.tools.pc.utils.MtagsEnrichments.*
+import dotty.tools.pc.utils.InteractiveEnrichments.*
 
 import org.eclipse.lsp4j.DocumentHighlight
 import org.eclipse.lsp4j.DocumentHighlightKind

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

@@ -4,7 +4,7 @@ package dotty.tools.pc
 import java.nio.file.Paths
 
 import scala.meta.internal.metals.ReportContext
-import dotty.tools.pc.utils.MtagsEnrichments.*
+import dotty.tools.pc.utils.InteractiveEnrichments.*
 import dotty.tools.pc.printer.ShortenedTypePrinter
 import scala.meta.internal.pc.InlayHints
 import scala.meta.internal.pc.LabelPart
@@ -140,7 +140,7 @@ class PcInlayHintsProvider(
             isInScope(tycon) && args.forall(isInScope)
           case _ => true
       if isInScope(tpe) then tpe
-      else tpe.metalsDealias(using indexedCtx.ctx)
+      else tpe.deepDealias(using indexedCtx.ctx)
 
     val dealiased = optDealias(tpe)
     val tpeStr = printer.tpe(dealiased)

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

@@ -17,7 +17,7 @@ import dotty.tools.dotc.core.Symbols.Symbol
 import dotty.tools.dotc.interactive.Interactive
 import dotty.tools.dotc.interactive.InteractiveDriver
 import dotty.tools.dotc.util.SourcePosition
-import dotty.tools.pc.utils.MtagsEnrichments.*
+import dotty.tools.pc.utils.InteractiveEnrichments.*
 
 import org.eclipse.lsp4j as l
 

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

@@ -8,7 +8,7 @@ import dotty.tools.dotc.core.Flags.*
 import dotty.tools.dotc.core.Symbols.Symbol
 import dotty.tools.dotc.interactive.InteractiveDriver
 import dotty.tools.dotc.util.SourcePosition
-import dotty.tools.pc.utils.MtagsEnrichments.*
+import dotty.tools.pc.utils.InteractiveEnrichments.*
 
 import org.eclipse.lsp4j as l
 

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

@@ -12,7 +12,7 @@ import dotty.tools.dotc.core.Symbols.NoSymbol
 import dotty.tools.dotc.core.Symbols.Symbol
 import dotty.tools.dotc.interactive.InteractiveDriver
 import dotty.tools.dotc.util.SourcePosition
-import dotty.tools.pc.utils.MtagsEnrichments.*
+import dotty.tools.pc.utils.InteractiveEnrichments.*
 
 import org.eclipse.lsp4j.SemanticTokenModifiers
 import org.eclipse.lsp4j.SemanticTokenTypes

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

@@ -12,7 +12,7 @@ import dotty.tools.dotc.interactive.Interactive
 import dotty.tools.dotc.interactive.InteractiveDriver
 import dotty.tools.dotc.util.SourceFile
 import dotty.tools.dotc.util.SourcePosition
-import dotty.tools.pc.utils.MtagsEnrichments.*
+import dotty.tools.pc.utils.InteractiveEnrichments.*
 
 import org.eclipse.lsp4j
 import org.eclipse.lsp4j.SelectionRange

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

@@ -7,7 +7,7 @@ import dotty.tools.dotc.core.Flags.*
 import dotty.tools.dotc.core.Names.*
 import dotty.tools.dotc.core.Symbols.*
 import dotty.tools.dotc.semanticdb.*
-import dotty.tools.pc.utils.MtagsEnrichments.*
+import dotty.tools.pc.utils.InteractiveEnrichments.*
 
 object SemanticdbSymbols:
 

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

@@ -15,7 +15,7 @@ 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 dotty.tools.pc.utils.InteractiveEnrichments.*
 import org.eclipse.lsp4j as l
 
 import scala.jdk.CollectionConverters.*

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

@@ -12,9 +12,9 @@ import dotty.tools.dotc.core.Flags
 import dotty.tools.dotc.core.Names.*
 import dotty.tools.dotc.core.StdNames.nme
 import dotty.tools.dotc.core.Symbols.*
-import dotty.tools.pc.utils.MtagsEnrichments.metalsDealias
+import dotty.tools.pc.utils.InteractiveEnrichments.deepDealias
 import dotty.tools.pc.SemanticdbSymbols
-import dotty.tools.pc.utils.MtagsEnrichments.allSymbols
+import dotty.tools.pc.utils.InteractiveEnrichments.allSymbols
 
 class SymbolInformationProvider(using Context):
   private def toSymbols(
@@ -77,7 +77,7 @@ class SymbolInformationProvider(using Context):
           then classSym.asClass.parentSyms.map(SemanticdbSymbols.symbolName)
           else Nil
         val dealisedSymbol =
-          if sym.isAliasType then sym.info.metalsDealias.typeSymbol else sym
+          if sym.isAliasType then sym.info.deepDealias.typeSymbol else sym
         val classOwner =
           sym.ownersIterator.drop(1).find(s => s.isClass || s.is(Flags.Module))
         val overridden = sym.denot.allOverriddenSymbols.toList

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

@@ -2,7 +2,7 @@ package dotty.tools.pc
 
 import java.nio.file.Path
 
-import dotty.tools.pc.utils.MtagsEnrichments.*
+import dotty.tools.pc.utils.InteractiveEnrichments.*
 
 trait WorksheetSemanticdbProvider:
 

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

@@ -12,7 +12,7 @@ import dotty.tools.dotc.ast.tpd.Tree
 import dotty.tools.dotc.ast.untpd.ImportSelector
 import dotty.tools.dotc.core.Contexts.Context
 import dotty.tools.dotc.core.StdNames.*
-import dotty.tools.pc.utils.MtagsEnrichments.*
+import dotty.tools.pc.utils.InteractiveEnrichments.*
 
 import org.eclipse.lsp4j as l
 

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

@@ -4,7 +4,7 @@ import scala.meta.internal.mtags.CoursierComplete
 
 import dotty.tools.dotc.ast.untpd.ImportSelector
 import dotty.tools.dotc.core.Contexts.Context
-import dotty.tools.pc.utils.MtagsEnrichments.*
+import dotty.tools.pc.utils.InteractiveEnrichments.*
 
 object AmmoniteIvyCompletions:
   def contribute(

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

@@ -10,7 +10,7 @@ import dotty.tools.dotc.core.Contexts.*
 import dotty.tools.dotc.util.SourcePosition
 import dotty.tools.dotc.util.Spans.*
 import dotty.tools.dotc.interactive.Completion
-import dotty.tools.pc.utils.MtagsEnrichments.*
+import dotty.tools.pc.utils.InteractiveEnrichments.*
 
 import org.eclipse.lsp4j as l
 

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

@@ -22,7 +22,7 @@ import dotty.tools.pc.AutoImports.AutoImportEdits
 import dotty.tools.pc.AutoImports.AutoImportsGenerator
 import dotty.tools.pc.printer.ShortenedTypePrinter
 import dotty.tools.pc.printer.ShortenedTypePrinter.IncludeDefaultParam
-import dotty.tools.pc.utils.MtagsEnrichments.*
+import dotty.tools.pc.utils.InteractiveEnrichments.*
 
 import org.eclipse.lsp4j.Command
 import org.eclipse.lsp4j.CompletionItem

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

@@ -10,7 +10,7 @@ import dotty.tools.dotc.core.StdNames.nme
 import dotty.tools.dotc.core.Symbols.Symbol
 import dotty.tools.dotc.core.Types.Type
 import dotty.tools.pc.printer.ShortenedTypePrinter
-import dotty.tools.pc.utils.MtagsEnrichments.decoded
+import dotty.tools.pc.utils.InteractiveEnrichments.decoded
 
 import org.eclipse.lsp4j.CompletionItemKind
 import org.eclipse.lsp4j.CompletionItemTag

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

@@ -32,7 +32,7 @@ import dotty.tools.dotc.util.SrcPos
 import dotty.tools.pc.AutoImports.AutoImportsGenerator
 import dotty.tools.pc.completions.OverrideCompletions.OverrideExtractor
 import dotty.tools.pc.buildinfo.BuildInfo
-import dotty.tools.pc.utils.MtagsEnrichments.*
+import dotty.tools.pc.utils.InteractiveEnrichments.*
 import dotty.tools.dotc.core.Denotations.SingleDenotation
 import dotty.tools.dotc.interactive.Interactive
 

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

@@ -4,7 +4,7 @@ package completions
 import dotty.tools.dotc.ast.tpd.TypeDef
 import dotty.tools.dotc.core.Contexts.Context
 import dotty.tools.dotc.core.Flags
-import dotty.tools.pc.utils.MtagsEnrichments.*
+import dotty.tools.pc.utils.InteractiveEnrichments.*
 
 object FilenameCompletions:
 

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

@@ -17,7 +17,7 @@ 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.*
+import dotty.tools.pc.utils.InteractiveEnrichments.*
 
 import org.eclipse.lsp4j as l
 

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

@@ -34,7 +34,7 @@ import dotty.tools.pc.AutoImports.SymbolImport
 import dotty.tools.pc.MetalsInteractive.*
 import dotty.tools.pc.printer.ShortenedTypePrinter
 import dotty.tools.pc.printer.ShortenedTypePrinter.IncludeDefaultParam
-import dotty.tools.pc.utils.MtagsEnrichments.*
+import dotty.tools.pc.utils.InteractiveEnrichments.*
 
 import org.eclipse.lsp4j as l
 
@@ -88,12 +88,12 @@ object CaseKeywordCompletion:
                   ) =>
                 val args = head.argTypes.init
                 if args.length > 1 then
-                  Some(definitions.tupleType(args).widen.metalsDealias)
-                else args.headOption.map(_.widen.metalsDealias)
+                  Some(definitions.tupleType(args).widen.deepDealias)
+                else args.headOption.map(_.widen.deepDealias)
               case _ => None
           case _ => None
       case sel =>
-          Some(sel.tpe.widen.metalsDealias)
+          Some(sel.tpe.widen.deepDealias)
 
     selTpe
       .map { selTpe =>
@@ -158,7 +158,7 @@ object CaseKeywordCompletion:
 
           indexedContext.scopeSymbols
             .foreach(s =>
-              val ts = s.info.metalsDealias.typeSymbol
+              val ts = s.info.deepDealias.typeSymbol
               if isValid(ts) then visit(autoImportsGen.inferSymbolImport(ts))
             )
           // Step 2: walk through known subclasses of sealed types.
@@ -261,8 +261,8 @@ object CaseKeywordCompletion:
       clientSupportsSnippets
     )
 
-    val tpeStr = printer.tpe(selector.tpe.widen.metalsDealias.bounds.hi)
-    val tpe = selector.typeOpt.widen.metalsDealias.bounds.hi match
+    val tpeStr = printer.tpe(selector.tpe.widen.deepDealias.bounds.hi)
+    val tpe = selector.typeOpt.widen.deepDealias.bounds.hi match
       case tr @ TypeRef(_, _) => tr.underlying
       case t => t
 

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

@@ -30,7 +30,7 @@ import dotty.tools.dotc.core.Types.TypeBounds
 import dotty.tools.dotc.core.Types.WildcardType
 import dotty.tools.dotc.util.SourcePosition
 import dotty.tools.pc.IndexedContext
-import dotty.tools.pc.utils.MtagsEnrichments.*
+import dotty.tools.pc.utils.InteractiveEnrichments.*
 import scala.annotation.tailrec
 
 object NamedArgCompletions: