Fix line numbers in exceptions for multi-line code blocks #1361
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This was referenced Jul 13, 2023
alexarchambault
added a commit
that referenced
this pull request
Jul 18, 2023
This fixes a regression introduced in #1361. This makes the following work again as expected: ```scala @ { import $ivy.`org.typelevel::cats-kernel:2.6.1` } ``` Before the changes here, in Scala 2.x, one gets an error like ```text cmd0.sc:2: object org.typelevel::cats-kernel:2.6.1 is not a member of package ammonite.$ivy import $ivy.`org.typelevel::cats-kernel:2.6.1` ^ Compilation Failed ```
This was referenced Aug 5, 2023
lihaoyi
added a commit
to com-lihaoyi/mill
that referenced
this pull request
Aug 8, 2023
… or whitespace (#2686) This is basically a port of the following fix in the Ammonite repo com-lihaoyi/Ammonite#1361. There were some changes when the logic was first ported from Ammonite to Mill, resulting in a much smaller code change than was necessary in the Ammonite repo There are two related follow up PRs that AFAICT do not apply to Mill: com-lihaoyi/Ammonite#1363 and com-lihaoyi/Ammonite#1369. Both have to do with the special handling of multi-statement top-level-blocks `{...}`, that is a thing in the Ammonite REPL (to allow multiple top-level declarations to be entered into the REPL before submitting it) but doesn't apply to Mill scripts. I have updated the integration tests to include a bunch of random comments and imports to reproduce the problem causing the tests to fail, and verified the fix causes the tests to pass. Also this caused a previously passing test to fail (`2-custom-build-logic`), which on inspection appears like it was asserting the wrong thing, so I fixed the assert Fixes #2681
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What is changed?
The current Parser ignores whitespaces at the beginning of the code block, which may result in incorrect line number in an exception stackTrace:
This PR changes it so the result will be
(line number is 4 instead of 1)
This it done by introducing a new parser which does not ignore leading whitespaces
Please note that it changes this only for Scala 2. Scala 3 impl has a different parsing logics which I didn't have time to dive into yet
How is it tested?
New tests in
FailureTestschecking line numbers