Skip to content

Commit c6ffa48

Browse files
authored
Merge pull request #388 from ckipp01/placeholder
Filter out placeholders so they aren't bound in Dotty
2 parents d9ac112 + 7a99658 commit c6ffa48

File tree

4 files changed

+15
-5
lines changed

4 files changed

+15
-5
lines changed

build.sbt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import scala.collection.mutable
22

3-
def scala212 = "2.12.11"
3+
def scala212 = "2.12.12"
44
def scala211 = "2.11.12"
5-
def scala213 = "2.13.2"
5+
def scala213 = "2.13.3"
66
def scala3 = List("0.26.0", "0.27.0-RC1")
77

88
def scalajs = "1.1.1"

mdoc/src/main/scala-3/mdoc/internal/markdown/Instrumenter.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,8 @@ object Instrumenter {
143143

144144
object Binders {
145145
private def fromPat(trees: List[Tree])(using ctx: Context) = {
146-
trees.map {
147-
case id: Ident =>
146+
trees.collect {
147+
case id: Ident if id.name.toString != "_" => // ignore placeholders
148148
id.name.toString -> id.sourcePos
149149
}
150150
}

mdoc/src/main/scala/mdoc/internal/worksheets/WorksheetProvider.scala

-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ class WorksheetProvider(settings: Settings) {
3535
val compiler = ctx.compiler(instrumented)
3636
val rendered =
3737
MarkdownBuilder.buildDocument(compiler, reporter, sectionInputs, instrumented, input.path)
38-
3938
val decorations = for {
4039
section <- rendered.sections.iterator
4140
statement <- section.section.statements

tests/worksheets/src/test/scala/tests/worksheets/WorksheetSuite.scala

+11
Original file line numberDiff line numberDiff line change
@@ -370,6 +370,17 @@ class WorksheetSuite extends BaseSuite {
370370
|""".stripMargin
371371
)
372372

373+
checkDecorations(
374+
"placeholder",
375+
"""|def x = 1 -> 2
376+
|val (a, _) = x
377+
|""".stripMargin,
378+
"""|def x = 1 -> 2
379+
|<val (a, _) = x> // : Int = 1
380+
|a: Int = 1
381+
|""".stripMargin
382+
)
383+
373384
def checkDiagnostics(
374385
options: TestOptions,
375386
original: String,

0 commit comments

Comments
 (0)