Skip to content

Commit

Permalink
Silence new analyzer warnings
Browse files Browse the repository at this point in the history 
See flutter#6861

This silences all but two of the warnings from https://travis-ci.org/flutter/flutter/builds/176055550

One of the silenced warnings was a genuine code error.

Some of the others were correct but there was no way for the analyzer to know, and I worked around them.

The remainder are problems with the analyzer, specifically dart-lang/sdk#27827 and dart-lang/sdk#27504.
  • Loading branch information
@Hixie
Hixie committed Nov 15, 2016
1 parent 7424a76 commit ad86e4c
Show file tree
Hide file tree
Showing 11 changed files with 40 additions and 36 deletions.
12 changes: 6 additions & 6 deletions dev/tools/dartdoc.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,19 +148,19 @@ List<String> findPackageNames() {
List<Directory> findPackages() {
return new Directory('packages')
.listSync()
.where((FileSystemEntity entity) => entity is Directory)
.where((Directory dir) {
File pubspec = new File('${dir.path}/pubspec.yaml');
bool nodoc = pubspec.readAsStringSync().contains('nodoc: true');
return !nodoc;
.where((FileSystemEntity entity) {
if (entity is! Directory)
return false;
File pubspec = new File('${entity.path}/pubspec.yaml');
// TODO(ianh): Use a real YAML parser here
return !pubspec.readAsStringSync().contains('nodoc: true');
})
.toList();
}

Iterable<String> libraryRefs() sync* {
for (Directory dir in findPackages()) {
String dirName = path.basename(dir.path);

for (FileSystemEntity file in new Directory('${dir.path}/lib').listSync()) {
if (file is File && file.path.endsWith('.dart'))
yield '$dirName/${path.basename(file.path)}';
Expand Down
14 changes: 7 additions & 7 deletions packages/flutter/lib/src/gestures/drag.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ abstract class DragGestureRecognizer extends OneSequenceGestureRecognizer {
_initialPosition = event.position;
_pendingDragOffset = Offset.zero;
if (onDown != null)
invokeCallback/*<Null>*/('onDown', () => onDown(new DragDownDetails(globalPosition: _initialPosition)));
invokeCallback/*<Null>*/('onDown', () => onDown(new DragDownDetails(globalPosition: _initialPosition))); // ignore: INVALID_CAST_FUNCTION_EXPR, https://github.com/dart-lang/sdk/issues/27504
}
}

Expand All @@ -196,7 +196,7 @@ abstract class DragGestureRecognizer extends OneSequenceGestureRecognizer {
Offset delta = event.delta;
if (_state == _DragState.accepted) {
if (onUpdate != null) {
invokeCallback/*<Null>*/('onUpdate', () => onUpdate(new DragUpdateDetails(
invokeCallback/*<Null>*/('onUpdate', () => onUpdate(new DragUpdateDetails( // ignore: INVALID_CAST_FUNCTION_EXPR, https://github.com/dart-lang/sdk/issues/27504
delta: _getDeltaForDetails(delta),
primaryDelta: _getPrimaryDeltaForDetails(delta),
globalPosition: event.position
Expand All @@ -218,9 +218,9 @@ abstract class DragGestureRecognizer extends OneSequenceGestureRecognizer {
Offset delta = _pendingDragOffset;
_pendingDragOffset = Offset.zero;
if (onStart != null)
invokeCallback/*<Null>*/('onStart', () => onStart(new DragStartDetails(globalPosition: _initialPosition)));
invokeCallback/*<Null>*/('onStart', () => onStart(new DragStartDetails(globalPosition: _initialPosition))); // ignore: INVALID_CAST_FUNCTION_EXPR, https://github.com/dart-lang/sdk/issues/27504
if (delta != Offset.zero && onUpdate != null) {
invokeCallback/*<Null>*/('onUpdate', () => onUpdate(new DragUpdateDetails(
invokeCallback/*<Null>*/('onUpdate', () => onUpdate(new DragUpdateDetails( // ignore: INVALID_CAST_FUNCTION_EXPR, https://github.com/dart-lang/sdk/issues/27504
delta: _getDeltaForDetails(delta),
primaryDelta: _getPrimaryDeltaForDetails(delta)
)));
Expand All @@ -239,7 +239,7 @@ abstract class DragGestureRecognizer extends OneSequenceGestureRecognizer {
resolve(GestureDisposition.rejected);
_state = _DragState.ready;
if (onCancel != null)
invokeCallback/*<Null>*/('onCancel', onCancel);
invokeCallback/*<Null>*/('onCancel', onCancel); // ignore: INVALID_CAST_FUNCTION_EXPR, https://github.com/dart-lang/sdk/issues/27504
return;
}
bool wasAccepted = (_state == _DragState.accepted);
Expand All @@ -253,9 +253,9 @@ abstract class DragGestureRecognizer extends OneSequenceGestureRecognizer {
final Offset pixelsPerSecond = velocity.pixelsPerSecond;
if (pixelsPerSecond.distanceSquared > kMaxFlingVelocity * kMaxFlingVelocity)
velocity = new Velocity(pixelsPerSecond: (pixelsPerSecond / pixelsPerSecond.distance) * kMaxFlingVelocity);
invokeCallback/*<Null>*/('onEnd', () => onEnd(new DragEndDetails(velocity: velocity)));
invokeCallback/*<Null>*/('onEnd', () => onEnd(new DragEndDetails(velocity: velocity))); // ignore: INVALID_CAST_FUNCTION_EXPR, https://github.com/dart-lang/sdk/issues/27504
} else {
invokeCallback/*<Null>*/('onEnd', () => onEnd(new DragEndDetails(velocity: Velocity.zero)));
invokeCallback/*<Null>*/('onEnd', () => onEnd(new DragEndDetails(velocity: Velocity.zero))); // ignore: INVALID_CAST_FUNCTION_EXPR, https://github.com/dart-lang/sdk/issues/27504
}
}
_velocityTrackers.clear();
Expand Down
2 changes: 1 addition & 1 deletion packages/flutter/lib/src/gestures/long_press.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class LongPressGestureRecognizer extends PrimaryPointerGestureRecognizer {
void didExceedDeadline() {
resolve(GestureDisposition.accepted);
if (onLongPress != null)
invokeCallback/*<Null>*/('onLongPress', onLongPress);
invokeCallback/*<Null>*/('onLongPress', onLongPress); // ignore: INVALID_CAST_FUNCTION_EXPR, https://github.com/dart-lang/sdk/issues/27504
}

@override
Expand Down
12 changes: 6 additions & 6 deletions packages/flutter/lib/src/gestures/multitap.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ class DoubleTapGestureRecognizer extends GestureRecognizer {
_freezeTracker(tracker);
_trackers.remove(tracker.pointer);
if (onDoubleTap != null)
invokeCallback/*<Null>*/('onDoubleTap', onDoubleTap);
invokeCallback/*<Null>*/('onDoubleTap', onDoubleTap); // ignore: INVALID_CAST_FUNCTION_EXPR, https://github.com/dart-lang/sdk/issues/27504
_reset();
}

Expand Down Expand Up @@ -359,7 +359,7 @@ class MultiTapGestureRecognizer extends GestureRecognizer {
longTapDelay: longTapDelay
);
if (onTapDown != null)
invokeCallback/*<Null>*/('onTapDown', () => onTapDown(event.pointer, new TapDownDetails(globalPosition: event.position)));
invokeCallback/*<Null>*/('onTapDown', () => onTapDown(event.pointer, new TapDownDetails(globalPosition: event.position))); // ignore: INVALID_CAST_FUNCTION_EXPR, https://github.com/dart-lang/sdk/issues/27504
}

@override
Expand All @@ -380,19 +380,19 @@ class MultiTapGestureRecognizer extends GestureRecognizer {
_gestureMap.remove(pointer);
if (resolution == _TapResolution.tap) {
if (onTapUp != null)
invokeCallback/*<Null>*/('onTapUp', () => onTapUp(pointer, new TapUpDetails(globalPosition: globalPosition)));
invokeCallback/*<Null>*/('onTapUp', () => onTapUp(pointer, new TapUpDetails(globalPosition: globalPosition))); // ignore: INVALID_CAST_FUNCTION_EXPR, https://github.com/dart-lang/sdk/issues/27504
if (onTap != null)
invokeCallback/*<Null>*/('onTap', () => onTap(pointer));
invokeCallback/*<Null>*/('onTap', () => onTap(pointer)); // ignore: INVALID_CAST_FUNCTION_EXPR, https://github.com/dart-lang/sdk/issues/27504
} else {
if (onTapCancel != null)
invokeCallback/*<Null>*/('onTapCancel', () => onTapCancel(pointer));
invokeCallback/*<Null>*/('onTapCancel', () => onTapCancel(pointer)); // ignore: INVALID_CAST_FUNCTION_EXPR, https://github.com/dart-lang/sdk/issues/27504
}
}

void _handleLongTap(int pointer, Point lastPosition) {
assert(_gestureMap.containsKey(pointer));
if (onLongTapDown != null)
invokeCallback/*<Null>*/('onLongTapDown', () => onLongTapDown(pointer, new TapDownDetails(globalPosition: lastPosition)));
invokeCallback/*<Null>*/('onLongTapDown', () => onLongTapDown(pointer, new TapDownDetails(globalPosition: lastPosition))); // ignore: INVALID_CAST_FUNCTION_EXPR, https://github.com/dart-lang/sdk/issues/27504
}

@override
Expand Down
8 changes: 4 additions & 4 deletions packages/flutter/lib/src/gestures/scale.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,9 +180,9 @@ class ScaleGestureRecognizer extends OneSequenceGestureRecognizer {
final Offset pixelsPerSecond = velocity.pixelsPerSecond;
if (pixelsPerSecond.distanceSquared > kMaxFlingVelocity * kMaxFlingVelocity)
velocity = new Velocity(pixelsPerSecond: (pixelsPerSecond / pixelsPerSecond.distance) * kMaxFlingVelocity);
invokeCallback/*<Null>*/('onEnd', () => onEnd(new ScaleEndDetails(velocity: velocity)));
invokeCallback/*<Null>*/('onEnd', () => onEnd(new ScaleEndDetails(velocity: velocity))); // ignore: INVALID_CAST_FUNCTION_EXPR, https://github.com/dart-lang/sdk/issues/27504
} else {
invokeCallback/*<Null>*/('onEnd', () => onEnd(new ScaleEndDetails(velocity: Velocity.zero)));
invokeCallback/*<Null>*/('onEnd', () => onEnd(new ScaleEndDetails(velocity: Velocity.zero))); // ignore: INVALID_CAST_FUNCTION_EXPR, https://github.com/dart-lang/sdk/issues/27504
}
}
_state = ScaleState.accepted;
Expand All @@ -200,11 +200,11 @@ class ScaleGestureRecognizer extends OneSequenceGestureRecognizer {
if (_state == ScaleState.accepted && !configChanged) {
_state = ScaleState.started;
if (onStart != null)
invokeCallback/*<Null>*/('onStart', () => onStart(new ScaleStartDetails(focalPoint: focalPoint)));
invokeCallback/*<Null>*/('onStart', () => onStart(new ScaleStartDetails(focalPoint: focalPoint))); // ignore: INVALID_CAST_FUNCTION_EXPR, https://github.com/dart-lang/sdk/issues/27504
}

if (_state == ScaleState.started && onUpdate != null)
invokeCallback/*<Null>*/('onUpdate', () => onUpdate(new ScaleUpdateDetails(scale: _scaleFactor, focalPoint: focalPoint)));
invokeCallback/*<Null>*/('onUpdate', () => onUpdate(new ScaleUpdateDetails(scale: _scaleFactor, focalPoint: focalPoint))); // ignore: INVALID_CAST_FUNCTION_EXPR, https://github.com/dart-lang/sdk/issues/27504
}

@override
Expand Down
10 changes: 5 additions & 5 deletions packages/flutter/lib/src/gestures/tap.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ class TapGestureRecognizer extends PrimaryPointerGestureRecognizer {
void resolve(GestureDisposition disposition) {
if (_wonArenaForPrimaryPointer && disposition == GestureDisposition.rejected) {
if (onTapCancel != null)
invokeCallback/*<Null>*/('onTapCancel', onTapCancel);
invokeCallback/*<Null>*/('onTapCancel', onTapCancel); // ignore: INVALID_CAST_FUNCTION_EXPR, https://github.com/dart-lang/sdk/issues/27504
_reset();
}
super.resolve(disposition);
Expand All @@ -126,15 +126,15 @@ class TapGestureRecognizer extends PrimaryPointerGestureRecognizer {
if (pointer == primaryPointer) {
assert(state == GestureRecognizerState.defunct);
if (onTapCancel != null)
invokeCallback/*<Null>*/('onTapCancel', onTapCancel);
invokeCallback/*<Null>*/('onTapCancel', onTapCancel); // ignore: INVALID_CAST_FUNCTION_EXPR, https://github.com/dart-lang/sdk/issues/27504
_reset();
}
}

void _checkDown() {
if (!_sentTapDown) {
if (onTapDown != null)
invokeCallback/*<Null>*/('onTapDown', () => onTapDown(new TapDownDetails(globalPosition: initialPosition)));
invokeCallback/*<Null>*/('onTapDown', () => onTapDown(new TapDownDetails(globalPosition: initialPosition))); // ignore: INVALID_CAST_FUNCTION_EXPR, https://github.com/dart-lang/sdk/issues/27504
_sentTapDown = true;
}
}
Expand All @@ -143,9 +143,9 @@ class TapGestureRecognizer extends PrimaryPointerGestureRecognizer {
if (_wonArenaForPrimaryPointer && _finalPosition != null) {
resolve(GestureDisposition.accepted);
if (onTapUp != null)
invokeCallback/*<Null>*/('onTapUp', () => onTapUp(new TapUpDetails(globalPosition: _finalPosition)));
invokeCallback/*<Null>*/('onTapUp', () => onTapUp(new TapUpDetails(globalPosition: _finalPosition))); // ignore: INVALID_CAST_FUNCTION_EXPR, https://github.com/dart-lang/sdk/issues/27504
if (onTap != null)
invokeCallback/*<Null>*/('onTap', onTap);
invokeCallback/*<Null>*/('onTap', onTap); // ignore: INVALID_CAST_FUNCTION_EXPR, https://github.com/dart-lang/sdk/issues/27504
_reset();
}
}
Expand Down
6 changes: 3 additions & 3 deletions packages/flutter/lib/src/http/mock_client.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class MockClient extends BaseClient {
/// Creates a [MockClient] with a handler that receives [Request]s and sends
/// [Response]s.
MockClient(MockClientHandler fn)
: this._((Request baseRequest, ByteStream bodyStream) {
: this._((BaseRequest baseRequest, ByteStream bodyStream) {
return bodyStream.toBytes().then((Uint8List bodyBytes) {
Request request = new Request(baseRequest.method, baseRequest.url)
..persistentConnection = baseRequest.persistentConnection
Expand Down Expand Up @@ -56,7 +56,7 @@ class MockClient extends BaseClient {
/// Creates a [MockClient] with a handler that receives [StreamedRequest]s and
/// sends [StreamedResponse]s.
MockClient.streaming(MockClientStreamHandler fn)
: this._((Request request, ByteStream bodyStream) {
: this._((BaseRequest request, ByteStream bodyStream) {
return fn(request, bodyStream).then((StreamedResponse response) {
return new StreamedResponse(
response.stream,
Expand Down Expand Up @@ -85,4 +85,4 @@ typedef Future<StreamedResponse> MockClientStreamHandler(

/// A handler function that receives [Request]s and sends [Response]s. Note that
/// [request] will be finalized.
typedef Future<Response> MockClientHandler(Request request);
typedef Future<Response> MockClientHandler(BaseRequest request);
6 changes: 5 additions & 1 deletion packages/flutter/lib/src/widgets/framework.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1929,7 +1929,10 @@ abstract class Element implements BuildContext {
int get depth => _depth;
int _depth;

static int _sort(BuildableElement a, BuildableElement b) {
/// Returns true if the element has been marked as needing rebuilding.
bool get dirty => false;

static int _sort(Element a, Element b) {
if (a.depth < b.depth)
return -1;
if (b.depth < a.depth)
Expand Down Expand Up @@ -2667,6 +2670,7 @@ abstract class BuildableElement extends Element {
BuildableElement(Widget widget) : super(widget);

/// Returns true if the element has been marked as needing rebuilding.
@override
bool get dirty => _dirty;
bool _dirty = true;

Expand Down
2 changes: 1 addition & 1 deletion packages/flutter/lib/src/widgets/gesture_detector.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,7 @@ class RawGestureDetectorState extends State<RawGestureDetector> {
_syncAll(gestures);
if (!config.excludeFromSemantics) {
RenderSemanticsGestureHandler semanticsGestureHandler = context.findRenderObject();
context.visitChildElements((RenderObjectElement element) {
context.visitChildElements((Element element) {
_GestureSemantics widget = element.widget;
widget._updateHandlers(semanticsGestureHandler, _recognizers);
});
Expand Down
2 changes: 1 addition & 1 deletion packages/flutter_test/lib/src/binding.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ abstract class TestWidgetsFlutterBinding extends BindingBase
stack: stack,
context: 'running a test',
library: 'Flutter test framework',
stackFilter: (List<String> frames) {
stackFilter: (Iterable<String> frames) {
return FlutterError.defaultStackFilter(frames.skip(stackLinesToOmit));
},
informationCollector: (StringBuffer information) {
Expand Down
2 changes: 1 addition & 1 deletion packages/flutter_test/lib/src/controller.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ class WidgetController {
TestAsyncUtils.guardSync();
return allElements
.where((Element element) => element is StatefulElement)
.map((StatefulElement element) => element.state);
.map((StatefulElement element) => element.state); // ignore: INVALID_CAST_FUNCTION_EXPR, https://github.com/dart-lang/sdk/issues/27827
}

/// The matching state in the widget tree.
Expand Down

0 comments on commit ad86e4c

Please sign in to comment.