Commit 14c53211 authored by Phil Quitslund's avatar Phil Quitslund Committed by GitHub

Merge pull request #4793 from pq/analyzer_0.27.4-alpha.15

Update to latest analyzer (w/ cleanup).
parents fa7f2714 ec256c5e
...@@ -465,9 +465,6 @@ abstract class StatelessWidget extends Widget { ...@@ -465,9 +465,6 @@ abstract class StatelessWidget extends Widget {
/// inserted into the tree in multiple places at once. /// inserted into the tree in multiple places at once.
@protected @protected
Widget build(BuildContext context); Widget build(BuildContext context);
/// Trampoline to make the [build] closure library-accessible.
WidgetBuilder get _build => build;
} }
/// A widget that has mutable state. /// A widget that has mutable state.
...@@ -870,9 +867,6 @@ abstract class State<T extends StatefulWidget> { ...@@ -870,9 +867,6 @@ abstract class State<T extends StatefulWidget> {
@protected @protected
Widget build(BuildContext context); Widget build(BuildContext context);
/// Trampoline to make the [build] closure library-accessible.
WidgetBuilder get _build => build;
/// Called when a dependencies of this [State] object changes. /// Called when a dependencies of this [State] object changes.
/// ///
/// For example, if the previous call to [build] referenced an /// For example, if the previous call to [build] referenced an
...@@ -2012,7 +2006,7 @@ abstract class ComponentElement extends BuildableElement { ...@@ -2012,7 +2006,7 @@ abstract class ComponentElement extends BuildableElement {
/// Instantiation of [StatelessWidget]s. /// Instantiation of [StatelessWidget]s.
class StatelessElement extends ComponentElement { class StatelessElement extends ComponentElement {
StatelessElement(StatelessWidget widget) : super(widget) { StatelessElement(StatelessWidget widget) : super(widget) {
_builder = widget._build; _builder = widget.build;
} }
@override @override
...@@ -2022,14 +2016,14 @@ class StatelessElement extends ComponentElement { ...@@ -2022,14 +2016,14 @@ class StatelessElement extends ComponentElement {
void update(StatelessWidget newWidget) { void update(StatelessWidget newWidget) {
super.update(newWidget); super.update(newWidget);
assert(widget == newWidget); assert(widget == newWidget);
_builder = widget._build; _builder = widget.build;
_dirty = true; _dirty = true;
rebuild(); rebuild();
} }
@override @override
void _reassemble() { void _reassemble() {
_builder = widget._build; _builder = widget.build;
super._reassemble(); super._reassemble();
} }
} }
...@@ -2042,7 +2036,7 @@ class StatefulElement extends ComponentElement { ...@@ -2042,7 +2036,7 @@ class StatefulElement extends ComponentElement {
assert(_state._element == null); assert(_state._element == null);
_state._element = this; _state._element = this;
assert(_builder == _buildNothing); assert(_builder == _buildNothing);
_builder = _state._build; _builder = _state.build;
assert(_state._config == null); assert(_state._config == null);
_state._config = widget; _state._config = widget;
assert(_state._debugLifecycleState == _StateLifecycle.created); assert(_state._debugLifecycleState == _StateLifecycle.created);
...@@ -2053,7 +2047,7 @@ class StatefulElement extends ComponentElement { ...@@ -2053,7 +2047,7 @@ class StatefulElement extends ComponentElement {
@override @override
void _reassemble() { void _reassemble() {
_builder = state._build; _builder = state.build;
super._reassemble(); super._reassemble();
} }
......
...@@ -10,7 +10,7 @@ dependencies: ...@@ -10,7 +10,7 @@ dependencies:
# We don't actually depend on 'analyzer', but 'test' and 'flutter_tools' do. # We don't actually depend on 'analyzer', but 'test' and 'flutter_tools' do.
# We pin the version of analyzer we depend on to avoid version skew across our # We pin the version of analyzer we depend on to avoid version skew across our
# packages. # packages.
analyzer: 0.27.4-alpha.14 analyzer: 0.27.4-alpha.15
flutter: flutter:
path: ../flutter path: ../flutter
...@@ -38,7 +38,7 @@ dependencies: ...@@ -38,7 +38,7 @@ dependencies:
test: 0.12.13+5 test: 0.12.13+5
# Pinned in flutter_test as well. # Pinned in flutter_test as well.
analyzer: 0.27.4-alpha.14 analyzer: 0.27.4-alpha.15
dev_dependencies: dev_dependencies:
mockito: ^0.11.0 mockito: ^0.11.0
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment