Drop Block(...) around quoted and spliced expressions where possible

odersky · nicolasstucki · commit 3ba954985a91 · 2019-02-18T19:59:20.000+01:00
diff --git a/compiler/src/dotty/tools/dotc/parsing/Parsers.scala b/compiler/src/dotty/tools/dotc/parsing/Parsers.scala
@@ -923,7 +923,12 @@ object Parsers {
       val saved = in.inQuote
       in.inQuote = isQuote
       inDefScopeBraces {
-        try block() finally in.inQuote = saved
+        try
+          block() match {
+            case Block(Nil, expr) => expr
+            case t => t
+          }
+        finally in.inQuote = saved
       }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -923,7 +923,12 @@ object Parsers {`
`923`	`923`	`val saved = in.inQuote`
`924`	`924`	`in.inQuote = isQuote`
`925`	`925`	`inDefScopeBraces {`
`926`		`- try block() finally in.inQuote = saved`
	`926`	`+ try`
	`927`	`+ block() match {`
	`928`	`+ case Block(Nil, expr) => expr`
	`929`	`+ case t => t`
	`930`	`+ }`
	`931`	`+ finally in.inQuote = saved`
`927`	`932`	`}`
`928`	`933`	`}`
`929`	`934`