Expand span errorTermTree to include skipped span. #14492
Merged
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
adampauls
commented
Feb 15, 2022
| @@ -10,7 +10,7 @@ object Test { | |||
| val b = type // error: expression expected (on "type") | |||
|
|
|||
| 1 match { | |||
| case // error: pattern expected // error: cannot compare with Null | |||
There was a problem hiding this comment.
This error leaks the implementation detail that parser errors produce a null.
|
cc @som-snytt |
adampauls
force-pushed
the
error-term-tree-pos
branch
from
ce65d3b
to
05d7dd5
Compare
adampauls
commented
Feb 15, 2022
| @@ -21,9 +21,7 @@ class DiagnosticsTest { | |||
| | Nil.map(x => x).filter(x$m1 =>$m2)$m3 | |||
| |}""".withSource | |||
| .diagnostics(m1, | |||
| (m2 to m2, "expression expected but ')' found", Error, Some(IllegalStartSimpleExprID)), | |||
| (m1 to m1, """Found: Null | |||
There was a problem hiding this comment.
Another confusing error gone.
adampauls
force-pushed
the
error-term-tree-pos
branch
from
05d7dd5
to
8e62f96
Compare
adampauls
changed the title
odersky
approved these changes
Feb 16, 2022
adampauls
force-pushed
the
error-term-tree-pos
branch
from
8e62f96
to
3bd8d31
Compare
adampauls
force-pushed
the
error-term-tree-pos
branch
from
3bd8d31
to
f0c9ff8
Compare
|
Friendly ping @nicolasstucki , I think I am waiting on you to review. Thanks! |
nicolasstucki
approved these changes
Feb 21, 2022
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.
At present, when the parser encounters an error and produces
errorTermTree, it first issues a syntax error, which has the side effect of skipping to the nearest "safe point" (), newline, etc.). This means that theerrorTermTreeconceptually covers the whole skipped span, but only the position right before the safe point token is included in the span of the error.This PR keeps track of the
lastOffsetbefore skipping tokens and includes everything from that offset up to the safe point in the span of the error. So for example, infoo(5, :), previously, theerrorTermTreereturned would not include the:.This reduces the number of (redundant) errors, and in particular removes type-checking errors that arise from the presumably-private implementation detail of producing
Constant(null)as theerrorTermTree.