diff --git a/internal/zinc-persist/src/main/scala/sbt/internal/inc/consistent/ConsistentAnalysisFormat.scala b/internal/zinc-persist/src/main/scala/sbt/internal/inc/consistent/ConsistentAnalysisFormat.scala index cbf08dfbd..744a7f12d 100644 --- a/internal/zinc-persist/src/main/scala/sbt/internal/inc/consistent/ConsistentAnalysisFormat.scala +++ b/internal/zinc-persist/src/main/scala/sbt/internal/inc/consistent/ConsistentAnalysisFormat.scala @@ -361,6 +361,8 @@ class ConsistentAnalysisFormat(val mappers: ReadWriteMappers, sort: Boolean) { wrS("inheritance.external", rs.inheritance.external) wrS("localInheritance.internal", rs.localInheritance.internal) wrS("localInheritance.external", rs.localInheritance.external) + wrS("macroExpansion.internal", rs.macroExpansion.internal) + wrS("macroExpansion.external", rs.macroExpansion.external) wrS("productClassNames", rs.productClassName) } @@ -384,23 +386,25 @@ class ConsistentAnalysisFormat(val mappers: ReadWriteMappers, sort: Boolean) { val bin = rd(mapSource, mapBinary) val lcn = rd(mapBinary, identity[String]) val cn = rd(mapSource, identity[String]) - val mri, mre, ii, ie, lii, lie, bcn = rdS() + val mri, mre, ii, ie, lii, lie, mei, mee, bcn = rdS() def deps( m: Relation[String, String], i: Relation[String, String], - l: Relation[String, String] + l: Relation[String, String], + me: Relation[String, String], ) = Map( DependencyContext.DependencyByMemberRef -> m, DependencyContext.DependencyByInheritance -> i, - DependencyContext.LocalDependencyByInheritance -> l + DependencyContext.LocalDependencyByInheritance -> l, + DependencyContext.DependencyByMacroExpansion -> me, ) Relations.make( p, bin, lcn, - InternalDependencies(deps(mri, ii, lii)), - ExternalDependencies(deps(mre, ie, lie)), + InternalDependencies(deps(mri, ii, lii, mei)), + ExternalDependencies(deps(mre, ie, lie, mee)), cn, un, bcn diff --git a/internal/zinc-persist/src/test/scala/sbt/inc/AnalysisGenerators.scala b/internal/zinc-persist/src/test/scala/sbt/inc/AnalysisGenerators.scala index a104ee551..b47bc24c3 100644 --- a/internal/zinc-persist/src/test/scala/sbt/inc/AnalysisGenerators.scala +++ b/internal/zinc-persist/src/test/scala/sbt/inc/AnalysisGenerators.scala @@ -206,18 +206,21 @@ object AnalysisGenerators { memberRef <- genRClassDependencies(classNames) inheritance <- genSubRClassDependencies(memberRef) localInheritance <- genSubRClassDependencies(memberRef) + macroExpansion <- genSubRClassDependencies(memberRef) internal <- InternalDependencies( Map( DependencyByMemberRef -> memberRef.internal, DependencyByInheritance -> inheritance.internal, - LocalDependencyByInheritance -> localInheritance.internal + LocalDependencyByInheritance -> localInheritance.internal, + DependencyByMacroExpansion -> macroExpansion.internal, ) ) external <- ExternalDependencies( Map( DependencyByMemberRef -> memberRef.external, DependencyByInheritance -> inheritance.external, - LocalDependencyByInheritance -> localInheritance.external + LocalDependencyByInheritance -> localInheritance.external, + DependencyByMacroExpansion -> macroExpansion.external, ) ) classes = rel(srcs, classNames)