Skip to content

Commit b320ee8

Browse files
authored
Fix testing's pubspec, ensuring useResult is available in meta (dart-lang#2720)
1 parent c9621b9 commit b320ee8

File tree

8 files changed

+17
-10
lines changed

8 files changed

+17
-10
lines changed

lib/dartdoc.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ class Dartdoc {
128128
Dartdoc._(this.config, this._generator, this.packageBuilder) {
129129
_outputDir = config.resourceProvider
130130
.getFolder(config.resourceProvider.pathContext.absolute(config.output))
131-
..create();
131+
..create();
132132
}
133133

134134
// TODO(srawlins): Remove when https://github.com/dart-lang/linter/issues/2706

lib/src/generator/templates.runtime_renderers.dart

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14894,6 +14894,7 @@ const _invisibleGetters = {
1489414894
'hasProtected',
1489514895
'hasRequired',
1489614896
'hasSealed',
14897+
'hasUseResult',
1489714898
'hasVisibleForTemplate',
1489814899
'hasVisibleForTesting',
1489914900
'id',
@@ -14934,6 +14935,7 @@ const _invisibleGetters = {
1493414935
'isRequired',
1493514936
'isSealed',
1493614937
'isTarget',
14938+
'isUseResult',
1493714939
'isVisibleForTemplate',
1493814940
'isVisibleForTesting'
1493914941
},
@@ -14962,6 +14964,7 @@ const _invisibleGetters = {
1496214964
'hasProtected',
1496314965
'hasRequired',
1496414966
'hasSealed',
14967+
'hasUseResult',
1496514968
'hasVisibleForTemplate',
1496614969
'hasVisibleForTesting',
1496714970
'id',
@@ -15179,6 +15182,7 @@ const _invisibleGetters = {
1517915182
'hasProtected',
1518015183
'hasRequired',
1518115184
'hasSealed',
15185+
'hasUseResult',
1518215186
'hasVisibleForTemplate',
1518315187
'hasVisibleForTesting',
1518415188
'id',
@@ -15318,6 +15322,7 @@ const _invisibleGetters = {
1531815322
'hasProtected',
1531915323
'hasRequired',
1532015324
'hasSealed',
15325+
'hasUseResult',
1532115326
'hasVisibleForTemplate',
1532215327
'hasVisibleForTesting',
1532315328
'id',

lib/src/model/categorization.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ abstract class Categorization implements ModelElement {
107107
.map((n) => package.nameToCategory[n])
108108
.where((c) => c != null)
109109
.toList()
110-
..sort();
110+
..sort();
111111
return _categories;
112112
}
113113

lib/src/model/documentation_comment.dart

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -635,7 +635,9 @@ mixin DocumentationComment
635635
for (var match in exp.allMatches(string)) {
636636
var prefix = match.input.substring(currentIndex, match.start);
637637
currentIndex = match.end;
638-
replaced..write(prefix)..write(await replace(match));
638+
replaced
639+
..write(prefix)
640+
..write(await replace(match));
639641
}
640642
replaced.write(string.substring(currentIndex));
641643
return replaced.toString();

lib/src/warnings.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ Future<List<DartdocOption<Object>>> createPackageWarningOptions(
6262
.where(
6363
(d) => d.defaultWarningMode == PackageWarningMode.error)
6464
.toList()
65-
..sort())
65+
..sort())
6666
.map((d) => ' ${d.warningName}: ${d.shortHelp}')
6767
.join('\n')),
6868
DartdocOptionArgFile<List<String>>('ignore', null, resourceProvider,
@@ -72,7 +72,7 @@ Future<List<DartdocOption<Object>>> createPackageWarningOptions(
7272
.where((d) =>
7373
d.defaultWarningMode == PackageWarningMode.ignore)
7474
.toList()
75-
..sort())
75+
..sort())
7676
.map((d) => ' ${d.warningName}: ${d.shortHelp}')
7777
.join('\n')),
7878
DartdocOptionArgFile<List<String>>('warnings', null, resourceProvider,
@@ -83,7 +83,7 @@ Future<List<DartdocOption<Object>>> createPackageWarningOptions(
8383
.where((d) =>
8484
d.defaultWarningMode == PackageWarningMode.warn)
8585
.toList()
86-
..sort())
86+
..sort())
8787
.map((d) => ' ${d.warningName}: ${d.shortHelp}')
8888
.join('\n')),
8989
// Synthetic option uses a factory to build a PackageWarningOptions from all the above flags.

test/dartdoc_options_test.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,13 +177,13 @@ void main() {
177177
tempDir = resourceProvider.createSystemTemp('options_test');
178178
firstDir = resourceProvider
179179
.getFolder(resourceProvider.pathContext.join(tempDir.path, 'firstDir'))
180-
..create();
180+
..create();
181181
firstExisting = resourceProvider.getFile(
182182
resourceProvider.pathContext.join(firstDir.path, 'existing.dart'))
183183
..writeAsStringSync('');
184184
secondDir = resourceProvider
185185
.getFolder(resourceProvider.pathContext.join(tempDir.path, 'secondDir'))
186-
..create();
186+
..create();
187187
resourceProvider
188188
.getFile(
189189
resourceProvider.pathContext.join(secondDir.path, 'existing.dart'))

testing/test_package/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ homepage: http://github.com/dart-lang
33
description: Best package ever.
44
version: 0.0.1
55
dependencies:
6-
meta: ^1.0.0
6+
meta: ^1.4.0
77
args: ^1.5.0
88
test_package_imported:
99
path: "../test_package_imported"

tool/grind.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ void updateThirdParty() async {
220220
.map((e) => path.basename(e.path))
221221
.where(_mustache4dartPatches.hasMatch)
222222
.toList()
223-
..sort()) {
223+
..sort()) {
224224
run('patch',
225225
arguments: [
226226
'-p0',

0 commit comments

Comments
 (0)