diff options
| author | Esteban de la Canal <estebandlc@google.com> | 2016-09-28 19:19:54 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-09-28 19:19:54 +0000 |
| commit | 83bcfb874866a2f6f74f7700fe2c67f0af2a3c20 (patch) | |
| tree | 4049367484c8bd2f81338e2dc260c705b60edbf6 /compiler/src/main/kotlin/android/databinding | |
| parent | 33c0fd970325ee1ba47a68842bc20bb26506ddab (diff) | |
| parent | 729298e98a96730a9fbcf8c1d2575a8f0da7cc70 (diff) | |
| download | data-binding-83bcfb874866a2f6f74f7700fe2c67f0af2a3c20.tar.gz | |
Merge "Revert "Add support for dependent bindable properties."" into studio-master-dev
Diffstat (limited to 'compiler/src/main/kotlin/android/databinding')
| -rw-r--r-- | compiler/src/main/kotlin/android/databinding/tool/writer/LayoutBinderWriter.kt | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/compiler/src/main/kotlin/android/databinding/tool/writer/LayoutBinderWriter.kt b/compiler/src/main/kotlin/android/databinding/tool/writer/LayoutBinderWriter.kt index 2da9367d..3820084d 100644 --- a/compiler/src/main/kotlin/android/databinding/tool/writer/LayoutBinderWriter.kt +++ b/compiler/src/main/kotlin/android/databinding/tool/writer/LayoutBinderWriter.kt @@ -749,15 +749,14 @@ class LayoutBinderWriter(val layoutBinder : LayoutBinder) { block("switch (fieldId)", { val accessedFields: List<FieldAccessExpr> = it.parents.filterIsInstance(FieldAccessExpr::class.java) accessedFields.filter { it.isUsed && it.hasBindableAnnotations() } - .flatMap { expr -> expr.dirtyingProperties.map { Pair(it, expr)} } - .groupBy { it.first } + .groupBy { it.brName } .forEach { // If two expressions look different but resolve to the same method, // we are not yet able to merge them. This is why we merge their // flags below. block("case ${it.key}:") { block("synchronized(this)") { - val flagSet = it.value.foldRight(FlagSet()) { l, r -> l.second.invalidateFlagSet.or(r) } + val flagSet = it.value.foldRight(FlagSet()) { l, r -> l.invalidateFlagSet.or(r) } mDirtyFlags.mapOr(flagSet) { suffix, index -> tab("${mDirtyFlags.localValue(index)} |= ${flagSet.localValue(index)};") |