Skip to content

Commit 07eda7c

Browse files
authored
Merge pull request #10652 from dotty-staging/scala3doc/improve-community-build
Scala3doc: document sconfig in community build
2 parents f70b502 + 3ccc73b commit 07eda7c

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

community-build/src/scala/dotty/communitybuild/projects.scala

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -379,9 +379,7 @@ object projects:
379379
lazy val sconfig = SbtCommunityProject(
380380
project = "sconfig",
381381
sbtTestCommand = "sconfigJVM/test",
382-
// sbtDocCommand = "sconfigJVM/doc", // Fails with:
383-
// Problem parsing sconfig/sharedScala3/src/main/scala/org/ekrich/config/ConfigSyntax.scala:[73..92..1340], documentation may not be generated.
384-
// scala.MatchError: ValDef(JSON,TypeTree[TypeRef(TermRef(ThisType(TypeRef(NoPrefix,module class ekrich)),module config),class ConfigSyntax)],Apply(Ident($new),List(Literal(Constant(0)), Literal(Constant(JSON))))) (of class dotty.tools.dotc.ast.Trees$ValDef)
382+
sbtDocCommand = "sconfigJVM/doc",
385383
)
386384

387385
lazy val zio = SbtCommunityProject(
@@ -442,7 +440,7 @@ object projects:
442440
// [error] Caused by: java.lang.AssertionError: assertion failed:
443441
// trait MonadIO has non-class parent: AppliedType(TypeRef(TermRef(ThisType(TypeRef(NoPrefix,module class <root>)),module scalaz),Monad),List(TypeRef(ThisType(TypeRef(TermRef(ThisType(TypeRef(NoPrefix,module class scalaz)),module effect),trait MonadIO)),type F)))
444442

445-
// sbtDocCommand = forceDoc("iterateeJVM"), // Fails with
443+
// forceDoc("iterateeJVM"), // Fails with
446444
// [error] class scalaz.iteratee.Iteratee cannot be unpickled because no class file was found
447445

448446
sbtDocCommand = forceDoc("effectJVM"),

compiler/src/dotty/tools/dotc/quoted/reflect/FromSymbol.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ object FromSymbol {
1919
else if (sym.isType && sym.is(Case)) typeBindFromSym(sym.asType)
2020
else if (sym.isType) typeDefFromSym(sym.asType)
2121
else if (sym.is(Method)) defDefFromSym(sym.asTerm)
22-
else if (sym.is(ModuleVal)) valDefFromSym(sym.asTerm)
23-
else if (sym.is(Case)) bindFromSym(sym.asTerm)
22+
else if (sym.is(Case, butNot = ModuleVal | EnumVal)) bindFromSym(sym.asTerm)
2423
else valDefFromSym(sym.asTerm)
2524
}
2625

0 commit comments

Comments
 (0)