Skip to content
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

Jump to bottom

Revert #1284 Include mutual dependency in initial invalidation #1462

Merged
merged 2 commits into from
Oct 17, 2024
Merged

Revert #1284 Include mutual dependency in initial invalidation #1462

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4b8a6b3
.
lihaoyi Oct 16, 2024
3e3050f
renames
lihaoyi Oct 17, 2024
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
9 changes: 1 addition & 8 deletions internal/zinc-core/src/main/scala/sbt/internal/inc/IncrementalCommon.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -534,14 +534,7 @@ private[inc] abstract class IncrementalCommon(
val removedClasses = classNames(removedSrcs)
val dependentOnRemovedClasses = removedClasses.flatMap(previous.memberRef.internal.reverse)
val modifiedClasses = classNames(modifiedSrcs)
val mutualDependentOnModifiedClasses = {
val dependentOnModifiedClasses = modifiedClasses.flatMap(previous.memberRef.internal.reverse)
dependentOnModifiedClasses.filter(dependent =>
previous.memberRef.internal.reverse(dependent).exists(modifiedClasses)
)
}
val invalidatedClasses =
removedClasses ++ dependentOnRemovedClasses ++ modifiedClasses ++ mutualDependentOnModifiedClasses
val invalidatedClasses = removedClasses ++ dependentOnRemovedClasses ++ modifiedClasses

val byProduct = changes.removedProducts.flatMap(previous.produced)
val byLibraryDep = changes.libraryDeps.flatMap(previous.usesLibrary)
Expand Down
0 ...dependencies/abstract-class-to-trait/test → ...endencies/abstract-class-to-trait/pending
View file
Open in desktop
File renamed without changes.
0 ...test/source-dependencies/false-error/test → ...t/source-dependencies/false-error/pending
View file
Open in desktop
File renamed without changes.
0 ...urce-dependencies/nested-type-params/test → ...e-dependencies/nested-type-params/pending
View file
Open in desktop
File renamed without changes.
0 ...urce-dependencies/no-type-annotation/test → ...e-dependencies/no-type-annotation/pending
View file
Open in desktop
File renamed without changes.