Merge pull request #13013 from GavinRay97/patch-1

smarter · web-flow · commit f9c94217b6ab · 2021-07-05T21:03:20.000+02:00
Crash when calling Compiler.newRun() without a docCtx
diff --git a/compiler/src/dotty/tools/dotc/core/Definitions.scala b/compiler/src/dotty/tools/dotc/core/Definitions.scala
@@ -1781,7 +1781,7 @@ class Definitions {
   }
 
   def addSyntheticSymbolsComments(using Context): Unit =
-    def add(sym: Symbol, doc: String) = ctx.docCtx.get.addDocstring(sym, Some(Comment(NoSpan, doc)))
+    def add(sym: Symbol, doc: String) = ctx.docCtx.foreach(_.addDocstring(sym, Some(Comment(NoSpan, doc))))
 
     add(AnyClass,
     """/** Class `Any` is the root of the Scala class hierarchy.  Every class in a Scala

Original file line number	Diff line number	Diff line change
`@@ -1781,7 +1781,7 @@ class Definitions {`
`1781`	`1781`	`}`
`1782`	`1782`
`1783`	`1783`	`def addSyntheticSymbolsComments(using Context): Unit =`
`1784`		`- def add(sym: Symbol, doc: String) = ctx.docCtx.get.addDocstring(sym, Some(Comment(NoSpan, doc)))`
	`1784`	`+ def add(sym: Symbol, doc: String) = ctx.docCtx.foreach(_.addDocstring(sym, Some(Comment(NoSpan, doc))))`
`1785`	`1785`
`1786`	`1786`	`add(AnyClass,`
`1787`	`1787`	"""/** Class `Any` is the root of the Scala class hierarchy. Every class in a Scala