Optimize addDocstring

scala · Apr 11, 2024 · 0dd8b02 · 0dd8b02
1 parent cb531f7
commit 0dd8b02
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/compiler/src/dotty/tools/dotc/core/Comments.scala b/compiler/src/dotty/tools/dotc/core/Comments.scala
@@ -44,8 +44,8 @@ object Comments {
     def registerLoader(sym: Symbol, loader: () => Option[Comment]): Unit =
       docstrings.update(sym, CommentLoader(loader))
 
-    def addDocstring(sym: Symbol, doc: Option[Comment]): Unit =
-      doc.foreach(d => docstrings.update(sym, d))
+    def addDocstring(sym: Symbol, doc: Comment): Unit =
+      docstrings.update(sym, doc)
   }
 
 

diff --git a/compiler/src/dotty/tools/dotc/core/Definitions.scala b/compiler/src/dotty/tools/dotc/core/Definitions.scala
@@ -2169,7 +2169,7 @@ class Definitions {
   @tu lazy val LazyValsControlState = requiredClass(s"$LazyValsModuleName.LazyValControlState")
 
   def addSyntheticSymbolsComments(using Context): Unit =
-    def add(sym: Symbol, doc: String) = ctx.docCtx.foreach(_.addDocstring(sym, Some(Comment(NoSpan, doc))))
+    def add(sym: Symbol, doc: String) = ctx.docCtx.foreach(_.addDocstring(sym, Comment(NoSpan, doc)))
 
     add(AnyClass,
     """/** Class `Any` is the root of the Scala class hierarchy.  Every class in a Scala

diff --git a/compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala b/compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala
@@ -984,7 +984,7 @@ class TreeUnpickler(reader: TastyReader,
       commentUnpicklerOpt.foreach { commentUnpickler =>
         def loadComment() = commentUnpickler.commentAt(start)
         if ctx.settings.YreadDocsEagerly.value then
-          ctx.docCtx.get.addDocstring(tree.symbol, loadComment())
+          loadComment().foreach(doc => ctx.docCtx.get.addDocstring(tree.symbol, doc))
         else
           ctx.docCtx.get.registerLoader(tree.symbol, loadComment)
       }

diff --git a/compiler/src/dotty/tools/dotc/typer/Docstrings.scala b/compiler/src/dotty/tools/dotc/typer/Docstrings.scala
@@ -43,7 +43,7 @@ object Docstrings {
           }
 
           val commentWithUsecases = expanded.copy(usecases = typedUsecases)
-          docCtx.addDocstring(sym, Some(commentWithUsecases))
+          docCtx.addDocstring(sym, commentWithUsecases)
           commentWithUsecases
         }
     }
@@ -52,7 +52,7 @@ object Docstrings {
     val tplExp = docCtx.templateExpander
     tplExp.defineVariables(sym)
     val newComment = comment.expand(tplExp.expandedDocComment(sym, owner, _))
-    docCtx.addDocstring(sym, Some(newComment))
+    docCtx.addDocstring(sym, newComment)
     newComment
   }
 

diff --git a/compiler/src/dotty/tools/dotc/typer/Namer.scala b/compiler/src/dotty/tools/dotc/typer/Namer.scala
@@ -501,7 +501,7 @@ class Namer { typer: Typer =>
 
   def setDocstring(sym: Symbol, tree: Tree)(using Context): Unit = tree match {
     case t: MemberDef if t.rawComment.isDefined =>
-      ctx.docCtx.foreach(_.addDocstring(sym, t.rawComment))
+      ctx.docCtx.foreach(_.addDocstring(sym, t.rawComment.get))
     case t: ExtMethods =>
       for meth <- t.methods.find(_.span.point == sym.span.point) do
         setDocstring(sym, meth)