Remove unneeded .nn in presentation compiler

Author: HarrisL2

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

@@ -23,7 +23,7 @@ object AutoImports:
     def renameConfigMap(config: PresentationCompilerConfig)(using
         Context
     ): Map[Symbol, String] =
-      config.symbolPrefixes().nn.asScala.flatMap { (from, to) =>
+      config.symbolPrefixes().asScala.flatMap { (from, to) =>
         val pkg = SemanticdbSymbols.inverseSemanticdbSymbol(from)
         val rename = to.stripSuffix(".").stripSuffix("#")
         List(pkg, pkg.map(_.moduleClass)).flatten
@@ -253,7 +253,7 @@ object AutoImports:
         // see WorksheetProvider.worksheetScala3AdjustmentsForPC
         val indent =
           if pos.source.path.isWorksheet &&
-            editPos.getStart().nn.getCharacter() == 0
+            editPos.getStart().getCharacter() == 0
           then indent0.drop(2)
           else indent0
         val topPadding =

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

@@ -30,8 +30,8 @@ final class AutoImportsProvider(
 )(using ReportContext):
 
   def autoImports(isExtension: Boolean): List[AutoImportsResult] =
-    val uri = params.uri().nn
-    val text = params.text().nn
+    val uri = params.uri()
+    val text = params.text()
     val filePath = Paths.get(uri)
     driver.run(uri, SourceFile.virtual(filePath.toString, text))
 

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

@@ -19,7 +19,7 @@ class CompilerSearchVisitor(
 )(using ctx: Context, reports: ReportContext)
     extends SymbolSearchVisitor:
 
-  val logger: Logger = Logger.getLogger(classOf[CompilerSearchVisitor].getName()).nn
+  val logger: Logger = Logger.getLogger(classOf[CompilerSearchVisitor].getName())
 
   private def isAccessibleImplicitClass(sym: Symbol) =
     val owner = sym.maybeOwner
@@ -77,7 +77,7 @@ class CompilerSearchVisitor(
       .split("\\$")
 
     val added =
-      try toSymbols(pkg, innerPath.nn.toList.map(_.nn)).filter(visitSymbol)
+      try toSymbols(pkg, innerPath.toList).filter(visitSymbol)
       catch
         case NonFatal(e) =>
           logger.log(Level.WARNING, e.getMessage(), e)

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

@@ -50,7 +50,7 @@ object CompletionItemResolver extends ItemResolver:
       Context
   ): String =
     def docs(gsym: Symbol): String =
-      search.symbolDocumentation(gsym).fold("")(_.docstring().nn)
+      search.symbolDocumentation(gsym).fold("")(_.docstring())
     val gsymDoc = docs(gsym)
     def keyword(gsym: Symbol): String =
       if gsym.isClass then "class"

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

@@ -23,8 +23,8 @@ final class ConvertToNamedArgumentsProvider(
 ):
 
   def convertToNamedArguments: Either[String, List[l.TextEdit]] =
-    val uri = params.uri().nn
-    val text = params.text().nn
+    val uri = params.uri()
+    val text = params.text()
     val filePath = Paths.get(uri)
     driver.run(uri, SourceFile.virtual(filePath.toString, text))
 

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

@@ -18,7 +18,7 @@ class DiagnosticProvider(driver: InteractiveDriver, params: VirtualFileParams):
 
   def diagnostics(): List[lsp4j.Diagnostic] =
     if params.shouldReturnDiagnostics then
-      val diags = driver.run(params.uri().nn, params.text().nn)
+      val diags = driver.run(params.uri(), params.text())
       given Context = driver.currentCtx
       diags.flatMap(toLsp)
     else Nil

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

@@ -39,8 +39,8 @@ final class ExtractMethodProvider(
     extends ExtractMethodUtils:
 
   def extractMethod(): List[TextEdit] =
-    val text = range.text().nn
-    val uri = range.uri().nn
+    val text = range.text()
+    val uri = range.uri()
     val filePath = Paths.get(uri)
     val source = SourceFile.virtual(filePath.toString, text)
     driver.run(uri, source)

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

@@ -37,8 +37,8 @@ object HoverProvider:
       search: SymbolSearch,
       contentType: ContentType
   )(implicit reportContext: ReportContext): ju.Optional[HoverSignature] =
-    val uri = params.uri().nn
-    val text = params.text().nn
+    val uri = params.uri()
+    val text = params.text()
     val sourceFile = SourceFile.virtual(uri, text)
     driver.run(uri, sourceFile)
     val unit = driver.compilationUnits.get(uri)
@@ -90,7 +90,7 @@ object HoverProvider:
         )
       end report
       reportContext.unsanitized.create(() => report, /*ifVerbose =*/ true)
-      ju.Optional.empty().nn
+      ju.Optional.empty()
     else
       val skipCheckOnName =
         !pos.isPoint // don't check isHoveringOnName for RangeHover
@@ -158,9 +158,9 @@ object HoverProvider:
                   contextInfo = printer.getUsedRenamesInfo,
                   contentType = contentType
                 )
-              ).nn
+              )
             case _ =>
-              ju.Optional.empty().nn
+              ju.Optional.empty()
           end match
         case (_, tpe, Some(namedTupleArg)) :: _ =>
           val exprTpw = tpe.widenTermRefExpr.deepDealiasAndSimplify
@@ -175,8 +175,8 @@ object HoverProvider:
                   contextInfo = printer.getUsedRenamesInfo,
                   contentType = contentType
                 )
-              ).nn
-            case _ => ju.Optional.empty().nn
+              )
+            case _ => ju.Optional.empty()
       end match
     end if
   end hover
@@ -238,7 +238,7 @@ object HoverProvider:
 
       refTpe.flatMap(findRefinement).headOption.asJava
     case _ =>
-      ju.Optional.empty().nn
+      ju.Optional.empty()
 
 end HoverProvider
 

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

@@ -54,10 +54,10 @@ final class InferredMethodProvider(
   def inferredMethodEdits(
       adjustOpt: Option[AdjustTypeOpts] = None
   ): List[TextEdit] =
-    val uri = params.uri().nn
-    val filePath = Paths.get(uri).nn
+    val uri = params.uri()
+    val filePath = Paths.get(uri)
 
-    val sourceText = adjustOpt.map(_.text).getOrElse(params.text().nn)
+    val sourceText = adjustOpt.map(_.text).getOrElse(params.text())
     val source =
       SourceFile.virtual(filePath.toString(), sourceText)
     driver.run(uri, source)
@@ -101,8 +101,8 @@ final class InferredMethodProvider(
         .mkString(", ")
 
     def printSignature(
-        methodName: Name, 
-        params: List[List[Type]], 
+        methodName: Name,
+        params: List[List[Type]],
         retTypeOpt: Option[Type]
     ): String =
       val retTypeString = retTypeOpt match
@@ -145,15 +145,15 @@ final class InferredMethodProvider(
     /**
      * Returns the position to insert the method signature for a container.
      * If the container has an empty body, the position is the end of the container.
-     * If the container has a non-empty body, the position is the end of the last element in the body. 
-     * 
+     * If the container has a non-empty body, the position is the end of the last element in the body.
+     *
      * @param container the container to insert the method signature for
      * @return the position to insert the method signature for the container and a boolean indicating if the container has an empty body
      */
     def insertPositionFor(container: Tree): Option[(SourcePosition, Boolean)] =
       val typeSymbol = container.tpe.widenDealias.typeSymbol
       if typeSymbol.exists then
-        val trees = driver.openedTrees(params.uri().nn)
+        val trees = driver.openedTrees(params.uri())
         val include = Interactive.Include.definitions | Interactive.Include.local
         Interactive.findTreesMatching(trees, include, typeSymbol).headOption match
           case Some(srcTree) =>
@@ -170,9 +170,9 @@ final class InferredMethodProvider(
 
       /**
       * Extracts type information for a specific parameter in a method signature.
-      * If the parameter is a function type, extracts both the function's argument types 
+      * If the parameter is a function type, extracts both the function's argument types
       * and return type. Otherwise, extracts just the parameter type.
-      * 
+      *
       * @param methodType the method type to analyze
       * @param argIndex the index of the parameter to extract information for
       * @return a tuple of (argument types, return type) where:
@@ -192,7 +192,7 @@ final class InferredMethodProvider(
           else
             (None, Some(m.paramInfos(argIndex)))
         case _ => (None, None)
-    
+
     def signatureEdits(signature: String): List[TextEdit] =
       val pos = insertPosition()
       val indent = indentation(params.text(), pos.start - 1)
@@ -234,17 +234,17 @@ final class InferredMethodProvider(
        *                 outerArgs
        *        ---------------------------
        * method(..., errorMethod(args), ...)
-       * 
+       *
        */
-      case (id @ Ident(errorMethod)) :: 
-           (apply @ Apply(func, args)) :: 
-            Apply(method, outerArgs) :: 
+      case (id @ Ident(errorMethod)) ::
+           (apply @ Apply(func, args)) ::
+            Apply(method, outerArgs) ::
             _ if id.symbol == NoSymbol && func == id && method != apply =>
-        
+
         val argTypes = args.map(_.typeOpt.widenDealias)
 
         val argIndex = outerArgs.indexOf(apply)
-        val (allArgTypes, retTypeOpt) = 
+        val (allArgTypes, retTypeOpt) =
           extractParameterTypeInfo(method.tpe.widenDealias, argIndex) match
             case (Some(argTypes2), retTypeOpt) => (List(argTypes, argTypes2), retTypeOpt)
             case (None, retTypeOpt) => (List(argTypes), retTypeOpt)
@@ -257,12 +257,12 @@ final class InferredMethodProvider(
        *              outerArgs
        *        ---------------------
        * method(..., errorMethod, ...)
-       * 
+       *
        */
-      case (id @ Ident(errorMethod)) :: 
-           Apply(method, outerArgs) :: 
+      case (id @ Ident(errorMethod)) ::
+           Apply(method, outerArgs) ::
            _ if id.symbol == NoSymbol && method != id =>
-        
+
         val argIndex = outerArgs.indexOf(id)
 
         val (argTypes, retTypeOpt) = extractParameterTypeInfo(method.tpe.widenDealias, argIndex)
@@ -272,20 +272,20 @@ final class InferredMethodProvider(
           case None => Nil
 
         val signature = printSignature(errorMethod, allArgTypes, retTypeOpt)
-        
+
         signatureEdits(signature)
 
       /**
        *                tpt             body
        *            -----------   ----------------
        * val value: DefinedType = errorMethod(args)
-       * 
+       *
        */
-      case (id @ Ident(errorMethod)) :: 
-           (apply @ Apply(func, args)) :: 
-           ValDef(_, tpt, body) :: 
+      case (id @ Ident(errorMethod)) ::
+           (apply @ Apply(func, args)) ::
+           ValDef(_, tpt, body) ::
             _ if id.symbol == NoSymbol && func == id && apply == body =>
-            
+
         val retType = tpt.tpe.widenDealias
         val argTypes = args.map(_.typeOpt.widenDealias)
 
@@ -296,24 +296,24 @@ final class InferredMethodProvider(
        *                tpt          body
        *            -----------   -----------
        * val value: DefinedType = errorMethod
-       * 
+       *
        */
-      case (id @ Ident(errorMethod)) :: 
-            ValDef(_, tpt, body) :: 
+      case (id @ Ident(errorMethod)) ::
+            ValDef(_, tpt, body) ::
             _ if id.symbol == NoSymbol && id == body =>
-            
+
         val retType = tpt.tpe.widenDealias
 
         val signature = printSignature(errorMethod, Nil, Some(retType))
         signatureEdits(signature)
 
       /**
-       * 
+       *
        * errorMethod(args)
-       * 
+       *
        */
-      case (id @ Ident(errorMethod)) :: 
-           (apply @ Apply(func, args)) :: 
+      case (id @ Ident(errorMethod)) ::
+           (apply @ Apply(func, args)) ::
             _ if id.symbol == NoSymbol && func == id =>
 
         val argTypes = args.map(_.typeOpt.widenDealias)
@@ -322,37 +322,37 @@ final class InferredMethodProvider(
         signatureEdits(signature)
 
       /**
-       * 
+       *
        * errorMethod
-       * 
+       *
        */
-      case (id @ Ident(errorMethod)) :: 
+      case (id @ Ident(errorMethod)) ::
            _ if id.symbol == NoSymbol =>
 
         val signature = printSignature(errorMethod, Nil, None)
         signatureEdits(signature)
 
       /**
-       * 
+       *
        * container.errorMethod(args)
-       * 
+       *
        */
-      case (select @ Select(container, errorMethod)) :: 
-           (apply @ Apply(func, args)) :: 
+      case (select @ Select(container, errorMethod)) ::
+           (apply @ Apply(func, args)) ::
             _  if select.symbol == NoSymbol && func == select =>
-        
+
         val argTypes = args.map(_.typeOpt.widenDealias)
         val signature = printSignature(errorMethod, List(argTypes), None)
         signatureEditsForContainer(signature, container)
 
       /**
-       * 
+       *
        * container.errorMethod
-       * 
+       *
        */
-      case (select @ Select(container, errorMethod)) :: 
+      case (select @ Select(container, errorMethod)) ::
             _  if select.symbol == NoSymbol =>
-        
+
         val signature = printSignature(errorMethod, Nil, None)
         signatureEditsForContainer(signature, container)