firka/flutter
firka/flutter
5
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert string interp (#49602)

Browse Source
This commit is contained in:
Dan Field 2020-01-28 07:56:51 -08:00 committed by GitHub
parent bc5ea0a05a
commit fabeb2a16f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
57 changed files with 88 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dev/bots/unpublish_package.dart
View File

@ -391,7 +391,7 @@ void _printBanner(String message) {
final String banner = '*** $message ***'; final String banner = '*** $message ***';
print('\n'); print('\n');
print('*' * banner.length); print('*' * banner.length);
print(banner); print('$banner');
print('*' * banner.length); print('*' * banner.length);
print('\n'); print('\n');
} }

2
dev/customer_testing/run_tests.dart
View File

@ -272,7 +272,7 @@ Future<bool> shell(String command, Directory directory, { bool verbose = false,
print('>> $command'); print('>> $command');
Process process; Process process;
if (Platform.isWindows) { if (Platform.isWindows) {
process = await Process.start('CMD.EXE', <String>['/S', '/C', command], workingDirectory: directory.path); process = await Process.start('CMD.EXE', <String>['/S', '/C', '$command'], workingDirectory: directory.path);
} else { } else {
final List<String> segments = command.trim().split(_spaces); final List<String> segments = command.trim().split(_spaces);
process = await Process.start(segments.first, segments.skip(1).toList(), workingDirectory: directory.path); process = await Process.start(segments.first, segments.skip(1).toList(), workingDirectory: directory.path);

2
dev/devicelab/bin/tasks/named_isolates_test.dart
View File

@ -51,7 +51,7 @@ void main() {
print('Extracted observatory port: $observatoryUri'); print('Extracted observatory port: $observatoryUri');
final Process attachProcess = final Process attachProcess =
await _run(device: device, command: <String>['attach', '--debug-uri', await _run(device: device, command: <String>['attach', '--debug-uri',
observatoryUri, '--isolate-filter', _kSecondIsolateName], stdoutListener: (String line) { observatoryUri, '--isolate-filter', '$_kSecondIsolateName'], stdoutListener: (String line) {
if (line.contains(_kFirstIsolateName)) { if (line.contains(_kFirstIsolateName)) {
firstNameFound.complete(); firstNameFound.complete();
} else if (line.contains(_kSecondIsolateName)) { } else if (line.contains(_kSecondIsolateName)) {

12
dev/integration_tests/release_smoke_test/lib/main.dart
View File

@ -2,18 +2,28 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
import 'dart:convert' show utf8;
import 'package:flutter/foundation.dart';
import 'package:flutter/widgets.dart'; import 'package:flutter/widgets.dart';
void main() { Future<void> main() async {
const Text text = Text('Hello, world!', textDirection: TextDirection.ltr); const Text text = Text('Hello, world!', textDirection: TextDirection.ltr);
// These calls must not result in an error. They behave differently in // These calls must not result in an error. They behave differently in
// release mode compared to debug or profile. // release mode compared to debug or profile.
// The test will grep logcat for any errors emitted by Flutter. // The test will grep logcat for any errors emitted by Flutter.
print(text.toDiagnosticsNode()); print(text.toDiagnosticsNode());
print(text.toStringDeep()); print(text.toStringDeep());
// regression test for https://github.com/flutter/flutter/issues/49601
final List<int> computed = await compute(_utf8Encode, 'test', debugLabel: null);
print(computed);
runApp( runApp(
const Center( const Center(
child: text, child: text,
), ),
); );
} }
List<int> _utf8Encode(String data) {
return utf8.encode(data);
}

10
dev/manual_tests/lib/density.dart
View File

@ -246,7 +246,7 @@ class _OptionsState extends State<Options> {
), ),
), ),
Text( Text(
widget.model.size.toStringAsFixed(3), '${widget.model.size.toStringAsFixed(3)}',
style: TextStyle(color: Colors.grey[50]), style: TextStyle(color: Colors.grey[50]),
), ),
], ],
@ -261,7 +261,7 @@ class _OptionsState extends State<Options> {
child: SliderTheme( child: SliderTheme(
data: controlTheme, data: controlTheme,
child: Slider( child: Slider(
label: widget.model.density.horizontal.toStringAsFixed(1), label: '${widget.model.density.horizontal.toStringAsFixed(1)}',
min: VisualDensity.minimumDensity, min: VisualDensity.minimumDensity,
max: VisualDensity.maximumDensity, max: VisualDensity.maximumDensity,
onChanged: (double value) { onChanged: (double value) {
@ -272,7 +272,7 @@ class _OptionsState extends State<Options> {
), ),
), ),
Text( Text(
widget.model.density.horizontal.toStringAsFixed(3), '${widget.model.density.horizontal.toStringAsFixed(3)}',
style: TextStyle(color: Colors.grey[50]), style: TextStyle(color: Colors.grey[50]),
), ),
], ],
@ -287,7 +287,7 @@ class _OptionsState extends State<Options> {
child: SliderTheme( child: SliderTheme(
data: controlTheme, data: controlTheme,
child: Slider( child: Slider(
label: widget.model.density.vertical.toStringAsFixed(1), label: '${widget.model.density.vertical.toStringAsFixed(1)}',
min: VisualDensity.minimumDensity, min: VisualDensity.minimumDensity,
max: VisualDensity.maximumDensity, max: VisualDensity.maximumDensity,
onChanged: (double value) { onChanged: (double value) {
@ -298,7 +298,7 @@ class _OptionsState extends State<Options> {
), ),
), ),
Text( Text(
widget.model.density.vertical.toStringAsFixed(3), '${widget.model.density.vertical.toStringAsFixed(3)}',
style: TextStyle(color: Colors.grey[50]), style: TextStyle(color: Colors.grey[50]),
), ),
], ],

2
dev/tools/gen_keycodes/lib/code_gen.dart
View File

@ -25,7 +25,7 @@ class CodeGenerator {
currentLine += ' $word'; currentLine += ' $word';
} else { } else {
result.writeln('$prefix$currentLine'); result.writeln('$prefix$currentLine');
currentLine = word; currentLine = '$word';
} }
} }
if (currentLine.isNotEmpty) { if (currentLine.isNotEmpty) {

2
dev/tools/localization/localizations_utils.dart
View File

@ -339,7 +339,7 @@ String describeLocale(String tag) {
assert(subtags.isNotEmpty); assert(subtags.isNotEmpty);
assert(_languages.containsKey(subtags[0])); assert(_languages.containsKey(subtags[0]));
final String language = _languages[subtags[0]]; final String language = _languages[subtags[0]];
String output = language; String output = '$language';
String region; String region;
String script; String script;
if (subtags.length == 2) { if (subtags.length == 2) {

2
examples/catalog/bin/sample_page.dart
View File

@ -202,7 +202,7 @@ void generate(String commit) {
outputFile('${className}_index.md'), outputFile('${className}_index.md'),
inputFile('bin', 'class_index.md.template').readAsStringSync(), inputFile('bin', 'class_index.md.template').readAsStringSync(),
<String, String>{ <String, String>{
'class': className, 'class': '$className',
'entries': entries.join('\n'), 'entries': entries.join('\n'),
'link': '${className}_index', 'link': '${className}_index',
}, },

6
examples/flutter_gallery/lib/demo/material/data_table_demo.dart
View File

@ -113,11 +113,11 @@ class DessertDataSource extends DataTableSource {
} }
}, },
cells: <DataCell>[ cells: <DataCell>[
DataCell(Text(dessert.name)), DataCell(Text('${dessert.name}')),
DataCell(Text('${dessert.calories}')), DataCell(Text('${dessert.calories}')),
DataCell(Text(dessert.fat.toStringAsFixed(1))), DataCell(Text('${dessert.fat.toStringAsFixed(1)}')),
DataCell(Text('${dessert.carbs}')), DataCell(Text('${dessert.carbs}')),
DataCell(Text(dessert.protein.toStringAsFixed(1))), DataCell(Text('${dessert.protein.toStringAsFixed(1)}')),
DataCell(Text('${dessert.sodium}')), DataCell(Text('${dessert.sodium}')),
DataCell(Text('${dessert.calcium}%')), DataCell(Text('${dessert.calcium}%')),
DataCell(Text('${dessert.iron}%')), DataCell(Text('${dessert.iron}%')),

2
examples/flutter_gallery/lib/demo/material/full_screen_dialog_demo.dart
View File

@ -83,7 +83,7 @@ class DateTimeItem extends StatelessWidget {
}, },
child: Row( child: Row(
children: <Widget>[ children: <Widget>[
Text(time.format(context)), Text('${time.format(context)}'),
const Icon(Icons.arrow_drop_down, color: Colors.black54), const Icon(Icons.arrow_drop_down, color: Colors.black54),
], ],
), ),

2
examples/flutter_gallery/lib/demo/material/tabs_demo.dart
View File

@ -113,7 +113,7 @@ class _CardDataItem extends StatelessWidget {
alignment: page.id == 'H' alignment: page.id == 'H'
? Alignment.centerLeft ? Alignment.centerLeft
: Alignment.centerRight, : Alignment.centerRight,
child: CircleAvatar(child: Text(page.id)), child: CircleAvatar(child: Text('${page.id}')),
), ),
SizedBox( SizedBox(
width: 144.0, width: 144.0,

8
examples/flutter_gallery/lib/gallery/options.dart
View File

@ -231,7 +231,7 @@ class _ThemeModeItem extends StatelessWidget {
children: <Widget>[ children: <Widget>[
const Text('Theme'), const Text('Theme'),
Text( Text(
modeLabels[options.themeMode], '${modeLabels[options.themeMode]}',
style: Theme.of(context).primaryTextTheme.bodyText2, style: Theme.of(context).primaryTextTheme.bodyText2,
), ),
], ],
@ -278,7 +278,7 @@ class _TextScaleFactorItem extends StatelessWidget {
children: <Widget>[ children: <Widget>[
const Text('Text size'), const Text('Text size'),
Text( Text(
options.textScaleFactor.label, '${options.textScaleFactor.label}',
style: Theme.of(context).primaryTextTheme.bodyText2, style: Theme.of(context).primaryTextTheme.bodyText2,
), ),
], ],
@ -324,7 +324,7 @@ class _VisualDensityItem extends StatelessWidget {
children: <Widget>[ children: <Widget>[
const Text('Visual density'), const Text('Visual density'),
Text( Text(
options.visualDensity.label, '${options.visualDensity.label}',
style: Theme.of(context).primaryTextTheme.bodyText2, style: Theme.of(context).primaryTextTheme.bodyText2,
), ),
], ],
@ -431,7 +431,7 @@ class _PlatformItem extends StatelessWidget {
children: <Widget>[ children: <Widget>[
const Text('Platform mechanics'), const Text('Platform mechanics'),
Text( Text(
_platformLabel(options.platform), '${_platformLabel(options.platform)}',
style: Theme.of(context).primaryTextTheme.bodyText2, style: Theme.of(context).primaryTextTheme.bodyText2,
), ),
], ],

4
examples/stocks/lib/stock_symbol_viewer.dart
View File

@ -29,7 +29,7 @@ class _StockSymbolView extends StatelessWidget {
Row( Row(
children: <Widget>[ children: <Widget>[
Text( Text(
stock.symbol, '${stock.symbol}',
key: ValueKey<String>('${stock.symbol}_symbol_name'), key: ValueKey<String>('${stock.symbol}_symbol_name'),
style: Theme.of(context).textTheme.headline3, style: Theme.of(context).textTheme.headline3,
), ),
@ -43,7 +43,7 @@ class _StockSymbolView extends StatelessWidget {
height: 8.0 height: 8.0
), ),
Text('Market Cap', style: headings), Text('Market Cap', style: headings),
Text(stock.marketCap), Text('${stock.marketCap}'),
Container( Container(
height: 8.0 height: 8.0
), ),

2
packages/flutter/lib/src/animation/animation.dart
View File

@ -207,6 +207,6 @@ abstract class Animation<T> extends Listenable implements ValueListenable<T> {
break; break;
} }
assert(icon != null); assert(icon != null);
return icon; return '$icon';
} }
} }

2
packages/flutter/lib/src/animation/curves.dart
View File

@ -46,7 +46,7 @@ abstract class ParametricCurve<T> {
} }
@override @override
String toString() => objectRuntimeType(this, 'ParametricCurve'); String toString() => '${objectRuntimeType(this, 'ParametricCurve')}';
} }
/// An parametric animation easing curve, i.e. a mapping of the unit interval to /// An parametric animation easing curve, i.e. a mapping of the unit interval to

2
packages/flutter/lib/src/foundation/_isolates_io.dart
View File

@ -80,7 +80,7 @@ class _IsolateConfiguration<Q, R> {
Future<void> _spawn<Q, R>(_IsolateConfiguration<Q, FutureOr<R>> configuration) async { Future<void> _spawn<Q, R>(_IsolateConfiguration<Q, FutureOr<R>> configuration) async {
R result; R result;
await Timeline.timeSync( await Timeline.timeSync(
configuration.debugLabel, '${configuration.debugLabel}',
() async { () async {
final FutureOr<R> applicationResult = await configuration.apply(); final FutureOr<R> applicationResult = await configuration.apply();
result = await applicationResult; result = await applicationResult;

4
packages/flutter/lib/src/foundation/assertions.dart
View File

@ -381,7 +381,7 @@ class FlutterErrorDetails extends Diagnosticable {
debugFillProperties(builder); debugFillProperties(builder);
summary = builder.properties.firstWhere((DiagnosticsNode node) => node.level == DiagnosticLevel.summary, orElse: () => null); summary = builder.properties.firstWhere((DiagnosticsNode node) => node.level == DiagnosticLevel.summary, orElse: () => null);
} }
return summary ?? ErrorSummary(formatException()); return summary ?? ErrorSummary('${formatException()}');
} }
@override @override
@ -415,7 +415,7 @@ class FlutterErrorDetails extends Diagnosticable {
String message = exceptionAsString(); String message = exceptionAsString();
if (message.startsWith(prefix)) if (message.startsWith(prefix))
message = message.substring(prefix.length); message = message.substring(prefix.length);
properties.add(ErrorSummary(message)); properties.add(ErrorSummary('$message'));
} }
} }

4
packages/flutter/lib/src/foundation/diagnostics.dart
View File

@ -1277,7 +1277,7 @@ class TextTreeRenderer {
// with cases where a single line properties output may not have single // with cases where a single line properties output may not have single
// linebreak. // linebreak.
final String propertyRender = render(property, final String propertyRender = render(property,
prefixLineOne: propertyStyle.prefixLineOne, prefixLineOne: '${propertyStyle.prefixLineOne}',
prefixOtherLines: '${propertyStyle.childLinkSpace}${propertyStyle.prefixOtherLines}', prefixOtherLines: '${propertyStyle.childLinkSpace}${propertyStyle.prefixOtherLines}',
parentConfiguration: config, parentConfiguration: config,
); );
@ -1306,7 +1306,7 @@ class TextTreeRenderer {
if (!config.lineBreakProperties) if (!config.lineBreakProperties)
builder.write(config.lineBreak); builder.write(config.lineBreak);
final String prefixChildren = config.bodyIndent; final String prefixChildren = '${config.bodyIndent}';
final String prefixChildrenRaw = '$prefixOtherLines$prefixChildren'; final String prefixChildrenRaw = '$prefixOtherLines$prefixChildren';
if (children.isEmpty && if (children.isEmpty &&
config.addBlankLineIfNoChildren && config.addBlankLineIfNoChildren &&

2
packages/flutter/lib/src/gestures/mouse_tracking.dart
View File

@ -174,7 +174,7 @@ class _MouseState {
@override @override
String toString() { String toString() {
String describeEvent(PointerEvent event) { String describeEvent(PointerEvent event) {
return event == null ? 'null' : describeIdentity(event); return event == null ? 'null' : '${describeIdentity(event)}';
} }
final String describeLatestEvent = 'latestEvent: ${describeEvent(latestEvent)}'; final String describeLatestEvent = 'latestEvent: ${describeEvent(latestEvent)}';
final String describeAnnotations = 'annotations: [list of ${annotations.length}]'; final String describeAnnotations = 'annotations: [list of ${annotations.length}]';

4
packages/flutter/lib/src/material/floating_action_button_location.dart
View File

@ -122,7 +122,7 @@ abstract class FloatingActionButtonLocation {
Offset getOffset(ScaffoldPrelayoutGeometry scaffoldGeometry); Offset getOffset(ScaffoldPrelayoutGeometry scaffoldGeometry);
@override @override
String toString() => objectRuntimeType(this, 'FloatingActionButtonLocation'); String toString() => '${objectRuntimeType(this, 'FloatingActionButtonLocation')}';
} }
double _leftOffset(ScaffoldPrelayoutGeometry scaffoldGeometry, { double offset = 0.0 }) { double _leftOffset(ScaffoldPrelayoutGeometry scaffoldGeometry, { double offset = 0.0 }) {
@ -407,7 +407,7 @@ abstract class FloatingActionButtonAnimator {
double getAnimationRestart(double previousValue) => 0.0; double getAnimationRestart(double previousValue) => 0.0;
@override @override
String toString() => objectRuntimeType(this, 'FloatingActionButtonAnimator'); String toString() => '${objectRuntimeType(this, 'FloatingActionButtonAnimator')}';
} }
class _ScalingFabMotionAnimator extends FloatingActionButtonAnimator { class _ScalingFabMotionAnimator extends FloatingActionButtonAnimator {

2
packages/flutter/lib/src/painting/decoration.dart
View File

@ -26,7 +26,7 @@ abstract class Decoration extends Diagnosticable {
const Decoration(); const Decoration();
@override @override
String toStringShort() => objectRuntimeType(this, 'Decoration'); String toStringShort() => '${objectRuntimeType(this, 'Decoration')}';
/// In checked mode, throws an exception if the object is not in a /// In checked mode, throws an exception if the object is not in a
/// valid configuration. Otherwise, returns true. /// valid configuration. Otherwise, returns true.

2
packages/flutter/lib/src/painting/strut_style.dart
View File

@ -571,7 +571,7 @@ class StrutStyle extends Diagnosticable {
} }
@override @override
String toStringShort() => objectRuntimeType(this, 'StrutStyle'); String toStringShort() => '${objectRuntimeType(this, 'StrutStyle')}';
/// Adds all properties prefixing property names with the optional `prefix`. /// Adds all properties prefixing property names with the optional `prefix`.
@override @override

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

@ -440,7 +440,7 @@ class TextSpan extends InlineSpan {
); );
@override @override
String toStringShort() => objectRuntimeType(this, 'TextSpan'); String toStringShort() => '${objectRuntimeType(this, 'TextSpan')}';
@override @override
void debugFillProperties(DiagnosticPropertiesBuilder properties) { void debugFillProperties(DiagnosticPropertiesBuilder properties) {

2
packages/flutter/lib/src/painting/text_style.dart
View File

@ -1195,7 +1195,7 @@ class TextStyle extends Diagnosticable {
} }
@override @override
String toStringShort() => objectRuntimeType(this, 'TextStyle'); String toStringShort() => '${objectRuntimeType(this, 'TextStyle')}';
/// Adds all properties prefixing property names with the optional `prefix`. /// Adds all properties prefixing property names with the optional `prefix`.
@override @override

2
packages/flutter/lib/src/physics/simulation.dart
View File

@ -54,5 +54,5 @@ abstract class Simulation {
Tolerance tolerance; Tolerance tolerance;
@override @override
String toString() => objectRuntimeType(this, 'Simulation'); String toString() => '${objectRuntimeType(this, 'Simulation')}';
} }

2
packages/flutter/lib/src/rendering/custom_layout.dart
View File

@ -294,7 +294,7 @@ abstract class MultiChildLayoutDelegate {
/// ///
/// By default, returns the [runtimeType] of the class. /// By default, returns the [runtimeType] of the class.
@override @override
String toString() => objectRuntimeType(this, 'MultiChildLayoutDelegate'); String toString() => '${objectRuntimeType(this, 'MultiChildLayoutDelegate')}';
} }
/// Defers the layout of multiple children to a delegate. /// Defers the layout of multiple children to a delegate.

2
packages/flutter/lib/src/rendering/flow.dart
View File

@ -132,7 +132,7 @@ abstract class FlowDelegate {
/// ///
/// By default, returns the [runtimeType] of the class. /// By default, returns the [runtimeType] of the class.
@override @override
String toString() => objectRuntimeType(this, 'FlowDelegate'); String toString() => '${objectRuntimeType(this, 'FlowDelegate')}';
} }
/// Parent data for use with [RenderFlow]. /// Parent data for use with [RenderFlow].

2
packages/flutter/lib/src/rendering/proxy_box.dart
View File

@ -1138,7 +1138,7 @@ abstract class CustomClipper<T> {
bool shouldReclip(covariant CustomClipper<T> oldClipper); bool shouldReclip(covariant CustomClipper<T> oldClipper);
@override @override
String toString() => objectRuntimeType(this, 'CustomClipper'); String toString() => '${objectRuntimeType(this, 'CustomClipper')}';
} }
/// A [CustomClipper] that clips to the outer path of a [ShapeBorder]. /// A [CustomClipper] that clips to the outer path of a [ShapeBorder].

2
packages/flutter/lib/src/rendering/sliver.dart
View File

@ -759,7 +759,7 @@ class SliverGeometry extends Diagnosticable {
} }
@override @override
String toStringShort() => objectRuntimeType(this, 'SliverGeometry'); String toStringShort() => '${objectRuntimeType(this, 'SliverGeometry')}';
@override @override
void debugFillProperties(DiagnosticPropertiesBuilder properties) { void debugFillProperties(DiagnosticPropertiesBuilder properties) {

2
packages/flutter/lib/src/rendering/table.dart
View File

@ -76,7 +76,7 @@ abstract class TableColumnWidth {
double flex(Iterable<RenderBox> cells) => null; double flex(Iterable<RenderBox> cells) => null;
@override @override
String toString() => objectRuntimeType(this, 'TableColumnWidth'); String toString() => '${objectRuntimeType(this, 'TableColumnWidth')}';
} }
/// Sizes the column according to the intrinsic dimensions of all the /// Sizes the column according to the intrinsic dimensions of all the

4
packages/flutter/lib/src/semantics/semantics.dart
View File

@ -376,7 +376,7 @@ class SemanticsData extends Diagnosticable {
bool hasAction(SemanticsAction action) => (actions & action.index) != 0; bool hasAction(SemanticsAction action) => (actions & action.index) != 0;
@override @override
String toStringShort() => objectRuntimeType(this, 'SemanticsData'); String toStringShort() => '${objectRuntimeType(this, 'SemanticsData')}';
@override @override
void debugFillProperties(DiagnosticPropertiesBuilder properties) { void debugFillProperties(DiagnosticPropertiesBuilder properties) {
@ -1150,7 +1150,7 @@ class SemanticsProperties extends DiagnosticableTree {
} }
@override @override
String toStringShort() => objectRuntimeType(this, 'SemanticsProperties'); // the hashCode isn't important since we're immutable String toStringShort() => '${objectRuntimeType(this, 'SemanticsProperties')}'; // the hashCode isn't important since we're immutable
} }
/// In tests use this function to reset the counter used to generate /// In tests use this function to reset the counter used to generate

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

@ -2099,9 +2099,9 @@ class SizedBox extends SingleChildRenderObjectWidget {
} else if (width == 0.0 && height == 0.0) { } else if (width == 0.0 && height == 0.0) {
type = '${objectRuntimeType(this, 'SizedBox')}.shrink'; type = '${objectRuntimeType(this, 'SizedBox')}.shrink';
} else { } else {
type = objectRuntimeType(this, 'SizedBox'); type = '${objectRuntimeType(this, 'SizedBox')}';
} }
return key == null ? type : '$type-$key'; return key == null ? '$type' : '$type-$key';
} }
@override @override

2
packages/flutter/lib/src/widgets/debug.dart
View File

@ -315,7 +315,7 @@ bool debugAssertAllWidgetVarsUnset(String reason) {
debugPrintGlobalKeyedWidgetLifecycle || debugPrintGlobalKeyedWidgetLifecycle ||
debugProfileBuildsEnabled || debugProfileBuildsEnabled ||
debugHighlightDeprecatedWidgets) { debugHighlightDeprecatedWidgets) {
throw FlutterError.fromParts(<DiagnosticsNode>[ErrorSummary(reason)]); throw FlutterError.fromParts(<DiagnosticsNode>[ErrorSummary('$reason')]);
} }
return true; return true;
}()); }());

2
packages/flutter/lib/src/widgets/draggable_scrollable_sheet.dart
View File

@ -476,7 +476,7 @@ class _DraggableScrollableSheetScrollPosition
); );
final AnimationController ballisticController = AnimationController.unbounded( final AnimationController ballisticController = AnimationController.unbounded(
debugLabel: objectRuntimeType(this, '_DraggableScrollableSheetPosition'), debugLabel: '${objectRuntimeType(this, '_DraggableScrollableSheetPosition')}',
vsync: context.vsync, vsync: context.vsync,
); );
double lastDelta = 0; double lastDelta = 0;

5
packages/flutter/lib/src/widgets/framework.dart
View File

@ -442,8 +442,7 @@ abstract class Widget extends DiagnosticableTree {
/// A short, textual description of this widget. /// A short, textual description of this widget.
@override @override
String toStringShort() { String toStringShort() {
final String type = objectRuntimeType(this, 'Widget'); return key == null ? '${objectRuntimeType(this, 'Widget')}' : '${objectRuntimeType(this, 'Widget')}-$key';
return key == null ? type : '$type-$key';
} }
@override @override
@ -3897,7 +3896,7 @@ abstract class Element extends DiagnosticableTree implements BuildContext {
/// A short, textual description of this element. /// A short, textual description of this element.
@override @override
String toStringShort() { String toStringShort() {
return widget != null ? widget.toStringShort() : '[${objectRuntimeType(this, 'Element')}]'; return widget != null ? '${widget.toStringShort()}' : '[${objectRuntimeType(this, 'Element')}]';
} }
@override @override

2
packages/flutter/lib/src/widgets/implicit_animations.dart
View File

@ -360,7 +360,7 @@ abstract class ImplicitlyAnimatedWidgetState<T extends ImplicitlyAnimatedWidget>
super.initState(); super.initState();
_controller = AnimationController( _controller = AnimationController(
duration: widget.duration, duration: widget.duration,
debugLabel: kDebugMode ? widget.toStringShort() : null, debugLabel: kDebugMode ? '${widget.toStringShort()}' : null,
vsync: this, vsync: this,
); );
_controller.addStatusListener((AnimationStatus status) { _controller.addStatusListener((AnimationStatus status) {

2
packages/flutter/lib/src/widgets/routes.dart
View File

@ -354,7 +354,7 @@ abstract class TransitionRoute<T> extends OverlayRoute<T> {
} }
/// A short description of this route useful for debugging. /// A short description of this route useful for debugging.
String get debugLabel => objectRuntimeType(this, 'TransitionRoute'); String get debugLabel => '${objectRuntimeType(this, 'TransitionRoute')}';
@override @override
String toString() => '${objectRuntimeType(this, 'TransitionRoute')}(animation: $_controller)'; String toString() => '${objectRuntimeType(this, 'TransitionRoute')}(animation: $_controller)';

4
packages/flutter/lib/src/widgets/scroll_activity.dart
View File

@ -507,7 +507,7 @@ class BallisticScrollActivity extends ScrollActivity {
TickerProvider vsync, TickerProvider vsync,
) : super(delegate) { ) : super(delegate) {
_controller = AnimationController.unbounded( _controller = AnimationController.unbounded(
debugLabel: kDebugMode ? objectRuntimeType(this, 'BallisticScrollActivity') : null, debugLabel: kDebugMode ? '${objectRuntimeType(this, 'BallisticScrollActivity')}' : null,
vsync: vsync, vsync: vsync,
) )
..addListener(_tick) ..addListener(_tick)
@ -604,7 +604,7 @@ class DrivenScrollActivity extends ScrollActivity {
_completer = Completer<void>(); _completer = Completer<void>();
_controller = AnimationController.unbounded( _controller = AnimationController.unbounded(
value: from, value: from,
debugLabel: objectRuntimeType(this, 'DrivenScrollActivity'), debugLabel: '${objectRuntimeType(this, 'DrivenScrollActivity')}',
vsync: vsync, vsync: vsync,
) )
..addListener(_tick) ..addListener(_tick)

2
packages/flutter/lib/src/widgets/scroll_configuration.dart
View File

@ -77,7 +77,7 @@ class ScrollBehavior {
bool shouldNotify(covariant ScrollBehavior oldDelegate) => false; bool shouldNotify(covariant ScrollBehavior oldDelegate) => false;
@override @override
String toString() => objectRuntimeType(this, 'ScrollBehavior'); String toString() => '${objectRuntimeType(this, 'ScrollBehavior')}';
} }
/// Controls how [Scrollable] widgets behave in a subtree. /// Controls how [Scrollable] widgets behave in a subtree.

2
packages/flutter/lib/src/widgets/shortcuts.dart
View File

@ -156,7 +156,7 @@ class LogicalKeySet extends KeySet<LogicalKeyboardKey> with DiagnosticableMixin
return a.debugName.compareTo(b.debugName); return a.debugName.compareTo(b.debugName);
} }
); );
return sortedKeys.map<String>((LogicalKeyboardKey key) => key.debugName).join(' + '); return sortedKeys.map<String>((LogicalKeyboardKey key) => '${key.debugName}').join(' + ');
} }
@override @override

2
packages/flutter/test/material/slider_theme_test.dart
View File

@ -378,7 +378,7 @@ void main() {
data: sliderTheme, data: sliderTheme,
child: Slider( child: Slider(
value: sliderValue, value: sliderValue,
label: value, label: '$value',
divisions: 3, divisions: 3,
onChanged: (double d) { }, onChanged: (double d) { },
), ),

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

@ -259,7 +259,7 @@ class TestSemantics {
DebugSemanticsDumpOrder childOrder = DebugSemanticsDumpOrder.inverseHitTest, DebugSemanticsDumpOrder childOrder = DebugSemanticsDumpOrder.inverseHitTest,
}) { }) {
bool fail(String message) { bool fail(String message) {
matchState[TestSemantics] = message; matchState[TestSemantics] = '$message';
return false; return false;
} }

2
packages/flutter_localizations/test/material/date_picker_test.dart
View File

@ -46,7 +46,7 @@ void main() {
const Locale('ar', 'AR'): <String, dynamic>{ const Locale('ar', 'AR'): <String, dynamic>{
'textDirection': TextDirection.rtl, 'textDirection': TextDirection.rtl,
'expectedDaysOfWeek': <String>['ح', 'ن', 'ث', 'ر', 'خ', 'ج', 'س'], 'expectedDaysOfWeek': <String>['ح', 'ن', 'ث', 'ر', 'خ', 'ج', 'س'],
'expectedDaysOfMonth': List<String>.generate(30, (int i) => arabicNumbers.format(i + 1)), 'expectedDaysOfMonth': List<String>.generate(30, (int i) => '${arabicNumbers.format(i + 1)}'),
'expectedMonthYearHeader': 'سبتمبر ٢٠١٧', 'expectedMonthYearHeader': 'سبتمبر ٢٠١٧',
}, },
}; };

4
packages/flutter_test/lib/src/test_async_utils.dart
View File

@ -344,14 +344,14 @@ class TestAsyncUtils {
// a 'dart:' API, like from the Future/microtask mechanism, because dart: URLs in the // a 'dart:' API, like from the Future/microtask mechanism, because dart: URLs in the
// stack trace don't have a column number and so don't match the regexp above. // stack trace don't have a column number and so don't match the regexp above.
information.add(ErrorSummary('(Unable to parse the stack frame of the method that called the method that called $_className.$method(). The stack may be incomplete or bogus.)')); information.add(ErrorSummary('(Unable to parse the stack frame of the method that called the method that called $_className.$method(). The stack may be incomplete or bogus.)'));
information.add(ErrorDescription(stack[index])); information.add(ErrorDescription('${stack[index]}'));
} }
} else { } else {
information.add(ErrorSummary('(Unable to find the stack frame of the method that called the method that called $_className.$method(). The stack may be incomplete or bogus.)')); information.add(ErrorSummary('(Unable to find the stack frame of the method that called the method that called $_className.$method(). The stack may be incomplete or bogus.)'));
} }
} else { } else {
information.add(ErrorSummary('(Unable to parse the stack frame of the method that called $_className.$method(). The stack may be incomplete or bogus.)')); information.add(ErrorSummary('(Unable to parse the stack frame of the method that called $_className.$method(). The stack may be incomplete or bogus.)'));
information.add(ErrorDescription(stack[index])); information.add(ErrorDescription('${stack[index]}'));
} }
} else { } else {
information.add(ErrorSummary('(Unable to find the method that called $_className.$method(). The stack may be incomplete or bogus.)')); information.add(ErrorSummary('(Unable to find the method that called $_className.$method(). The stack may be incomplete or bogus.)'));

2
packages/flutter_tools/lib/src/android/android_studio.dart
View File

@ -68,7 +68,7 @@ class AndroidStudio implements Comparable<AndroidStudio> {
} }
final String presetPluginsPath = pathsSelectorValue == null final String presetPluginsPath = pathsSelectorValue == null
? null ? null
: globals.fs.path.join(homeDirPath, 'Library', 'Application Support', pathsSelectorValue); : globals.fs.path.join(homeDirPath, 'Library', 'Application Support', '$pathsSelectorValue');
return AndroidStudio(studioPath, version: version, presetPluginsPath: presetPluginsPath); return AndroidStudio(studioPath, version: version, presetPluginsPath: presetPluginsPath);
} }

2
packages/flutter_tools/lib/src/build_runner/web_fs.dart
View File

@ -455,7 +455,7 @@ class DebugAssetServer extends AssetServer {
flutterProject.dartTool.path, flutterProject.dartTool.path,
'build', 'build',
'flutter_web', 'flutter_web',
flutterProject.manifest.appName, '${flutterProject.manifest.appName}',
'lib', 'lib',
'${targetBaseName}_web_entrypoint.dart.js.tar.gz', '${targetBaseName}_web_entrypoint.dart.js.tar.gz',
)); ));

2
packages/flutter_tools/lib/src/cache.dart
View File

@ -580,7 +580,7 @@ abstract class CachedArtifact extends ArtifactSet {
/// Download an archive from the given [url] and unzip it to [location]. /// Download an archive from the given [url] and unzip it to [location].
Future<void> _downloadArchive(String message, Uri url, Directory location, bool verifier(File f), void extractor(File f, Directory d)) { Future<void> _downloadArchive(String message, Uri url, Directory location, bool verifier(File f), void extractor(File f, Directory d)) {
return _withDownloadFile(flattenNameSubdirs(url), (File tempFile) async { return _withDownloadFile('${flattenNameSubdirs(url)}', (File tempFile) async {
if (!verifier(tempFile)) { if (!verifier(tempFile)) {
final Status status = globals.logger.startProgress(message, timeout: timeoutConfiguration.slowOperation); final Status status = globals.logger.startProgress(message, timeout: timeoutConfiguration.slowOperation);
try { try {

2
packages/flutter_tools/lib/src/commands/update_packages.dart
View File

@ -382,7 +382,7 @@ class UpdatePackagesCommand extends FlutterCommand {
for (_DependencyLink path in paths) { for (_DependencyLink path in paths) {
final StringBuffer buf = StringBuffer(); final StringBuffer buf = StringBuffer();
while (path != null) { while (path != null) {
buf.write(path.to); buf.write('${path.to}');
path = path.from; path = path.from;
if (path != null) { if (path != null) {
buf.write(' <- '); buf.write(' <- ');

5
packages/flutter_tools/lib/src/compile.dart
View File

@ -605,9 +605,8 @@ class DefaultResidentCompiler implements ResidentCompiler {
_server.stdin.writeln('recompile $mainUri$inputKey'); _server.stdin.writeln('recompile $mainUri$inputKey');
globals.printTrace('<- recompile $mainUri$inputKey'); globals.printTrace('<- recompile $mainUri$inputKey');
for (final Uri fileUri in request.invalidatedFiles) { for (final Uri fileUri in request.invalidatedFiles) {
final String message = _mapFileUri(fileUri.toString(), packageUriMapper); _server.stdin.writeln(_mapFileUri(fileUri.toString(), packageUriMapper));
_server.stdin.writeln(message); globals.printTrace('${_mapFileUri(fileUri.toString(), packageUriMapper)}');
globals.printTrace(message);
} }
_server.stdin.writeln(inputKey); _server.stdin.writeln(inputKey);
globals.printTrace('<- $inputKey'); globals.printTrace('<- $inputKey');

2
packages/flutter_tools/lib/src/device.dart
View File

@ -468,7 +468,7 @@ abstract class Device {
table.add(<String>[ table.add(<String>[
device.name, device.name,
device.id, device.id,
getNameForTargetPlatform(targetPlatform), '${getNameForTargetPlatform(targetPlatform)}',
'${await device.sdkNameAndVersion}$supportIndicator', '${await device.sdkNameAndVersion}$supportIndicator',
]); ]);
} }

2
packages/flutter_tools/lib/src/ios/devices.dart
View File

@ -50,7 +50,7 @@ class IOSDeploy {
'--justlaunch', '--justlaunch',
if (launchArguments.isNotEmpty) ...<String>[ if (launchArguments.isNotEmpty) ...<String>[
'--args', '--args',
launchArguments.join(' '), '${launchArguments.join(" ")}',
], ],
]; ];

2
packages/flutter_tools/lib/src/ios/mac.dart
View File

@ -473,7 +473,7 @@ Future<XcodeBuildResult> buildXcodeProject({
initialBuildStatus = null; initialBuildStatus = null;
globals.printStatus( globals.printStatus(
'Xcode build done.'.padRight(kDefaultStatusPadding + 1) 'Xcode build done.'.padRight(kDefaultStatusPadding + 1)
+ getElapsedAsSeconds(sw.elapsed).padLeft(5), + '${getElapsedAsSeconds(sw.elapsed).padLeft(5)}',
); );
flutterUsage.sendTiming('build', 'xcode-ios', Duration(milliseconds: sw.elapsedMilliseconds)); flutterUsage.sendTiming('build', 'xcode-ios', Duration(milliseconds: sw.elapsedMilliseconds));

2
packages/flutter_tools/lib/src/macos/build_macos.dart
View File

@ -79,7 +79,7 @@ Future<void> buildMacOS({
'xcrun', 'xcrun',
'xcodebuild', 'xcodebuild',
'-workspace', flutterProject.macos.xcodeWorkspace.path, '-workspace', flutterProject.macos.xcodeWorkspace.path,
'-configuration', configuration, '-configuration', '$configuration',
'-scheme', 'Runner', '-scheme', 'Runner',
'-derivedDataPath', flutterBuildDir.absolute.path, '-derivedDataPath', flutterBuildDir.absolute.path,
'OBJROOT=${globals.fs.path.join(flutterBuildDir.absolute.path, 'Build', 'Intermediates.noindex')}', 'OBJROOT=${globals.fs.path.join(flutterBuildDir.absolute.path, 'Build', 'Intermediates.noindex')}',

6
packages/flutter_tools/lib/src/reporting/events.dart
View File

@ -139,9 +139,9 @@ class BuildEvent extends UsageEvent {
// category // category
'build', 'build',
// parameter // parameter
FlutterCommand.current == null FlutterCommand.current == null ?
? 'unspecified' 'unspecified' :
: FlutterCommand.current.name, '${FlutterCommand.current.name}',
label: label, label: label,
); );

2
packages/flutter_tools/lib/src/test/test_compiler.dart
View File

@ -186,6 +186,6 @@ class TestCompiler {
_suppressOutput = true; _suppressOutput = true;
return; return;
} }
globals.printError(message); globals.printError('$message');
} }
} }

2
packages/flutter_tools/test/general.shard/build_system/targets/macos_test.dart
View File

@ -115,7 +115,7 @@ void main() {
}); });
await const DebugUnpackMacOS().build(environment); await const DebugUnpackMacOS().build(environment);
expect(globals.fs.directory(_kOutputPrefix).existsSync(), true); expect(globals.fs.directory('$_kOutputPrefix').existsSync(), true);
for (final File file in inputs) { for (final File file in inputs) {
expect(globals.fs.file(file.path.replaceFirst(_kInputPrefix, _kOutputPrefix)).existsSync(), true); expect(globals.fs.file(file.path.replaceFirst(_kInputPrefix, _kOutputPrefix)).existsSync(), true);
} }

2
packages/flutter_tools/test/general.shard/runner/flutter_command_runner_test.dart
View File

@ -107,7 +107,7 @@ void main() {
await runner.run(<String>['dummy', '--local-engine=ios_debug']); await runner.run(<String>['dummy', '--local-engine=ios_debug']);
// Verify that this also works if the sky_engine path is a symlink to the engine root. // Verify that this also works if the sky_engine path is a symlink to the engine root.
fs.link('/symlink').createSync(_kArbitraryEngineRoot); fs.link('/symlink').createSync('$_kArbitraryEngineRoot');
fs.file(_kDotPackages).writeAsStringSync('sky_engine:file:///symlink/src/out/ios_debug/gen/dart-pkg/sky_engine/lib/'); fs.file(_kDotPackages).writeAsStringSync('sky_engine:file:///symlink/src/out/ios_debug/gen/dart-pkg/sky_engine/lib/');
await runner.run(<String>['dummy', '--local-engine=ios_debug']); await runner.run(<String>['dummy', '--local-engine=ios_debug']);
}, overrides: <Type, Generator>{ }, overrides: <Type, Generator>{