Skip to content

Commit 23d44c3

Browse files
olafurpgolafurpg
authored
Merge pull request #354 from tpolecat/rename-session
2 parents 987e725 + 70a875d commit 23d44c3

File tree

9 files changed

+62
-30
lines changed

9 files changed

+62
-30
lines changed

‎mdoc/src/main/scala/mdoc/internal/markdown/FailInstrumenter.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ final class FailInstrumenter(sections: List[SectionInput], i: Int) {
1919
}
2020
private def printAsScript(): Unit = {
2121
sb.println("package repl")
22-
sb.println("object Session {")
22+
sb.println("object MdocSession {")
2323
sb.println(" object App {")
2424
sections.zipWithIndex.foreach {
2525
case (section, j) =>

‎mdoc/src/main/scala/mdoc/internal/markdown/Instrumenter.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ object Instrumenter {
161161
def wrapBody(body: String): String = {
162162
val wrapped = new StringBuilder()
163163
.append("package repl\n")
164-
.append("object Session extends _root_.mdoc.internal.document.DocumentBuilder {\n")
164+
.append("object MdocSession extends _root_.mdoc.internal.document.DocumentBuilder {\n")
165165
.append(" def app(): _root_.scala.Unit = {val _ = new App()}\n")
166166
.append(" class App {\n")
167167
.append(body)

‎mdoc/src/main/scala/mdoc/internal/markdown/MarkdownCompiler.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ object MarkdownCompiler {
4949
compileInput,
5050
reporter,
5151
edit,
52-
"repl.Session$",
52+
"repl.MdocSession$",
5353
instrumented.fileImports
5454
)
5555
val doc = compiled match {

‎tests/unit/src/test/scala/tests/markdown/AsyncSuite.scala

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ class AsyncSuite extends BaseMarkdownSuite {
3434
| at scala.concurrent.Await$.$anonfun$result$1(package.scala:220)
3535
| at scala.concurrent.BlockContext$DefaultBlockContext$.blockOn(BlockContext.scala:57)
3636
| at scala.concurrent.Await$.result(package.scala:146)
37-
| at repl.Session$App.<init>(timeout.md:11)
38-
| at repl.Session$.app(timeout.md:3)
37+
| at repl.MdocSession$App.<init>(timeout.md:11)
38+
| at repl.MdocSession$.app(timeout.md:3)
3939
|""".stripMargin,
4040
compat = Map(
4141
"2.11" ->
@@ -48,8 +48,8 @@ class AsyncSuite extends BaseMarkdownSuite {
4848
| at scala.concurrent.Await$$anonfun$result$1.apply(package.scala:190)
4949
| at scala.concurrent.BlockContext$DefaultBlockContext$.blockOn(BlockContext.scala:53)
5050
| at scala.concurrent.Await$.result(package.scala:190)
51-
| at repl.Session$App.<init>(timeout.md:11)
52-
| at repl.Session$.app(timeout.md:3)
51+
| at repl.MdocSession$App.<init>(timeout.md:11)
52+
| at repl.MdocSession$.app(timeout.md:3)
5353
|""".stripMargin,
5454
"2.13" ->
5555
"""|error: timeout.md:4:1: Future timed out after [10 milliseconds]
@@ -61,8 +61,8 @@ class AsyncSuite extends BaseMarkdownSuite {
6161
| at scala.concurrent.Await$.$anonfun$result$1(package.scala:201)
6262
| at scala.concurrent.BlockContext$DefaultBlockContext$.blockOn(BlockContext.scala:62)
6363
| at scala.concurrent.Await$.result(package.scala:124)
64-
| at repl.Session$App.<init>(timeout.md:11)
65-
| at repl.Session$.app(timeout.md:3)
64+
| at repl.MdocSession$App.<init>(timeout.md:11)
65+
| at repl.MdocSession$.app(timeout.md:3)
6666
|""".stripMargin
6767
)
6868
)

‎tests/unit/src/test/scala/tests/markdown/CrashSuite.scala

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ class CrashSuite extends BaseMarkdownSuite {
1414
|???
1515
|// scala.NotImplementedError: an implementation is missing
1616
|// at scala.Predef$.$qmark$qmark$qmark(Predef.scala:288)
17-
|// at repl.Session$App$$anonfun$2.apply(basic.md:14)
18-
|// at repl.Session$App$$anonfun$2.apply(basic.md:14)
17+
|// at repl.MdocSession$App$$anonfun$2.apply(basic.md:14)
18+
|// at repl.MdocSession$App$$anonfun$2.apply(basic.md:14)
1919
|```
2020
""".stripMargin
2121
)
@@ -62,7 +62,7 @@ class CrashSuite extends BaseMarkdownSuite {
6262
| case 2 => // boom!
6363
|}
6464
|// scala.MatchError: 1 (of class java.lang.Integer)
65-
|// at repl.Session$App$$anonfun$1.apply(comments.md:9)
65+
|// at repl.MdocSession$App$$anonfun$1.apply(comments.md:9)
6666
|```
6767
""".stripMargin
6868
)
@@ -78,8 +78,8 @@ class CrashSuite extends BaseMarkdownSuite {
7878
|???
7979
|// scala.NotImplementedError: an implementation is missing
8080
|// at scala.Predef$.$qmark$qmark$qmark(Predef.scala:288)
81-
|// at repl.Session$App$$anonfun$1.apply(relative.md:9)
82-
|// at repl.Session$App$$anonfun$1.apply(relative.md:9)
81+
|// at repl.MdocSession$App$$anonfun$1.apply(relative.md:9)
82+
|// at repl.MdocSession$App$$anonfun$1.apply(relative.md:9)
8383
|```
8484
""".stripMargin
8585
)
@@ -94,8 +94,8 @@ class CrashSuite extends BaseMarkdownSuite {
9494
"""|```scala
9595
|throw new StackOverflowError()
9696
|// java.lang.StackOverflowError
97-
|// at repl.Session$App$$anonfun$1.apply(fatal.md:9)
98-
|// at repl.Session$App$$anonfun$1.apply(fatal.md:9)
97+
|// at repl.MdocSession$App$$anonfun$1.apply(fatal.md:9)
98+
|// at repl.MdocSession$App$$anonfun$1.apply(fatal.md:9)
9999
|```
100100
|""".stripMargin
101101
)
@@ -110,8 +110,8 @@ class CrashSuite extends BaseMarkdownSuite {
110110
"""|```scala
111111
|throw new NoClassDefFoundError()
112112
|// java.lang.NoClassDefFoundError
113-
|// at repl.Session$App$$anonfun$1.apply(fatal2.md:9)
114-
|// at repl.Session$App$$anonfun$1.apply(fatal2.md:9)
113+
|// at repl.MdocSession$App$$anonfun$1.apply(fatal2.md:9)
114+
|// at repl.MdocSession$App$$anonfun$1.apply(fatal2.md:9)
115115
|```
116116
|""".stripMargin
117117
)
@@ -126,8 +126,8 @@ class CrashSuite extends BaseMarkdownSuite {
126126
"""|```scala
127127
|throw new NoSuchMethodError()
128128
|// java.lang.NoSuchMethodError
129-
|// at repl.Session$App$$anonfun$1.apply(fatal3.md:9)
130-
|// at repl.Session$App$$anonfun$1.apply(fatal3.md:9)
129+
|// at repl.MdocSession$App$$anonfun$1.apply(fatal3.md:9)
130+
|// at repl.MdocSession$App$$anonfun$1.apply(fatal3.md:9)
131131
|```
132132
|""".stripMargin
133133
)
@@ -142,8 +142,8 @@ class CrashSuite extends BaseMarkdownSuite {
142142
"""|```scala
143143
|throw new IncompatibleClassChangeError()
144144
|// java.lang.IncompatibleClassChangeError
145-
|// at repl.Session$App$$anonfun$1.apply(fatal4.md:9)
146-
|// at repl.Session$App$$anonfun$1.apply(fatal4.md:9)
145+
|// at repl.MdocSession$App$$anonfun$1.apply(fatal4.md:9)
146+
|// at repl.MdocSession$App$$anonfun$1.apply(fatal4.md:9)
147147
|```
148148
|""".stripMargin
149149
)

‎tests/unit/src/test/scala/tests/markdown/DefaultSuite.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -318,8 +318,8 @@ class DefaultSuite extends BaseMarkdownSuite {
318318
|throw new StackOverflowError()
319319
|^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
320320
|java.lang.StackOverflowError
321-
| at repl.Session$App.<init>(fatal-exception.md:8)
322-
| at repl.Session$.app(fatal-exception.md:3)
321+
| at repl.MdocSession$App.<init>(fatal-exception.md:8)
322+
| at repl.MdocSession$.app(fatal-exception.md:3)
323323
|""".stripMargin
324324
)
325325

‎tests/unit/src/test/scala/tests/markdown/NamespaceHygieneSuite.scala

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
package tests.markdown
2+
3+
class NamespaceHygieneSuite extends BaseMarkdownSuite {
4+
5+
check(
6+
"ok to import something called Session",
7+
"""|```scala mdoc
8+
|import scala.util.{ Random => Session }
9+
|val x = Session.nextInt(1)
10+
|```""".stripMargin,
11+
"""|```scala
12+
|import scala.util.{ Random => Session }
13+
|val x = Session.nextInt(1)
14+
|// x: Int = 0
15+
|```""".stripMargin
16+
)
17+
18+
checkError(
19+
"cannot import something called MdocSession",
20+
"""|```scala mdoc
21+
|import scala.util.{ Random => MdocSession }
22+
|val x = MdocSession.nextInt(1)
23+
|```""".stripMargin,
24+
"""|error: cannot import something called MdocSession.md:3:9: reference to MdocSession is ambiguous;
25+
|it is both defined in package repl and imported subsequently by
26+
|import scala.util.{Random=>MdocSession}
27+
|val x = MdocSession.nextInt(1)
28+
| ^^^^^^^^^^^
29+
|""".stripMargin
30+
)
31+
32+
}

‎tests/unit/src/test/scala/tests/markdown/NestSuite.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -272,9 +272,9 @@ class NestSuite extends BaseMarkdownSuite {
272272
|boom(x > 4)
273273
|^^^^^^^^^^^
274274
|java.lang.IllegalArgumentException
275-
| at repl.Session$App.boom$1(stacktrace.md:32)
276-
| at repl.Session$App.<init>(stacktrace.md:35)
277-
| at repl.Session$.app(stacktrace.md:3)
275+
| at repl.MdocSession$App.boom$1(stacktrace.md:32)
276+
| at repl.MdocSession$App.<init>(stacktrace.md:35)
277+
| at repl.MdocSession$.app(stacktrace.md:3)
278278
|""".stripMargin
279279
)
280280

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -216,9 +216,9 @@ class WorksheetSuite extends FunSuite {
216216
|crash(filename)
217217
|""".stripMargin,
218218
"""|crash:4:1: error: java.lang.RuntimeException: boom
219-
| at repl.Session$App.crash(crash.scala:8)
220-
| at repl.Session$App.<init>(crash.scala:14)
221-
| at repl.Session$.app(crash.scala:3)
219+
| at repl.MdocSession$App.crash(crash.scala:8)
220+
| at repl.MdocSession$App.<init>(crash.scala:14)
221+
| at repl.MdocSession$.app(crash.scala:3)
222222
|
223223
|crash(filename)
224224
|^^^^^^^^^^^^^^^

0 commit comments

Comments
 (0)