development/flutter
development/flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter synced 2024-08-27 12:00:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

enable combinators_ordering (#107847)

Browse source
This commit is contained in:
Alexandre Ardhuin 2022-07-19 00:04:07 +02:00 committed by GitHub
parent 891777d6ed
commit ccd33631e3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
87 changed files with 180 additions and 146 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
analysis_options.yaml
View file

@ -94,6 +94,7 @@ linter:
# - cascade_invocations # doesn't match the typical style of this repo
- cast_nullable_to_non_nullable
# - close_sinks # not reliable enough
- combinators_ordering
# - comment_references # blocked on https://github.com/dart-lang/linter/issues/1142
# - conditional_uri_does_not_exist # not yet tested
# - constant_identifier_names # needs an opt-out https://github.com/dart-lang/linter/issues/204
@ -103,6 +104,7 @@ linter:
- deprecated_consistency
# - diagnostic_describe_all_properties # enabled only at the framework level (packages/flutter/lib)
- directives_ordering
# - discarded_futures # not yet tested
# - do_not_use_environment # there are appropriate times to use the environment, especially in our tests and build logic
- empty_catches
- empty_constructor_bodies
@ -113,7 +115,6 @@ linter:
- flutter_style_todos
- hash_and_equals
- implementation_imports
# - invariant_booleans # too many false positives: https://github.com/dart-lang/linter/issues/811
- iterable_contains_unrelated_type
# - join_return_with_assignment # not required by flutter style
- leading_newlines_in_multiline_strings
@ -211,6 +212,7 @@ linter:
- unnecessary_late
- unnecessary_new
- unnecessary_null_aware_assignments
- unnecessary_null_aware_operator_on_extension_on_nullable
- unnecessary_null_checks
- unnecessary_null_in_if_null_operators
- unnecessary_nullable_for_final_variable_declarations
@ -221,6 +223,7 @@ linter:
- unnecessary_string_escapes
- unnecessary_string_interpolations
- unnecessary_this
- unnecessary_to_list_in_spreads
- unrelated_type_equality_checks
- unsafe_html
- use_build_context_synchronously

2
dev/benchmarks/test_apps/stocks/lib/main.dart
View file

@ -6,10 +6,10 @@ library stocks;
import 'package:flutter/material.dart';
import 'package:flutter/rendering.dart' show
debugPaintSizeEnabled,
debugPaintBaselinesEnabled,
debugPaintLayerBordersEnabled,
debugPaintPointersEnabled,
debugPaintSizeEnabled,
debugRepaintRainbowEnabled;
import 'i18n/stock_strings.dart';

2
dev/benchmarks/test_apps/stocks/lib/stock_home.dart
View file

@ -4,7 +4,7 @@
import 'package:flutter/gestures.dart' show DragStartBehavior;
import 'package:flutter/material.dart';
import 'package:flutter/rendering.dart' show debugDumpRenderTree, debugDumpLayerTree, debugDumpSemanticsTree, DebugSemanticsDumpOrder;
import 'package:flutter/rendering.dart' show DebugSemanticsDumpOrder, debugDumpLayerTree, debugDumpRenderTree, debugDumpSemanticsTree;
import 'package:flutter/scheduler.dart' show timeDilation;
import 'i18n/stock_strings.dart';

2
dev/bots/prepare_package.dart
View file

@ -12,7 +12,7 @@ import 'package:crypto/crypto.dart';
import 'package:crypto/src/digest_sink.dart';
import 'package:http/http.dart' as http;
import 'package:path/path.dart' as path;
import 'package:platform/platform.dart' show Platform, LocalPlatform;
import 'package:platform/platform.dart' show LocalPlatform, Platform;
import 'package:process/process.dart';
const String gobMirror =

2
dev/bots/unpublish_package.dart
View file

@ -17,7 +17,7 @@ import 'dart:io' hide Platform;
import 'package:args/args.dart';
import 'package:path/path.dart' as path;
import 'package:platform/platform.dart' show Platform, LocalPlatform;
import 'package:platform/platform.dart' show LocalPlatform, Platform;
import 'package:process/process.dart';
const String gsBase = 'gs://flutter_infra_release';

2
dev/devicelab/lib/framework/browser.dart
View file

@ -3,7 +3,7 @@
// found in the LICENSE file.
import 'dart:async';
import 'dart:convert' show json, utf8, LineSplitter, JsonEncoder;
import 'dart:convert' show JsonEncoder, LineSplitter, json, utf8;
import 'dart:io' as io;
import 'dart:math' as math;

2
dev/devicelab/lib/tasks/entrypoint_dart_registrant.dart
View file

@ -4,7 +4,7 @@
import 'dart:async';
import 'dart:convert';
import 'dart:io' show Process, ProcessSignal, Directory, File;
import 'dart:io' show Directory, File, Process, ProcessSignal;
import '../framework/devices.dart';
import '../framework/framework.dart';

2
dev/devicelab/lib/tasks/platform_channels_benchmarks.dart
View file

@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
import 'dart:io' show Process, Directory;
import 'dart:io' show Directory, Process;
import 'package:path/path.dart' as path;

2
dev/tools/examples_smoke_test.dart
View file

@ -9,7 +9,7 @@
import 'dart:async';
import 'dart:convert';
import 'dart:io' show stdout, stderr, exitCode, Process, ProcessException;
import 'dart:io' show Process, ProcessException, exitCode, stderr, stdout;
import 'package:file/file.dart';
import 'package:file/local.dart';

2
packages/flutter/lib/painting.dart
View file

@ -17,7 +17,7 @@
/// painting boxes.
library painting;
export 'dart:ui' show Shadow, PlaceholderAlignment, TextHeightBehavior, TextLeadingDistribution;
export 'dart:ui' show PlaceholderAlignment, Shadow, TextHeightBehavior, TextLeadingDistribution;
export 'src/painting/alignment.dart';
export 'src/painting/basic_types.dart';

4
packages/flutter/lib/rendering.dart
View file

@ -22,11 +22,11 @@
library rendering;
export 'package:flutter/foundation.dart' show
VoidCallback,
DiagnosticLevel,
ValueChanged,
ValueGetter,
ValueSetter,
DiagnosticLevel;
VoidCallback;
export 'package:flutter/semantics.dart';
export 'package:vector_math/vector_math_64.dart' show Matrix4;

2
packages/flutter/lib/src/cupertino/colors.dart
View file

@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
import 'dart:ui' show Color, Brightness;
import 'dart:ui' show Brightness, Color;
import '../../foundation.dart';
import '../widgets/basic.dart';

2
packages/flutter/lib/src/cupertino/context_menu.dart
View file

@ -6,7 +6,7 @@ import 'dart:math' as math;
import 'dart:ui' as ui;
import 'package:flutter/foundation.dart';
import 'package:flutter/gestures.dart' show kMinFlingVelocity, kLongPressTimeout;
import 'package:flutter/gestures.dart' show kLongPressTimeout, kMinFlingVelocity;
import 'package:flutter/scheduler.dart';
import 'package:flutter/services.dart';
import 'package:flutter/widgets.dart';

2
packages/flutter/lib/src/cupertino/route.dart
View file

@ -3,7 +3,7 @@
// found in the LICENSE file.
import 'dart:math';
import 'dart:ui' show lerpDouble, ImageFilter;
import 'dart:ui' show ImageFilter, lerpDouble;
import 'package:flutter/foundation.dart';
import 'package:flutter/gestures.dart';

2
packages/flutter/lib/src/cupertino/search_field.dart
View file

@ -11,7 +11,7 @@ import 'icons.dart';
import 'localizations.dart';
import 'text_field.dart';
export 'package:flutter/services.dart' show SmartQuotesType, SmartDashesType;
export 'package:flutter/services.dart' show SmartDashesType, SmartQuotesType;
/// A [CupertinoTextField] that mimics the look and behavior of UIKit's
/// `UISearchTextField`.

2
packages/flutter/lib/src/cupertino/text_field.dart
View file

@ -16,7 +16,7 @@ import 'icons.dart';
import 'text_selection.dart';
import 'theme.dart';
export 'package:flutter/services.dart' show TextInputType, TextInputAction, TextCapitalization, SmartQuotesType, SmartDashesType;
export 'package:flutter/services.dart' show SmartDashesType, SmartQuotesType, TextCapitalization, TextInputAction, TextInputType;
const TextStyle _kDefaultPlaceholderStyle = TextStyle(
fontWeight: FontWeight.w400,

2
packages/flutter/lib/src/foundation/binding.dart
View file

@ -5,7 +5,7 @@
import 'dart:convert' show json;
import 'dart:developer' as developer;
import 'dart:io' show exit;
import 'dart:ui' as ui show SingletonFlutterWindow, Brightness, PlatformDispatcher, window;
import 'dart:ui' as ui show Brightness, PlatformDispatcher, SingletonFlutterWindow, window;
// Before adding any more dart:ui imports, please read the README.
import 'package:meta/meta.dart';

2
packages/flutter/lib/src/gestures/converter.dart
View file

@ -3,7 +3,7 @@
// found in the LICENSE file.
import 'dart:ui' as ui show PointerData, PointerChange, PointerSignalKind;
import 'dart:ui' as ui show PointerChange, PointerData, PointerSignalKind;
import 'events.dart';

2
packages/flutter/lib/src/material/about.dart
View file

@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
import 'dart:developer' show Timeline, Flow;
import 'dart:developer' show Flow, Timeline;
import 'dart:io' show Platform;
import 'package:flutter/foundation.dart';

2
packages/flutter/lib/src/material/animated_icons.dart
View file

@ -6,7 +6,7 @@
library material_animated_icons;
import 'dart:math' as math show pi;
import 'dart:ui' as ui show Paint, Path, Canvas;
import 'dart:ui' as ui show Canvas, Paint, Path;
import 'dart:ui' show lerpDouble;
import 'package:flutter/foundation.dart' show clampDouble;

2
packages/flutter/lib/src/material/text_field.dart
View file

@ -21,7 +21,7 @@ import 'selectable_text.dart' show iOSHorizontalOffset;
import 'text_selection.dart';
import 'theme.dart';
export 'package:flutter/services.dart' show TextInputType, TextInputAction, TextCapitalization, SmartQuotesType, SmartDashesType;
export 'package:flutter/services.dart' show SmartDashesType, SmartQuotesType, TextCapitalization, TextInputAction, TextInputType;
/// Signature for the [TextField.buildCounter] callback.
typedef InputCounterWidgetBuilder = Widget? Function(

2
packages/flutter/lib/src/material/text_form_field.dart
View file

@ -9,7 +9,7 @@ import 'input_decorator.dart';
import 'text_field.dart';
import 'theme.dart';
export 'package:flutter/services.dart' show SmartQuotesType, SmartDashesType;
export 'package:flutter/services.dart' show SmartDashesType, SmartQuotesType;
/// A [FormField] that contains a [TextField].
///

6
packages/flutter/lib/src/painting/basic_types.dart
View file

@ -23,9 +23,9 @@ export 'dart:ui' show
Path,
PathFillType,
PathOperation,
Radius,
RRect,
RSTransform,
Radius,
Rect,
Shader,
Size,
@ -43,8 +43,8 @@ export 'dart:ui' show
VertexMode,
// TODO(werainkhatri): remove these after their deprecation period in engine
// https://github.com/flutter/flutter/pull/99505
hashValues, // ignore: deprecated_member_use
hashList; // ignore: deprecated_member_use
hashList, // ignore: deprecated_member_use
hashValues; // ignore: deprecated_member_use
export 'package:flutter/foundation.dart' show VoidCallback;

2
packages/flutter/lib/src/painting/binding.dart
View file

@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
import 'dart:ui' as ui show instantiateImageCodec, instantiateImageCodecFromBuffer, Codec, ImmutableBuffer;
import 'dart:ui' as ui show Codec, ImmutableBuffer, instantiateImageCodec, instantiateImageCodecFromBuffer;
import 'package:flutter/foundation.dart';
import 'package:flutter/services.dart' show ServicesBinding;

2
packages/flutter/lib/src/painting/clip.dart
View file

@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
import 'dart:ui' show Canvas, Clip, Path, Paint, Rect, RRect, VoidCallback;
import 'dart:ui' show Canvas, Clip, Paint, Path, RRect, Rect, VoidCallback;
/// Clip utilities used by [PaintingContext].
abstract class ClipContext {

2
packages/flutter/lib/src/painting/debug.dart
View file

@ -3,7 +3,7 @@
// found in the LICENSE file.
import 'dart:io';
import 'dart:ui' show Size, Picture, Image;
import 'dart:ui' show Image, Picture, Size;
import 'package:flutter/foundation.dart';

2
packages/flutter/lib/src/painting/edge_insets.dart
View file

@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
import 'dart:ui' as ui show lerpDouble, WindowPadding;
import 'dart:ui' as ui show WindowPadding, lerpDouble;
import 'package:flutter/foundation.dart';

2
packages/flutter/lib/src/painting/image_provider.dart
View file

@ -5,7 +5,7 @@
import 'dart:async';
import 'dart:io';
import 'dart:ui' as ui show Codec, ImmutableBuffer;
import 'dart:ui' show Size, Locale, TextDirection;
import 'dart:ui' show Locale, Size, TextDirection;
import 'package:flutter/foundation.dart';
import 'package:flutter/services.dart';

2
packages/flutter/lib/src/painting/image_stream.dart
View file

@ -3,7 +3,7 @@
// found in the LICENSE file.
import 'dart:async';
import 'dart:ui' as ui show Image, Codec, FrameInfo;
import 'dart:ui' as ui show Codec, FrameInfo, Image;
import 'package:flutter/foundation.dart';
import 'package:flutter/scheduler.dart';

14
packages/flutter/lib/src/painting/text_painter.dart
View file

@ -2,8 +2,18 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
import 'dart:math' show min, max;
import 'dart:ui' as ui show Paragraph, ParagraphBuilder, ParagraphConstraints, ParagraphStyle, PlaceholderAlignment, LineMetrics, TextHeightBehavior, TextStyle, BoxHeightStyle, BoxWidthStyle;
import 'dart:math' show max, min;
import 'dart:ui' as ui show
BoxHeightStyle,
BoxWidthStyle,
LineMetrics,
Paragraph,
ParagraphBuilder,
ParagraphConstraints,
ParagraphStyle,
PlaceholderAlignment,
TextHeightBehavior,
TextStyle;
import 'package:flutter/foundation.dart';
import 'package:flutter/services.dart';

2
packages/flutter/lib/src/painting/text_span.dart
View file

@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
import 'dart:ui' as ui show ParagraphBuilder, Locale, StringAttribute, LocaleStringAttribute, SpellOutStringAttribute;
import 'dart:ui' as ui show Locale, LocaleStringAttribute, ParagraphBuilder, SpellOutStringAttribute, StringAttribute;
import 'package:flutter/foundation.dart';
import 'package:flutter/gestures.dart';

11
packages/flutter/lib/src/painting/text_style.dart
View file

@ -2,7 +2,16 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
import 'dart:ui' as ui show ParagraphStyle, TextStyle, StrutStyle, lerpDouble, Shadow, FontFeature, FontVariation, TextHeightBehavior, TextLeadingDistribution;
import 'dart:ui' as ui show
FontFeature,
FontVariation,
ParagraphStyle,
Shadow,
StrutStyle,
TextHeightBehavior,
TextLeadingDistribution,
TextStyle,
lerpDouble;
import 'package:flutter/foundation.dart';

2
packages/flutter/lib/src/rendering/editable.dart
View file

@ -4,7 +4,7 @@
import 'dart:collection';
import 'dart:math' as math;
import 'dart:ui' as ui show TextBox, BoxHeightStyle, BoxWidthStyle, PlaceholderAlignment, LineMetrics;
import 'dart:ui' as ui show BoxHeightStyle, BoxWidthStyle, LineMetrics, PlaceholderAlignment, TextBox;
import 'package:characters/characters.dart';
import 'package:flutter/foundation.dart';

15
packages/flutter/lib/src/rendering/object.dart
View file

@ -14,7 +14,20 @@ import 'package:flutter/semantics.dart';
import 'debug.dart';
import 'layer.dart';
export 'package:flutter/foundation.dart' show FlutterError, InformationCollector, DiagnosticsNode, ErrorSummary, ErrorDescription, ErrorHint, DiagnosticsProperty, StringProperty, DoubleProperty, EnumProperty, FlagProperty, IntProperty, DiagnosticPropertiesBuilder;
export 'package:flutter/foundation.dart' show
DiagnosticPropertiesBuilder,
DiagnosticsNode,
DiagnosticsProperty,
DoubleProperty,
EnumProperty,
ErrorDescription,
ErrorHint,
ErrorSummary,
FlagProperty,
FlutterError,
InformationCollector,
IntProperty,
StringProperty;
export 'package:flutter/gestures.dart' show HitTestEntry, HitTestResult;
export 'package:flutter/painting.dart';

2
packages/flutter/lib/src/rendering/paragraph.dart
View file

@ -4,7 +4,7 @@
import 'dart:collection';
import 'dart:math' as math;
import 'dart:ui' as ui show Gradient, Shader, TextBox, PlaceholderAlignment, TextHeightBehavior, BoxHeightStyle, BoxWidthStyle;
import 'dart:ui' as ui show BoxHeightStyle, BoxWidthStyle, Gradient, PlaceholderAlignment, Shader, TextBox, TextHeightBehavior;
import 'package:flutter/foundation.dart';
import 'package:flutter/gestures.dart';

8
packages/flutter/lib/src/rendering/proxy_box.dart
View file

@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
import 'dart:ui' as ui show ImageFilter, Gradient, Image, Color;
import 'dart:ui' as ui show Color, Gradient, Image, ImageFilter;
import 'package:flutter/animation.dart';
import 'package:flutter/foundation.dart';
@ -16,11 +16,11 @@ import 'layout_helper.dart';
import 'object.dart';
export 'package:flutter/gestures.dart' show
PointerEvent,
PointerCancelEvent,
PointerDownEvent,
PointerEvent,
PointerMoveEvent,
PointerUpEvent,
PointerCancelEvent;
PointerUpEvent;
/// A base class for render boxes that resemble their children.
///

2
packages/flutter/lib/src/rendering/view.dart
View file

@ -4,7 +4,7 @@
import 'dart:developer';
import 'dart:io' show Platform;
import 'dart:ui' as ui show Scene, SceneBuilder, FlutterView;
import 'dart:ui' as ui show FlutterView, Scene, SceneBuilder;
import 'package:flutter/foundation.dart';
import 'package:flutter/services.dart';

4
packages/flutter/lib/src/scheduler/binding.dart
View file

@ -5,9 +5,9 @@
import 'dart:async';
import 'dart:collection';
import 'dart:developer' show Flow, Timeline, TimelineTask;
import 'dart:ui' show AppLifecycleState, FramePhase, FrameTiming, TimingsCallback, PlatformDispatcher;
import 'dart:ui' show AppLifecycleState, FramePhase, FrameTiming, PlatformDispatcher, TimingsCallback;
import 'package:collection/collection.dart' show PriorityQueue, HeapPriorityQueue;
import 'package:collection/collection.dart' show HeapPriorityQueue, PriorityQueue;
import 'package:flutter/foundation.dart';
import 'debug.dart';

3
packages/flutter/lib/src/semantics/semantics.dart
View file

@ -4,8 +4,7 @@
import 'dart:math' as math;
import 'dart:ui' as ui;
import 'dart:ui' show Offset, Rect, SemanticsAction, SemanticsFlag,
TextDirection, StringAttribute;
import 'dart:ui' show Offset, Rect, SemanticsAction, SemanticsFlag, StringAttribute, TextDirection;
import 'package:flutter/foundation.dart';
import 'package:flutter/painting.dart' show MatrixUtils, TransformProperty;

2
packages/flutter/lib/src/services/hardware_keyboard.dart
View file

@ -14,7 +14,7 @@ export 'dart:ui' show KeyData;
export 'package:flutter/foundation.dart' show DiagnosticPropertiesBuilder;
export 'keyboard_key.g.dart' show LogicalKeyboardKey, PhysicalKeyboardKey;
export 'raw_keyboard.dart' show RawKeyboard, RawKeyEvent;
export 'raw_keyboard.dart' show RawKeyEvent, RawKeyboard;
/// Represents a lock mode of a keyboard, such as [KeyboardLockMode.capsLock].
///

2
packages/flutter/lib/src/services/text_input.dart
View file

@ -7,8 +7,8 @@ import 'dart:io' show Platform;
import 'dart:ui' show
FontWeight,
Offset,
Size,
Rect,
Size,
TextAlign,
TextDirection;

4
packages/flutter/lib/src/widgets/basic.dart
View file

@ -26,8 +26,8 @@ export 'package:flutter/foundation.dart' show
ValueNotifier;
export 'package:flutter/painting.dart';
export 'package:flutter/rendering.dart' show
AlignmentTween,
AlignmentGeometryTween,
AlignmentTween,
Axis,
BoxConstraints,
BoxConstraintsTransform,
@ -45,7 +45,6 @@ export 'package:flutter/rendering.dart' show
MainAxisAlignment,
MainAxisSize,
MouseCursor,
SystemMouseCursors,
MultiChildLayoutDelegate,
PaintingContext,
PointerCancelEvent,
@ -63,6 +62,7 @@ export 'package:flutter/rendering.dart' show
ShapeBorderClipper,
SingleChildLayoutDelegate,
StackFit,
SystemMouseCursors,
TextOverflow,
ValueChanged,
ValueGetter,

2
packages/flutter/lib/src/widgets/binding.dart
View file

@ -4,7 +4,7 @@
import 'dart:async';
import 'dart:developer' as developer;
import 'dart:ui' show AppLifecycleState, Locale, AccessibilityFeatures, FrameTiming, TimingsCallback, PlatformDispatcher;
import 'dart:ui' show AccessibilityFeatures, AppLifecycleState, FrameTiming, Locale, PlatformDispatcher, TimingsCallback;
import 'package:flutter/foundation.dart';
import 'package:flutter/gestures.dart';

2
packages/flutter/lib/src/widgets/editable_text.dart
View file

@ -38,7 +38,7 @@ import 'text_selection.dart';
import 'ticker_provider.dart';
import 'widget_span.dart';
export 'package:flutter/services.dart' show SelectionChangedCause, TextEditingValue, TextSelection, TextInputType, SmartQuotesType, SmartDashesType;
export 'package:flutter/services.dart' show SelectionChangedCause, SmartDashesType, SmartQuotesType, TextEditingValue, TextInputType, TextSelection;
/// Signature for the callback that reports when the user changes the selection
/// (including the cursor location).

8
packages/flutter/lib/src/widgets/framework.dart
View file

@ -24,11 +24,11 @@ export 'package:flutter/foundation.dart' show
protected,
required,
visibleForTesting;
export 'package:flutter/foundation.dart' show FlutterError, ErrorSummary, ErrorDescription, ErrorHint, debugPrint, debugPrintStack;
export 'package:flutter/foundation.dart' show VoidCallback, ValueChanged, ValueGetter, ValueSetter;
export 'package:flutter/foundation.dart' show DiagnosticsNode, DiagnosticLevel;
export 'package:flutter/foundation.dart' show ErrorDescription, ErrorHint, ErrorSummary, FlutterError, debugPrint, debugPrintStack;
export 'package:flutter/foundation.dart' show ValueChanged, ValueGetter, ValueSetter, VoidCallback;
export 'package:flutter/foundation.dart' show DiagnosticLevel, DiagnosticsNode;
export 'package:flutter/foundation.dart' show Key, LocalKey, ValueKey;
export 'package:flutter/rendering.dart' show RenderObject, RenderBox, debugDumpRenderTree, debugDumpLayerTree;
export 'package:flutter/rendering.dart' show RenderBox, RenderObject, debugDumpLayerTree, debugDumpRenderTree;
// Examples can assume:
// late BuildContext context;

42
packages/flutter/lib/src/widgets/gesture_detector.dart
View file

@ -12,39 +12,39 @@ import 'media_query.dart';
export 'package:flutter/gestures.dart' show
DragDownDetails,
DragEndDetails,
DragStartDetails,
DragUpdateDetails,
DragEndDetails,
GestureTapDownCallback,
GestureTapUpCallback,
GestureTapCallback,
GestureTapCancelCallback,
GestureLongPressCallback,
GestureLongPressStartCallback,
GestureLongPressMoveUpdateCallback,
GestureLongPressUpCallback,
GestureLongPressEndCallback,
ForcePressDetails,
GestureDragCancelCallback,
GestureDragDownCallback,
GestureDragEndCallback,
GestureDragStartCallback,
GestureDragUpdateCallback,
GestureDragEndCallback,
GestureDragCancelCallback,
GestureForcePressEndCallback,
GestureForcePressPeakCallback,
GestureForcePressStartCallback,
GestureForcePressUpdateCallback,
GestureLongPressCallback,
GestureLongPressEndCallback,
GestureLongPressMoveUpdateCallback,
GestureLongPressStartCallback,
GestureLongPressUpCallback,
GestureScaleEndCallback,
GestureScaleStartCallback,
GestureScaleUpdateCallback,
GestureScaleEndCallback,
GestureForcePressStartCallback,
GestureForcePressPeakCallback,
GestureForcePressEndCallback,
GestureForcePressUpdateCallback,
LongPressStartDetails,
LongPressMoveUpdateDetails,
GestureTapCallback,
GestureTapCancelCallback,
GestureTapDownCallback,
GestureTapUpCallback,
LongPressEndDetails,
LongPressMoveUpdateDetails,
LongPressStartDetails,
ScaleEndDetails,
ScaleStartDetails,
ScaleUpdateDetails,
ScaleEndDetails,
TapDownDetails,
TapUpDetails,
ForcePressDetails,
Velocity;
export 'package:flutter/rendering.dart' show RenderSemanticsGestureHandler;

2
packages/flutter/lib/src/widgets/image.dart
View file

@ -27,8 +27,8 @@ export 'package:flutter/painting.dart' show
FilterQuality,
ImageConfiguration,
ImageInfo,
ImageStream,
ImageProvider,
ImageStream,
MemoryImage,
NetworkImage;

2
packages/flutter/lib/src/widgets/interactive_viewer.dart
View file

@ -7,7 +7,7 @@ import 'dart:math' as math;
import 'package:flutter/foundation.dart' show clampDouble;
import 'package:flutter/gestures.dart';
import 'package:flutter/physics.dart';
import 'package:vector_math/vector_math_64.dart' show Quad, Vector3, Matrix4;
import 'package:vector_math/vector_math_64.dart' show Matrix4, Quad, Vector3;
import 'basic.dart';
import 'framework.dart';

2
packages/flutter/lib/src/widgets/overscroll_indicator.dart
View file

@ -6,7 +6,7 @@ import 'dart:async' show Timer;
import 'dart:math' as math;
import 'package:flutter/foundation.dart';
import 'package:flutter/physics.dart' show nearEqual, Tolerance;
import 'package:flutter/physics.dart' show Tolerance, nearEqual;
import 'package:flutter/rendering.dart';
import 'package:flutter/scheduler.dart';

2
packages/flutter/lib/src/widgets/page_view.dart
View file

@ -4,7 +4,7 @@
import 'dart:math' as math;
import 'package:flutter/foundation.dart' show precisionErrorTolerance, clampDouble;
import 'package:flutter/foundation.dart' show clampDouble, precisionErrorTolerance;
import 'package:flutter/gestures.dart' show DragStartBehavior;
import 'package:flutter/rendering.dart';

2
packages/flutter/lib/src/widgets/scroll_physics.dart
View file

@ -14,7 +14,7 @@ import 'overscroll_indicator.dart';
import 'scroll_metrics.dart';
import 'scroll_simulation.dart';
export 'package:flutter/physics.dart' show Simulation, ScrollSpringSimulation, Tolerance;
export 'package:flutter/physics.dart' show ScrollSpringSimulation, Simulation, Tolerance;
// Examples can assume:
// class FooScrollPhysics extends ScrollPhysics {

2
packages/flutter/lib/src/widgets/sliver.dart
View file

@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
import 'dart:collection' show SplayTreeMap, HashMap;
import 'dart:collection' show HashMap, SplayTreeMap;
import 'package:flutter/foundation.dart';
import 'package:flutter/rendering.dart';

2
packages/flutter/test/cupertino/text_field_test.dart
View file

@ -16,7 +16,7 @@ import 'dart:ui' as ui show BoxHeightStyle, BoxWidthStyle, Color;
import 'package:flutter/cupertino.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/gestures.dart' show DragStartBehavior, PointerDeviceKind, kSecondaryMouseButton, kDoubleTapTimeout;
import 'package:flutter/gestures.dart' show DragStartBehavior, PointerDeviceKind, kDoubleTapTimeout, kSecondaryMouseButton;
import 'package:flutter/material.dart';
import 'package:flutter/rendering.dart';
import 'package:flutter/services.dart';

2
packages/flutter/test/cupertino/text_selection_test.dart
View file

@ -16,7 +16,7 @@ import 'package:flutter/services.dart';
import 'package:flutter_test/flutter_test.dart';
import '../widgets/clipboard_utils.dart';
import '../widgets/editable_text_utils.dart' show textOffsetToPosition, findRenderEditable;
import '../widgets/editable_text_utils.dart' show findRenderEditable, textOffsetToPosition;
class _LongCupertinoLocalizationsDelegate extends LocalizationsDelegate<CupertinoLocalizations> {
const _LongCupertinoLocalizationsDelegate();

2
packages/flutter/test/material/popup_menu_test.dart
View file

@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
import 'dart:ui' show SemanticsFlag, DisplayFeature, DisplayFeatureType, DisplayFeatureState;
import 'dart:ui' show DisplayFeature, DisplayFeatureState, DisplayFeatureType, SemanticsFlag;
import 'package:flutter/foundation.dart';
import 'package:flutter/gestures.dart';

2
packages/flutter/test/material/text_field_test.dart
View file

@ -24,7 +24,7 @@ import 'package:flutter/services.dart';
import 'package:flutter_test/flutter_test.dart';
import '../widgets/clipboard_utils.dart';
import '../widgets/editable_text_utils.dart' show findRenderEditable, globalize, textOffsetToPosition, OverflowWidgetTextEditingController;
import '../widgets/editable_text_utils.dart' show OverflowWidgetTextEditingController, findRenderEditable, globalize, textOffsetToPosition;
import '../widgets/semantics_tester.dart';
import 'feedback_tester.dart';

2
packages/flutter/test/painting/decoration_test.dart
View file

@ -3,7 +3,7 @@
// found in the LICENSE file.
import 'dart:async';
import 'dart:ui' as ui show Image, ColorFilter;
import 'dart:ui' as ui show ColorFilter, Image;
import 'package:fake_async/fake_async.dart';
import 'package:flutter/foundation.dart';

2
packages/flutter/test/painting/image_stream_test.dart
View file

@ -7,7 +7,7 @@ import 'dart:ui';
import 'package:flutter/foundation.dart';
import 'package:flutter/painting.dart';
import 'package:flutter/scheduler.dart' show timeDilation, SchedulerBinding;
import 'package:flutter/scheduler.dart' show SchedulerBinding, timeDilation;
import 'package:flutter_test/flutter_test.dart';
import '../image_data.dart';

2
packages/flutter/test/painting/text_style_test.dart
View file

@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
import 'dart:ui' as ui show TextStyle, ParagraphStyle, FontFeature, FontVariation, Shadow;
import 'dart:ui' as ui show FontFeature, FontVariation, ParagraphStyle, Shadow, TextStyle;
import 'package:flutter/foundation.dart';
import 'package:flutter/painting.dart';

2
packages/flutter/test/rendering/mock_canvas.dart
View file

@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
import 'dart:ui' as ui show Paragraph, Image;
import 'dart:ui' as ui show Image, Paragraph;
import 'package:flutter/foundation.dart';
import 'package:flutter/rendering.dart';

2
packages/flutter/test/rendering/paragraph_test.dart
View file

@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
import 'dart:ui' as ui show TextBox, BoxHeightStyle, BoxWidthStyle, Paragraph;
import 'dart:ui' as ui show BoxHeightStyle, BoxWidthStyle, Paragraph, TextBox;
import 'package:flutter/gestures.dart';
import 'package:flutter/rendering.dart';

4
packages/flutter/test/rendering/rendering_tester.dart
View file

@ -9,10 +9,10 @@ import 'package:flutter/gestures.dart';
import 'package:flutter/rendering.dart';
import 'package:flutter/scheduler.dart';
import 'package:flutter/services.dart';
import 'package:flutter_test/flutter_test.dart' show TestDefaultBinaryMessengerBinding, EnginePhase, fail;
import 'package:flutter_test/flutter_test.dart' show EnginePhase, TestDefaultBinaryMessengerBinding, fail;
export 'package:flutter/foundation.dart' show FlutterError, FlutterErrorDetails;
export 'package:flutter_test/flutter_test.dart' show TestDefaultBinaryMessengerBinding, EnginePhase;
export 'package:flutter_test/flutter_test.dart' show EnginePhase, TestDefaultBinaryMessengerBinding;
class TestRenderingFlutterBinding extends BindingBase with SchedulerBinding, ServicesBinding, GestureBinding, PaintingBinding, SemanticsBinding, RendererBinding, TestDefaultBinaryMessengerBinding {
/// Creates a binding for testing rendering library functionality.

2
packages/flutter/test/scheduler/time_dilation_test.dart
View file

@ -3,7 +3,7 @@
// found in the LICENSE file.
import 'package:flutter/scheduler.dart';
import 'package:flutter_test/flutter_test.dart' show test, expect;
import 'package:flutter_test/flutter_test.dart' show expect, test;
// This file should not use testWidgets, and should not instantiate the binding.

2
packages/flutter/test/widgets/interactive_viewer_test.dart
View file

@ -8,7 +8,7 @@ import 'package:flutter/gestures.dart';
import 'package:flutter/material.dart';
import 'package:flutter/rendering.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:vector_math/vector_math_64.dart' show Quad, Vector3, Matrix4;
import 'package:vector_math/vector_math_64.dart' show Matrix4, Quad, Vector3;
import 'gesture_utils.dart';

2
packages/flutter/test/widgets/list_wheel_scroll_view_test.dart
View file

@ -11,7 +11,7 @@ import 'package:flutter/widgets.dart';
import 'package:flutter_test/flutter_test.dart';
import '../rendering/mock_canvas.dart';
import '../rendering/rendering_tester.dart' show TestClipPaintingContext, TestCallbackPainter;
import '../rendering/rendering_tester.dart' show TestCallbackPainter, TestClipPaintingContext;
void main() {
testWidgets('ListWheelScrollView respects clipBehavior', (WidgetTester tester) async {

2
packages/flutter/test/widgets/modal_barrier_test.dart
View file

@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
import 'package:flutter/gestures.dart' show kSecondaryButton, PointerDeviceKind;
import 'package:flutter/gestures.dart' show PointerDeviceKind, kSecondaryButton;
import 'package:flutter/material.dart';
import 'package:flutter/rendering.dart';
import 'package:flutter/services.dart';

2
packages/flutter/test/widgets/semantics_tester.dart
View file

@ -7,7 +7,7 @@ import 'package:flutter/physics.dart';
import 'package:flutter/rendering.dart';
import 'package:flutter_test/flutter_test.dart';
export 'dart:ui' show SemanticsFlag, SemanticsAction;
export 'dart:ui' show SemanticsAction, SemanticsFlag;
export 'package:flutter/rendering.dart' show SemanticsData;
const String _matcherHelp = 'Try dumping the semantics with debugDumpSemanticsTree(DebugSemanticsDumpOrder.inverseHitTest) from the package:flutter/rendering.dart library to see what the semantics tree looks like.';

4
packages/flutter/test_private/test/animated_icons_private_test.dart.tmpl
View file

@ -12,8 +12,8 @@
library material_animated_icons;
import 'dart:math' as math show pi;
import 'dart:ui' show lerpDouble, Offset;
import 'dart:ui' as ui show Paint, Path, Canvas;
import 'dart:ui' show Offset, lerpDouble;
import 'dart:ui' as ui show Canvas, Paint, Path;
import 'package:flutter/foundation.dart' show clampDouble;
import 'package:flutter/widgets.dart';

2
packages/flutter_driver/lib/src/common/error.dart
View file

@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
import 'dart:io' show stderr, FileSystemException;
import 'dart:io' show FileSystemException, stderr;
/// Standard error thrown by Flutter Driver API.
class DriverError extends Error {

2
packages/flutter_driver/lib/src/driver/timeline_summary.dart
View file

@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
import 'dart:convert' show json, JsonEncoder;
import 'dart:convert' show JsonEncoder, json;
import 'dart:math' as math;
import 'package:file/file.dart';

14
packages/flutter_test/lib/src/widget_tester.dart
View file

@ -47,14 +47,14 @@ export 'package:flutter/rendering.dart' show SemanticsHandle;
// that doesn't apply here.
// ignore: deprecated_member_use
export 'package:test_api/test_api.dart' hide
test,
group,
setUpAll,
tearDownAll,
setUp,
tearDown,
expect,
isInstanceOf;
group,
isInstanceOf,
setUp,
setUpAll,
tearDown,
tearDownAll,
test;
/// Signature for callback to [testWidgets] and [benchmarkWidgets].
typedef WidgetTesterCallback = Future<void> Function(WidgetTester widgetTester);

2
packages/flutter_test/test/goldens_test.dart
View file

@ -7,7 +7,7 @@ import 'dart:io' as io;
import 'dart:typed_data';
import 'package:file/memory.dart';
import 'package:flutter/foundation.dart' show DiagnosticLevel, DiagnosticsNode, DiagnosticPropertiesBuilder, FlutterError;
import 'package:flutter/foundation.dart' show DiagnosticLevel, DiagnosticPropertiesBuilder, DiagnosticsNode, FlutterError;
import 'package:flutter_test/flutter_test.dart' hide test;
import 'package:flutter_test/flutter_test.dart' as test_package;

2
packages/flutter_test/test/platform_dispatcher_test.dart
View file

@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
import 'dart:ui' show Locale, AccessibilityFeatures, Brightness, PlatformDispatcher;
import 'dart:ui' show AccessibilityFeatures, Brightness, Locale, PlatformDispatcher;
import 'package:flutter/widgets.dart' show WidgetsBinding, WidgetsBindingObserver;
import 'package:flutter_test/flutter_test.dart';

2
packages/flutter_test/test/window_test.dart
View file

@ -3,7 +3,7 @@
// found in the LICENSE file.
import 'dart:ui' as ui show window;
import 'dart:ui' show Size, Locale, WindowPadding, AccessibilityFeatures, Brightness;
import 'dart:ui' show AccessibilityFeatures, Brightness, Locale, Size, WindowPadding;
import 'package:flutter/widgets.dart' show WidgetsBinding, WidgetsBindingObserver;
import 'package:flutter_test/flutter_test.dart';

2
packages/flutter_tools/lib/src/base/error_handling_io.dart
View file

@ -3,7 +3,7 @@
// found in the LICENSE file.
import 'dart:convert';
import 'dart:io' as io show Directory, File, Link, ProcessException, ProcessResult, ProcessSignal, systemEncoding, Process, ProcessStartMode;
import 'dart:io' as io show Directory, File, Link, Process, ProcessException, ProcessResult, ProcessSignal, ProcessStartMode, systemEncoding;
import 'dart:typed_data';
import 'package:file/file.dart';

36
packages/flutter_tools/lib/src/base/io.dart
View file

@ -34,21 +34,21 @@
import 'dart:async';
import 'dart:io' as io
show
exit,
IOSink,
InternetAddress,
InternetAddressType,
IOSink,
NetworkInterface,
pid,
Process,
ProcessInfo,
ProcessSignal,
stderr,
stdin,
Stdin,
StdinException,
Stdout,
StdoutException,
exit,
pid,
stderr,
stdin,
stdout;
import 'package:file/file.dart';
@ -63,10 +63,8 @@ export 'dart:io'
BytesBuilder,
CompressionOptions,
// Directory, NO! Use `file_system.dart`
exitCode,
// File, NO! Use `file_system.dart`
// FileSystemEntity, NO! Use `file_system.dart`
gzip,
GZipCodec,
HandshakeException,
HttpClient,
@ -79,14 +77,13 @@ export 'dart:io'
HttpResponse,
HttpServer,
HttpStatus,
InternetAddress,
InternetAddressType,
IOException,
IOSink,
InternetAddress,
InternetAddressType,
// Link NO! Use `file_system.dart`
// NetworkInterface NO! Use `io.dart`
OSError,
pid,
// Platform NO! use `platform.dart`
Process,
ProcessException,
@ -97,19 +94,22 @@ export 'dart:io'
// RandomAccessFile NO! Use `file_system.dart`
ServerSocket,
SignalException,
// stderr, NO! Use `io.dart`
// stdin, NO! Use `io.dart`
Stdin,
StdinException,
// stdout, NO! Use `io.dart`
Stdout,
Socket,
SocketException,
systemEncoding,
Stdin,
StdinException,
Stdout,
WebSocket,
WebSocketException,
WebSocketTransformer,
ZLibEncoder;
ZLibEncoder,
exitCode,
gzip,
pid,
// stderr, NO! Use `io.dart`
// stdin, NO! Use `io.dart`
// stdout, NO! Use `io.dart`
systemEncoding;
/// Exits the process with the given [exitCode].
typedef ExitFunction = void Function(int exitCode);

2
packages/flutter_tools/lib/src/base/logger.dart
View file

@ -10,7 +10,7 @@ import 'package:meta/meta.dart';
import '../convert.dart';
import 'common.dart';
import 'io.dart';
import 'terminal.dart' show Terminal, TerminalColor, OutputPreferences;
import 'terminal.dart' show OutputPreferences, Terminal, TerminalColor;
import 'utils.dart';
const int kDefaultStatusPadding = 59;

2
packages/flutter_tools/lib/src/context_runner.dart
View file

@ -42,7 +42,7 @@ import 'flutter_cache.dart';
import 'flutter_device_manager.dart';
import 'flutter_features.dart';
import 'fuchsia/fuchsia_device.dart' show FuchsiaDeviceTools;
import 'fuchsia/fuchsia_sdk.dart' show FuchsiaSdk, FuchsiaArtifacts;
import 'fuchsia/fuchsia_sdk.dart' show FuchsiaArtifacts, FuchsiaSdk;
import 'fuchsia/fuchsia_workflow.dart' show FuchsiaWorkflow, fuchsiaWorkflow;
import 'globals.dart' as globals;
import 'ios/ios_workflow.dart';

4
packages/flutter_tools/lib/src/convert.dart
View file

@ -5,12 +5,12 @@
// Hide the original utf8 [Codec] so that we can export our own implementation
// which adds additional error handling.
import 'dart:convert' hide utf8;
import 'dart:convert' as cnv show utf8, Utf8Decoder;
import 'dart:convert' as cnv show Utf8Decoder, utf8;
import 'package:meta/meta.dart';
import 'base/common.dart';
export 'dart:convert' hide utf8, Utf8Codec, Utf8Decoder;
export 'dart:convert' hide Utf8Codec, Utf8Decoder, utf8;
/// The original utf8 encoding for testing overrides only.
///

2
packages/flutter_tools/test/general.shard/devfs_test.dart
View file

@ -4,7 +4,7 @@
import 'dart:async';
import 'dart:convert';
import 'dart:io' as io show ProcessSignal, Process;
import 'dart:io' as io show Process, ProcessSignal;
import 'package:file/file.dart';
import 'package:file/memory.dart';

2
packages/flutter_tools/test/src/common.dart
View file

@ -16,7 +16,7 @@ import 'package:path/path.dart' as path; // flutter_ignore: package_path_import
import 'package:test_api/test_api.dart' as test_package show test; // ignore: deprecated_member_use
import 'package:test_api/test_api.dart' hide test; // ignore: deprecated_member_use
export 'package:test_api/test_api.dart' hide test, isInstanceOf; // ignore: deprecated_member_use
export 'package:test_api/test_api.dart' hide isInstanceOf, test; // ignore: deprecated_member_use
void tryToDelete(FileSystemEntity fileEntity) {
// This should not be necessary, but it turns out that

2
packages/flutter_tools/test/src/context.dart
View file

@ -44,7 +44,7 @@ import 'throwing_pub.dart';
export 'package:flutter_tools/src/base/context.dart' show Generator;
export 'fake_process_manager.dart' show ProcessManager, FakeProcessManager, FakeCommand;
export 'fake_process_manager.dart' show FakeCommand, FakeProcessManager, ProcessManager;
/// Return the test logger. This assumes that the current Logger is a BufferLogger.
BufferLogger get testLogger => context.get<Logger>()! as BufferLogger;

2
packages/flutter_tools/test/src/fake_process_manager.dart
View file

@ -4,7 +4,7 @@
import 'dart:async';
import 'dart:convert';
import 'dart:io' as io show ProcessSignal, Process, ProcessStartMode, ProcessResult, systemEncoding;
import 'dart:io' as io show Process, ProcessResult, ProcessSignal, ProcessStartMode, systemEncoding;
import 'package:file/file.dart';
import 'package:meta/meta.dart';

2
packages/flutter_tools/test/src/fake_vm_services.dart
View file

@ -9,7 +9,7 @@ import 'package:flutter_tools/src/vmservice.dart';
import 'package:test_api/test_api.dart' hide test; // ignore: deprecated_member_use
import 'package:vm_service/vm_service.dart' as vm_service;
export 'package:test_api/test_api.dart' hide test, isInstanceOf; // ignore: deprecated_member_use
export 'package:test_api/test_api.dart' hide isInstanceOf, test; // ignore: deprecated_member_use
/// A fake implementation of a vm_service that mocks the JSON-RPC request
/// and response structure.

2
packages/flutter_tools/test/src/io.dart
View file

@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
import 'dart:io' as io show IOOverrides, Directory, File, Link;
import 'dart:io' as io show Directory, File, IOOverrides, Link;
import 'package:flutter_tools/src/base/file_system.dart';

2
packages/flutter_tools/test/src/test_flutter_command_runner.dart
View file

@ -16,7 +16,7 @@ import 'package:flutter_tools/src/globals.dart' as globals;
import 'package:flutter_tools/src/runner/flutter_command.dart';
import 'package:flutter_tools/src/runner/flutter_command_runner.dart';
export 'package:test_api/test_api.dart' hide test, isInstanceOf; // ignore: deprecated_member_use
export 'package:test_api/test_api.dart' hide isInstanceOf, test; // ignore: deprecated_member_use
CommandRunner<void> createTestCommandRunner([ FlutterCommand? command ]) {
final FlutterCommandRunner runner = TestFlutterCommandRunner();

2
packages/integration_test/lib/integration_test.dart
View file

@ -4,7 +4,7 @@
import 'dart:async';
import 'dart:developer' as developer;
import 'dart:io' show SocketException, WebSocket, HttpClient;
import 'dart:io' show HttpClient, SocketException, WebSocket;
import 'dart:ui';
import 'package:flutter/foundation.dart';