Skip to content

Moved literal message into error Message class #2725

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.

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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion compiler/src/dotty/tools/dotc/parsing/Parsers.scala
Original file line number Diff line number Diff line change
Expand Up @@ -2384,7 +2384,7 @@ object Parsers {
if (in.token == CASE)
syntaxErrorOrIncomplete(OnlyCaseClassOrCaseObjectAllowed())
else
syntaxErrorOrIncomplete("expected class or object definition")
syntaxErrorOrIncomplete(ExpectedClassOrObjectDef())
if (mustStartStat) // do parse all definitions even if they are probably local (i.e. a "}" has been forgotten)
defOrDcl(in.offset, defAnnotsMods(modifierTokens))
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ public enum ErrorMessageID {
ValueClassParameterMayNotBeAVarID,
ValueClassNeedsExactlyOneValParamID,
OnlyCaseClassOrCaseObjectAllowedID,
ExpectedClassOrObjectDefID,
;

public int errorNumber() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1573,4 +1573,11 @@ object messages {
val explanation = ""
}

case class ExpectedClassOrObjectDef()(implicit ctx: Context)
extends Message(ExpectedClassOrObjectDefID) {
val kind = "Syntax"
val msg = "expected class or object definition"
val explanation = ""
}

}
11 changes: 11 additions & 0 deletions compiler/test/dotty/tools/dotc/reporting/ErrorMessagesTests.scala
Original file line number Diff line number Diff line change
Expand Up @@ -792,4 +792,15 @@ class ErrorMessagesTests extends ErrorMessagesTest {
assertEquals(err, OnlyCaseClassOrCaseObjectAllowed())
}

@Test def expectedClassOrObjectDef =
checkMessagesAfter("frontend") {
"""Foo"""
}
.expect { (ictx, messages) =>
implicit val ctx: Context = ictx
assertMessageCount(1, messages)
val err :: Nil = messages
assertEquals(err, ExpectedClassOrObjectDef())
}

}