Skip to content

Commit

Permalink
fix(#16610): warn ignored Scaladoc on multiple enum cases (#19555)
Browse files Browse the repository at this point in the history
close #16610 

Before this commit, the compiler ignored Scaladoc comment on multiple
enum cases without warning.

This is partly expected because the case to which the doc is attached is
ambiguous, but we should at least warn users that the comment is ignored
by compiler due to ambiguity and they should take an action if they want
the doc to be displayed.
[Cherry-picked 11a6f0a][modified]
  • Loading branch information
WojciechMazur committed Jul 2, 2024
1 parent 3f42535 commit 9812065
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 1 deletion.
2 changes: 1 addition & 1 deletion compiler/src/dotty/tools/dotc/config/ScalaSettings.scala
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ private sealed trait WarningSettings:
val XfatalWarnings: Setting[Boolean] = BooleanSetting("-Werror", "Fail the compilation if there are any warnings.", aliases = List("-Xfatal-warnings"))
val WvalueDiscard: Setting[Boolean] = BooleanSetting("-Wvalue-discard", "Warn when non-Unit expression results are unused.")
val WNonUnitStatement = BooleanSetting("-Wnonunit-statement", "Warn when block statements are non-Unit expressions.")

val WenumCommentDiscard = BooleanSetting("-Wenum-comment-discard", "Warn when a comment ambiguously assigned to multiple enum cases is discarded.")
val Wunused: Setting[List[ChoiceWithHelp[String]]] = MultiChoiceHelpSetting(
name = "-Wunused",
helpArg = "warning",
Expand Down
8 changes: 8 additions & 0 deletions compiler/src/dotty/tools/dotc/parsing/Parsers.scala
Original file line number Diff line number Diff line change
Expand Up @@ -3902,6 +3902,14 @@ object Parsers {
if (in.token == COMMA) {
in.nextToken()
val ids = commaSeparated(() => termIdent())
if ctx.settings.WenumCommentDiscard.value then
in.getDocComment(start).foreach: comm =>
warning(
em"""Ambiguous Scaladoc comment on multiple cases is ignored.
|Remove the comment or make separate cases to add Scaladoc comments to each of them.""",
comm.span.start
)

PatDef(mods1, id :: ids, TypeTree(), EmptyTree)
}
else {
Expand Down
5 changes: 5 additions & 0 deletions tests/warn/i16610.check
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
-- Warning: tests/warn/i16610.scala:12:2 -------------------------------------------------------------------------------
12 | /** // warn
| ^
| Ambiguous Scaladoc comment on multiple cases is ignored.
| Remove the comment or make separate cases to add Scaladoc comments to each of them.
16 changes: 16 additions & 0 deletions tests/warn/i16610.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
//> using options -Wenum-comment-discard
/**
* Description of enum
*/
enum MyEnum {

/**
* Description of case 1
*/
case MyCase1

/** // warn
* Description of case 2 and 3
*/
case MyCase2, MyCase3
}

0 comments on commit 9812065

Please sign in to comment.