Skip to content

New format of illegal start of statement error message (+tests) #3435

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
merged 4 commits into from
Nov 6, 2017
Merged

New format of illegal start of statement error message (+tests) #3435

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d732fc3
New format of illegal start of statement error message (+tests)
karolchmist Nov 3, 2017
f2a9eab
[CodeReview]
karolchmist Nov 4, 2017
2092a03
Polishing
allanrenucci Nov 6, 2017
2953a4f
Polishing
allanrenucci Nov 6, 2017
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
3 changes: 1 addition & 2 deletions compiler/src/dotty/tools/dotc/parsing/Parsers.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2496,8 +2496,7 @@ object Parsers {
}
else if (!isStatSep && (in.token != CASE)) {
exitOnError = mustStartStat
val addendum = if (isModifier) " (no modifiers allowed here)" else ""
syntaxErrorOrIncomplete("illegal start of statement" + addendum)
syntaxErrorOrIncomplete(IllegalStartOfStatement(isModifier = isModifier))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Named argument is redundant here

}
acceptStatSepUnlessAtEnd(CASE)
}
Expand Down
3 changes: 2 additions & 1 deletion compiler/src/dotty/tools/dotc/reporting/diagnostic/ErrorMessageID.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,8 @@ public enum ErrorMessageID {
OnlyFunctionsCanBeFollowedByUnderscoreID,
MissingEmptyArgumentListID,
DuplicateNamedTypeParameterID,
UndefinedNamedTypeParameterID
UndefinedNamedTypeParameterID,
IllegalStartOfStatementID
;

public int errorNumber() {
Expand Down
11 changes: 11 additions & 0 deletions compiler/src/dotty/tools/dotc/reporting/diagnostic/messages.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1879,4 +1879,15 @@ object messages {
val msg = hl"Type parameter $undefinedName is undefined. Expected one of ${definedNames.map(_.show).mkString(", ")}."
val explanation = ""
}

case class IllegalStartOfStatement(isModifier: Boolean)(implicit ctx: Context) extends Message(IllegalStartOfStatementID) {
val kind = "Syntax"
private val addendum = if(isModifier) "(no modifiers allowed here)" else ""
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Make it a nested val:

val msg = {
  val addentum = ...
  "..." + addentum
}

val msg = hl"Illegal start of statement $addendum"
val explanation = hl"""
| Expected an import, a statement or an expression at the start of a statement.
| For a detailed list of allowed statements, please consult the syntax of BlockStat at http://dotty.epfl.ch/docs/internals/syntax.html#expressions
"""
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For now, we don't include links. Suggested rephrasing:

val explanation = "A statement is either an import, a definition or an expression."


Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove blank line

}
}
20 changes: 20 additions & 0 deletions compiler/test/dotty/tools/dotc/reporting/ErrorMessagesTests.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1132,4 +1132,24 @@ class ErrorMessagesTests extends ErrorMessagesTest {
assertEquals(tpParams, l2.map(_.show))

}

@Test def illegalStartOfStatement =
checkMessagesAfter("frontend") {
"""
|object Test {
| { ) }
| { private ) }
|}
|
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove blank line

""".stripMargin
}
.expect { (ictx, messages) =>
implicit val ctx: Context = ictx

assertMessageCount(2, messages)
val errWithModifier :: err :: Nil = messages

assertEquals(IllegalStartOfStatement(isModifier = false), err)
assertEquals(IllegalStartOfStatement(isModifier = true), errWithModifier)
}
}