Skip to content

Commit 5cd4c0c

Browse files
srawlinsCommit Queue
srawlins
authored and
Commit Queue
committed
analyzer_utilities: Format with tall mode
Change-Id: I2c69742379f7feeb2f37b257e428f058a672f950 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/423322 Reviewed-by: Brian Wilkerson <[email protected]> Commit-Queue: Samuel Rawlins <[email protected]>
1 parent 52f965e commit 5cd4c0c

34 files changed

+412
-434
lines changed

‎pkg/analyzer_utilities/lib/html_dom.dart‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,7 @@ import 'dart:convert';
1010
const _htmlEscape = HtmlEscape(HtmlEscapeMode.element);
1111

1212
class Document extends Element {
13-
static const Set<String> selfClosing = {
14-
'br',
15-
'link',
16-
'meta',
17-
};
13+
static const Set<String> selfClosing = {'br', 'link', 'meta'};
1814

1915
Document() : super.tag('');
2016

‎pkg/analyzer_utilities/lib/html_generator.dart‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,10 @@ bool isWhitespaceNode(dom.Node node) {
4949

5050
/// Create an HTML element with the given name, attributes, and child nodes.
5151
dom.Element makeElement(
52-
String name, Map<String, String> attributes, List<dom.Node> children) {
52+
String name,
53+
Map<String, String> attributes,
54+
List<dom.Node> children,
55+
) {
5356
var result = dom.Element.tag(name);
5457
result.attributes.addAll(attributes);
5558
for (var child in children) {
@@ -92,8 +95,11 @@ mixin HtmlGenerator {
9295

9396
/// Execute [callback], wrapping its output in an element with the given
9497
/// [name] and [attributes].
95-
void element(String name, Map<String, String> attributes,
96-
[void Function()? callback]) {
98+
void element(
99+
String name,
100+
Map<String, String> attributes, [
101+
void Function()? callback,
102+
]) {
97103
add(makeElement(name, attributes, collectHtml(callback)));
98104
}
99105

‎pkg/analyzer_utilities/lib/test/mock_packages/mock_packages.dart‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,14 @@ void _cacheFiles(Map<String, String> cachedFiles) {
2626
if (resource is Folder) {
2727
resource.getChildren().forEach(addFiles);
2828
} else if (resource is File) {
29-
var relativePath = pathContext.relative(
30-
resource.path,
31-
from: mockPath,
32-
);
29+
var relativePath = pathContext.relative(resource.path, from: mockPath);
3330
var relativePathComponents = pathContext.split(relativePath);
3431
var relativePosixPath = relativePathComponents.join('/');
3532
cachedFiles[relativePosixPath] = resource.readAsStringSync();
3633
}
3734
}
3835

39-
addFiles(
40-
resourceProvider.getFolder(mockPath),
41-
);
36+
addFiles(resourceProvider.getFolder(mockPath));
4237
}
4338

4439
/// Helper for copying files from "tests/mock_packages" to memory file system
@@ -168,14 +163,16 @@ mixin MockPackagesMixin {
168163
var relativePathComponents = relativePosixPath.split('/');
169164
if (relativePathComponents[0] == packageName) {
170165
var relativePath = pathContext.joinAll(relativePathComponents);
171-
var path =
172-
resourceProvider.convertPath('$packagesRootPath/$relativePath');
166+
var path = resourceProvider.convertPath(
167+
'$packagesRootPath/$relativePath',
168+
);
173169
resourceProvider.getFile(path).writeAsStringSync(entry.value);
174170
}
175171
}
176172

177-
var packagesFolder = resourceProvider
178-
.getFolder(resourceProvider.convertPath(packagesRootPath));
173+
var packagesFolder = resourceProvider.getFolder(
174+
resourceProvider.convertPath(packagesRootPath),
175+
);
179176
return packagesFolder.getChildAssumingFolder(packageName);
180177
}
181178
}

‎pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/cupertino/colors.dart‎

Lines changed: 35 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ class CupertinoColors {
1414

1515
static const CupertinoDynamicColor systemBlue =
1616
CupertinoDynamicColor.withBrightnessAndContrast(
17-
color: Color.fromARGB(255, 0, 0, 0xFF),
18-
darkColor: Color.fromARGB(255, 0, 0, 0x99),
19-
highContrastColor: Color.fromARGB(255, 0, 0, 0x66),
20-
darkHighContrastColor: Color.fromARGB(255, 0, 0, 0x33),
21-
);
17+
color: Color.fromARGB(255, 0, 0, 0xFF),
18+
darkColor: Color.fromARGB(255, 0, 0, 0x99),
19+
highContrastColor: Color.fromARGB(255, 0, 0, 0x66),
20+
darkHighContrastColor: Color.fromARGB(255, 0, 0, 0x33),
21+
);
2222
}
2323

2424
class CupertinoDynamicColor extends Color {
@@ -32,46 +32,44 @@ class CupertinoDynamicColor extends Color {
3232
Color highContrastElevatedColor,
3333
Color darkHighContrastElevatedColor,
3434
}) : this._(
35-
color,
36-
color,
37-
darkColor,
38-
highContrastColor,
39-
darkHighContrastColor,
40-
elevatedColor,
41-
darkElevatedColor,
42-
highContrastElevatedColor,
43-
darkHighContrastElevatedColor,
44-
);
35+
color,
36+
color,
37+
darkColor,
38+
highContrastColor,
39+
darkHighContrastColor,
40+
elevatedColor,
41+
darkElevatedColor,
42+
highContrastElevatedColor,
43+
darkHighContrastElevatedColor,
44+
);
4545

4646
const CupertinoDynamicColor.withBrightnessAndContrast({
4747
Color color,
4848
Color darkColor,
4949
Color highContrastColor,
5050
Color darkHighContrastColor,
5151
}) : this(
52-
color: color,
53-
darkColor: darkColor,
54-
highContrastColor: highContrastColor,
55-
darkHighContrastColor: darkHighContrastColor,
56-
elevatedColor: color,
57-
darkElevatedColor: darkColor,
58-
highContrastElevatedColor: highContrastColor,
59-
darkHighContrastElevatedColor: darkHighContrastColor,
60-
);
52+
color: color,
53+
darkColor: darkColor,
54+
highContrastColor: highContrastColor,
55+
darkHighContrastColor: darkHighContrastColor,
56+
elevatedColor: color,
57+
darkElevatedColor: darkColor,
58+
highContrastElevatedColor: highContrastColor,
59+
darkHighContrastElevatedColor: darkHighContrastColor,
60+
);
6161

62-
const CupertinoDynamicColor.withBrightness({
63-
Color color,
64-
Color darkColor,
65-
}) : this(
66-
color: color,
67-
darkColor: darkColor,
68-
highContrastColor: color,
69-
darkHighContrastColor: darkColor,
70-
elevatedColor: color,
71-
darkElevatedColor: darkColor,
72-
highContrastElevatedColor: color,
73-
darkHighContrastElevatedColor: darkColor,
74-
);
62+
const CupertinoDynamicColor.withBrightness({Color color, Color darkColor})
63+
: this(
64+
color: color,
65+
darkColor: darkColor,
66+
highContrastColor: color,
67+
darkHighContrastColor: darkColor,
68+
elevatedColor: color,
69+
darkElevatedColor: darkColor,
70+
highContrastElevatedColor: color,
71+
darkHighContrastElevatedColor: darkColor,
72+
);
7573

7674
const CupertinoDynamicColor._(
7775
this._effectiveColor,

‎pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/foundation/assertions.dart‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@
33
// found in the LICENSE file.
44

55
class FlutterErrorDetails /* with Diagnosticable */ {
6-
const FlutterErrorDetails({
7-
required Object exception,
8-
});
6+
const FlutterErrorDetails({required Object exception});
97
}
108

119
class FlutterError /* extends Error with DiagnosticableTreeMixin implements AssertionError */ {

‎pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/material/app_bar.dart‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,5 @@
55
import 'package:flutter/widgets.dart';
66

77
class AppBar extends StatefulWidget {
8-
AppBar({
9-
Key? key,
10-
title,
11-
backgroundColor,
12-
});
8+
AppBar({Key? key, title, backgroundColor});
139
}

‎pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/material/colors.dart‎

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import 'package:flutter/painting.dart';
66

77
class MaterialColor extends ColorSwatch<int> {
88
const MaterialColor(int primary, Map<int, Color> swatch)
9-
: super(primary, swatch);
9+
: super(primary, swatch);
1010

1111
Color get shade100 => this[100];
1212

@@ -31,7 +31,7 @@ class MaterialColor extends ColorSwatch<int> {
3131

3232
class MaterialAccentColor extends ColorSwatch<int> {
3333
const MaterialAccentColor(int primary, Map<int, Color> swatch)
34-
: super(primary, swatch);
34+
: super(primary, swatch);
3535

3636
Color get shade50 => this[50];
3737

@@ -50,23 +50,20 @@ class Colors {
5050
static const Color black = Color(0xFF000000);
5151
static const Color white = Color(0xFFFFFFFF);
5252

53-
static const MaterialColor red = MaterialColor(
54-
_redPrimaryValue,
55-
<int, Color>{
56-
// For simpler testing, these values are not the real Flutter values
57-
// but just varying alphas on a primary value.
58-
50: Color(0x05FF0000),
59-
100: Color(0x10FF0000),
60-
200: Color(0x20FF0000),
61-
300: Color(0x30FF0000),
62-
400: Color(0x40FF0000),
63-
500: Color(0x50FF0000),
64-
600: Color(0x60FF0000),
65-
700: Color(0x70FF0000),
66-
800: Color(0x80FF0000),
67-
900: Color(0x90FF0000),
68-
},
69-
);
53+
static const MaterialColor red = MaterialColor(_redPrimaryValue, <int, Color>{
54+
// For simpler testing, these values are not the real Flutter values
55+
// but just varying alphas on a primary value.
56+
50: Color(0x05FF0000),
57+
100: Color(0x10FF0000),
58+
200: Color(0x20FF0000),
59+
300: Color(0x30FF0000),
60+
400: Color(0x40FF0000),
61+
500: Color(0x50FF0000),
62+
600: Color(0x60FF0000),
63+
700: Color(0x70FF0000),
64+
800: Color(0x80FF0000),
65+
900: Color(0x90FF0000),
66+
});
7067
static const int _redPrimaryValue = 0xFFFF0000;
7168

7269
static const MaterialAccentColor redAccent = MaterialAccentColor(

‎pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/material/icons.dart‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,15 @@
55
import 'package:flutter/widgets.dart';
66

77
class Icons {
8-
static const IconData alarm =
9-
const IconData(0xe855, fontFamily: 'MaterialIcons');
8+
static const IconData alarm = const IconData(
9+
0xe855,
10+
fontFamily: 'MaterialIcons',
11+
);
1012

11-
static const IconData book =
12-
const IconData(0xe865, fontFamily: 'MaterialIcons');
13+
static const IconData book = const IconData(
14+
0xe865,
15+
fontFamily: 'MaterialIcons',
16+
);
1317

1418
Icons._();
1519
}

‎pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/material/ink_well.dart‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,5 @@ class InkResponse extends StatelessWidget {
2525
}
2626

2727
class InkWell extends InkResponse {
28-
const InkWell({
29-
super.key,
30-
super.child,
31-
super.onHover,
32-
});
28+
const InkWell({super.key, super.child, super.onHover});
3329
}

‎pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/material/scaffold.dart‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,5 @@
55
import 'package:flutter/widgets.dart';
66

77
class Scaffold extends StatefulWidget {
8-
const Scaffold({
9-
Key? key,
10-
Widget body,
11-
});
8+
const Scaffold({Key? key, Widget body});
129
}

0 commit comments

Comments
 (0)