Skip to content

Make repl.load accept raw sources starting with package directive #1710

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alexarchambault merged 3 commits into from
Jan 22, 2026
Merged

Make repl.load accept raw sources starting with package directive #1710

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
464a81a
Make repl.load accept raw sources starting with package directive
alexarchambault Jan 21, 2026
2027e12
Merge branch 'main' into eval-package-cell
lolgab Jan 22, 2026
e9c3807
Merge branch 'main' into eval-package-cell
alexarchambault Jan 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 29 additions & 22 deletions amm/interp/src/main/scala/ammonite/interp/Interpreter.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,28 +445,35 @@ class Interpreter(

def processExec(code: String, currentLine: Int, incrementLine: () => Unit): Res[Imports] =
synchronized {
val wrapperName = Name(wrapperNamePrefix + currentLine)
val fileName = wrapperName.encoded + ".sc"
for {
blocks <- Res(parser().splitScript(Interpreter.skipSheBangLine(code), fileName))

metadata <- processAllScriptBlocks(
blocks.map(_ => None),
Res.Success(blocks),
predefImports ++ frameImports,
CodeSource(
wrapperName,
Seq(),
parameters.pkgName,
Some(wd / "(console)")
),
(processed, indexedWrapperName) =>
evaluateLine(processed, fileName, indexedWrapperName, false, incrementLine),
autoImport = true,
""
)
} yield {
metadata.blockInfo.last.finalImports
val finalCode = Interpreter.skipSheBangLine(code)

if (finalCode.startsWith("package "))
processRawSource(code, s"source-$currentLine.scala")
.map(_ => Imports())
else {
val wrapperName = Name(wrapperNamePrefix + currentLine)
val fileName = wrapperName.encoded + ".sc"
for {
blocks <- Res(parser().splitScript(finalCode, fileName))

metadata <- processAllScriptBlocks(
blocks.map(_ => None),
Res.Success(blocks),
predefImports ++ frameImports,
CodeSource(
wrapperName,
Seq(),
parameters.pkgName,
Some(wd / "(console)")
),
(processed, indexedWrapperName) =>
evaluateLine(processed, fileName, indexedWrapperName, false, incrementLine),
autoImport = true,
""
)
} yield {
metadata.blockInfo.last.finalImports
}
}
}

Expand Down
48 changes: 48 additions & 0 deletions amm/repl/src/test/scala/ammonite/session/AdvancedTests.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -954,6 +954,54 @@ object AdvancedTests extends TestSuite {
"""
)
}
test("eval package input") {
val tq = "\"\"\""
check.session(
s"""
@ repl.load(${tq}package thing
@
@ object Thing {
@ def message = "Hello"
@ }
@ $tq)

@ val message = thing.Thing.message
message: String = "Hello"
"""
)

if (scala2)
check.session(
s"""
@ repl.load(${tq}package foo
@
@ object Foo {
@ def message = "Hello"
@ zz
@ }
@ $tq)
error: source-3.scala:5: not found: value zz
zz
^
"""
)
else
check.session(
s"""
@ repl.load(${tq}package foo
@
@ object Foo {
@ def message = "Hello"
@ zz
@ }
@ $tq)
error: -- [E006] Not Found Error: source-3.scala:5:2 ----------------------------------
5 | zz
^^
Not found: zz
"""
)
}
test("position crash") {
if (scala2) {
val useStandardQuote = check.scalaVersion.startsWith("2.12.") &&
Expand Down