Skip to content

Commit 9782654

Browse files
srawlinsCommit Queue
srawlins
authored and
Commit Queue
committed
analyzer_testing: export Size from painting/basic_types.dart
With these new exports, we have a lot of "unnecessary import" warnings in our tests. As we move to generating these stubs, they will stick closer to their real counterparts, and include exports like these. Change-Id: Id63eec30f3a33c8c9751cbf1f213f8d4bf3c41d2 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/475501 Reviewed-by: Konstantin Shcheglov <scheglov@google.com> Commit-Queue: Samuel Rawlins <srawlins@google.com>
1 parent 89fccc3 commit 9782654

7 files changed

Lines changed: 4 additions & 54 deletions

File tree

‎pkg/analysis_server/test/src/services/correction/assist/add_diagnostic_property_reference_test.dart‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ class AddDiagnosticPropertyReferenceTest extends AssistProcessorTest {
2828
/// Full coverage in fix/add_diagnostic_property_reference_test.dart
2929
Future<void> test_boolField_debugFillProperties() async {
3030
await resolveTestCode('''
31-
import 'package:flutter/foundation.dart';
3231
import 'package:flutter/widgets.dart';
3332
3433
class W extends Widget {
@@ -40,7 +39,6 @@ class W extends Widget {
4039
}
4140
''');
4241
await assertHasAssist('''
43-
import 'package:flutter/foundation.dart';
4442
import 'package:flutter/widgets.dart';
4543
4644
class W extends Widget {

‎pkg/analysis_server/test/src/services/correction/fix/add_diagnostic_property_reference_test.dart‎

Lines changed: 0 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ class AddDiagnosticPropertyReferenceBulkTest extends BulkFixProcessorTest {
3333
lints: [LintNames.diagnostic_describe_all_properties],
3434
);
3535
await resolveTestCode(r'''
36-
import 'package:flutter/foundation.dart';
3736
import 'package:flutter/widgets.dart';
3837
3938
class C extends Widget with Diagnosticable {
@@ -44,7 +43,6 @@ class C extends Widget with Diagnosticable {
4443
''');
4544

4645
await assertHasFix(r'''
47-
import 'package:flutter/foundation.dart';
4846
import 'package:flutter/widgets.dart';
4947
5048
class C extends Widget with Diagnosticable {
@@ -67,7 +65,6 @@ class C extends Widget with Diagnosticable {
6765
lints: [LintNames.diagnostic_describe_all_properties],
6866
);
6967
await resolveTestCode(r'''
70-
import 'package:flutter/foundation.dart';
7168
import 'package:flutter/widgets.dart';
7269
7370
class C extends Widget with Diagnosticable {
@@ -84,7 +81,6 @@ class C extends Widget with Diagnosticable {
8481
''');
8582

8683
await assertHasFix(r'''
87-
import 'package:flutter/foundation.dart';
8884
import 'package:flutter/widgets.dart';
8985
9086
class C extends Widget with Diagnosticable {
@@ -107,7 +103,6 @@ class C extends Widget with Diagnosticable {
107103
Future<void> test_singleFile() async {
108104
writeTestPackageConfig(flutter: true);
109105
await resolveTestCode('''
110-
import 'package:flutter/foundation.dart';
111106
import 'package:flutter/widgets.dart';
112107
113108
class C extends Widget with Diagnosticable {
@@ -129,7 +124,6 @@ class D extends Widget with Diagnosticable {
129124
}
130125
''');
131126
await assertHasFix('''
132-
import 'package:flutter/foundation.dart';
133127
import 'package:flutter/widgets.dart';
134128
135129
class C extends Widget with Diagnosticable {
@@ -174,7 +168,6 @@ class AddDiagnosticPropertyReferenceTest extends FixProcessorLintTest {
174168

175169
Future<void> test_boolField() async {
176170
await resolveTestCode('''
177-
import 'package:flutter/foundation.dart';
178171
import 'package:flutter/widgets.dart';
179172
180173
class C extends Widget with Diagnosticable {
@@ -189,7 +182,6 @@ class C extends Widget with Diagnosticable {
189182
}
190183
''');
191184
await assertHasFix('''
192-
import 'package:flutter/foundation.dart';
193185
import 'package:flutter/widgets.dart';
194186
195187
class C extends Widget with Diagnosticable {
@@ -208,7 +200,6 @@ class C extends Widget with Diagnosticable {
208200

209201
Future<void> test_boolField_empty() async {
210202
await resolveTestCode('''
211-
import 'package:flutter/foundation.dart';
212203
import 'package:flutter/widgets.dart';
213204
214205
class C extends Widget with Diagnosticable {
@@ -219,7 +210,6 @@ class C extends Widget with Diagnosticable {
219210
}
220211
''');
221212
await assertHasFix('''
222-
import 'package:flutter/foundation.dart';
223213
import 'package:flutter/widgets.dart';
224214
225215
class C extends Widget with Diagnosticable {
@@ -234,7 +224,6 @@ class C extends Widget with Diagnosticable {
234224

235225
Future<void> test_boolField_empty_customParamName() async {
236226
await resolveTestCode('''
237-
import 'package:flutter/foundation.dart';
238227
import 'package:flutter/widgets.dart';
239228
240229
class C extends Widget with Diagnosticable {
@@ -245,7 +234,6 @@ class C extends Widget with Diagnosticable {
245234
}
246235
''');
247236
await assertHasFix('''
248-
import 'package:flutter/foundation.dart';
249237
import 'package:flutter/widgets.dart';
250238
251239
class C extends Widget with Diagnosticable {
@@ -260,7 +248,6 @@ class C extends Widget with Diagnosticable {
260248

261249
Future<void> test_boolGetter() async {
262250
await resolveTestCode('''
263-
import 'package:flutter/foundation.dart';
264251
import 'package:flutter/widgets.dart';
265252
266253
class C extends Widget with Diagnosticable {
@@ -273,7 +260,6 @@ class C extends Widget with Diagnosticable {
273260
}
274261
''');
275262
await assertHasFix('''
276-
import 'package:flutter/foundation.dart';
277263
import 'package:flutter/widgets.dart';
278264
279265
class C extends Widget with Diagnosticable {
@@ -290,7 +276,6 @@ class C extends Widget with Diagnosticable {
290276

291277
Future<void> test_colorField() async {
292278
await resolveTestCode('''
293-
import 'package:flutter/foundation.dart';
294279
import 'package:flutter/material.dart';
295280
import 'package:flutter/widgets.dart';
296281
@@ -303,7 +288,6 @@ class C extends Widget with Diagnosticable {
303288
}
304289
''');
305290
await assertHasFix('''
306-
import 'package:flutter/foundation.dart';
307291
import 'package:flutter/material.dart';
308292
import 'package:flutter/widgets.dart';
309293
@@ -320,7 +304,6 @@ class C extends Widget with Diagnosticable {
320304

321305
Future<void> test_doubleField() async {
322306
await resolveTestCode('''
323-
import 'package:flutter/foundation.dart';
324307
import 'package:flutter/widgets.dart';
325308
326309
class C extends Widget with Diagnosticable {
@@ -332,7 +315,6 @@ class C extends Widget with Diagnosticable {
332315
}
333316
''');
334317
await assertHasFix('''
335-
import 'package:flutter/foundation.dart';
336318
import 'package:flutter/widgets.dart';
337319
338320
class C extends Widget with Diagnosticable {
@@ -348,7 +330,6 @@ class C extends Widget with Diagnosticable {
348330

349331
Future<void> test_dynamicField() async {
350332
await resolveTestCode('''
351-
import 'package:flutter/foundation.dart';
352333
import 'package:flutter/widgets.dart';
353334
354335
class C extends Widget with Diagnosticable {
@@ -360,7 +341,6 @@ class C extends Widget with Diagnosticable {
360341
}
361342
''');
362343
await assertHasFix('''
363-
import 'package:flutter/foundation.dart';
364344
import 'package:flutter/widgets.dart';
365345
366346
class C extends Widget with Diagnosticable {
@@ -376,7 +356,6 @@ class C extends Widget with Diagnosticable {
376356

377357
Future<void> test_enumField() async {
378358
await resolveTestCode('''
379-
import 'package:flutter/foundation.dart';
380359
import 'package:flutter/widgets.dart';
381360
382361
class C extends Widget with Diagnosticable {
@@ -389,7 +368,6 @@ class C extends Widget with Diagnosticable {
389368
enum Foo {bar}
390369
''');
391370
await assertHasFix('''
392-
import 'package:flutter/foundation.dart';
393371
import 'package:flutter/widgets.dart';
394372
395373
class C extends Widget with Diagnosticable {
@@ -406,7 +384,6 @@ enum Foo {bar}
406384

407385
Future<void> test_functionField() async {
408386
await resolveTestCode('''
409-
import 'package:flutter/foundation.dart';
410387
import 'package:flutter/material.dart';
411388
import 'package:flutter/widgets.dart';
412389
@@ -420,7 +397,6 @@ class C extends Widget with Diagnosticable {
420397
typedef ValueChanged<T> = void Function(T value);
421398
''');
422399
await assertHasFix('''
423-
import 'package:flutter/foundation.dart';
424400
import 'package:flutter/material.dart';
425401
import 'package:flutter/widgets.dart';
426402
@@ -438,7 +414,6 @@ typedef ValueChanged<T> = void Function(T value);
438414

439415
Future<void> test_intField() async {
440416
await resolveTestCode('''
441-
import 'package:flutter/foundation.dart';
442417
import 'package:flutter/widgets.dart';
443418
444419
class C extends Widget with Diagnosticable {
@@ -450,7 +425,6 @@ class C extends Widget with Diagnosticable {
450425
}
451426
''');
452427
await assertHasFix('''
453-
import 'package:flutter/foundation.dart';
454428
import 'package:flutter/widgets.dart';
455429
456430
class C extends Widget with Diagnosticable {
@@ -466,15 +440,13 @@ class C extends Widget with Diagnosticable {
466440

467441
Future<void> test_iterableField() async {
468442
await resolveTestCode('''
469-
import 'package:flutter/foundation.dart';
470443
import 'package:flutter/widgets.dart';
471444
472445
class C extends Widget with Diagnosticable {
473446
final Iterable<String> field = [];
474447
}
475448
''');
476449
await assertHasFix('''
477-
import 'package:flutter/foundation.dart';
478450
import 'package:flutter/widgets.dart';
479451
480452
class C extends Widget with Diagnosticable {
@@ -491,7 +463,6 @@ class C extends Widget with Diagnosticable {
491463

492464
Future<void> test_listField() async {
493465
await resolveTestCode('''
494-
import 'package:flutter/foundation.dart';
495466
import 'package:flutter/widgets.dart';
496467
497468
class C extends Widget with Diagnosticable {
@@ -503,7 +474,6 @@ class C extends Widget with Diagnosticable {
503474
}
504475
''');
505476
await assertHasFix('''
506-
import 'package:flutter/foundation.dart';
507477
import 'package:flutter/widgets.dart';
508478
509479
class C extends Widget with Diagnosticable {
@@ -520,7 +490,6 @@ class C extends Widget with Diagnosticable {
520490
Future<void> test_matrix4Field() async {
521491
writeTestPackageConfig(flutter: true);
522492
await resolveTestCode('''
523-
import 'package:flutter/foundation.dart';
524493
import 'package:flutter/widgets.dart';
525494
import 'package:vector_math/vector_math_64.dart';
526495
@@ -533,7 +502,6 @@ class C extends Widget with Diagnosticable {
533502
}
534503
''');
535504
await assertHasFix('''
536-
import 'package:flutter/foundation.dart';
537505
import 'package:flutter/widgets.dart';
538506
import 'package:vector_math/vector_math_64.dart';
539507
@@ -550,7 +518,6 @@ class C extends Widget with Diagnosticable {
550518

551519
Future<void> test_objectField() async {
552520
await resolveTestCode('''
553-
import 'package:flutter/foundation.dart';
554521
import 'package:flutter/widgets.dart';
555522
556523
class C extends Widget with Diagnosticable {
@@ -562,7 +529,6 @@ class C extends Widget with Diagnosticable {
562529
}
563530
''');
564531
await assertHasFix('''
565-
import 'package:flutter/foundation.dart';
566532
import 'package:flutter/widgets.dart';
567533
568534
class C extends Widget with Diagnosticable {
@@ -578,7 +544,6 @@ class C extends Widget with Diagnosticable {
578544

579545
Future<void> test_stringField() async {
580546
await resolveTestCode('''
581-
import 'package:flutter/foundation.dart';
582547
import 'package:flutter/widgets.dart';
583548
584549
class C extends Widget with Diagnosticable {
@@ -590,7 +555,6 @@ class C extends Widget with Diagnosticable {
590555
}
591556
''');
592557
await assertHasFix('''
593-
import 'package:flutter/foundation.dart';
594558
import 'package:flutter/widgets.dart';
595559
596560
class C extends Widget with Diagnosticable {
@@ -606,15 +570,13 @@ class C extends Widget with Diagnosticable {
606570

607571
Future<void> test_stringField_noDebugFillProperties() async {
608572
await resolveTestCode('''
609-
import 'package:flutter/foundation.dart';
610573
import 'package:flutter/widgets.dart';
611574
612575
class C extends Widget with Diagnosticable {
613576
final String field = '';
614577
}
615578
''');
616579
await assertHasFix('''
617-
import 'package:flutter/foundation.dart';
618580
import 'package:flutter/widgets.dart';
619581
620582
class C extends Widget with Diagnosticable {
@@ -631,7 +593,6 @@ class C extends Widget with Diagnosticable {
631593

632594
Future<void> test_typeOutOfScopeField() async {
633595
await resolveTestCode('''
634-
import 'package:flutter/foundation.dart';
635596
import 'package:flutter/widgets.dart';
636597
637598
class C extends Widget with Diagnosticable {
@@ -644,7 +605,6 @@ class C extends Widget with Diagnosticable {
644605
}
645606
''');
646607
await assertHasFix('''
647-
import 'package:flutter/foundation.dart';
648608
import 'package:flutter/widgets.dart';
649609
650610
class C extends Widget with Diagnosticable {
@@ -661,7 +621,6 @@ class C extends Widget with Diagnosticable {
661621

662622
Future<void> test_typeOutOfScopeGetter() async {
663623
await resolveTestCode('''
664-
import 'package:flutter/foundation.dart';
665624
import 'package:flutter/widgets.dart';
666625
667626
class C extends Widget with Diagnosticable {
@@ -674,7 +633,6 @@ class C extends Widget with Diagnosticable {
674633
}
675634
''');
676635
await assertHasFix('''
677-
import 'package:flutter/foundation.dart';
678636
import 'package:flutter/widgets.dart';
679637
680638
class C extends Widget with Diagnosticable {
@@ -691,7 +649,6 @@ class C extends Widget with Diagnosticable {
691649

692650
Future<void> test_varField() async {
693651
await resolveTestCode('''
694-
import 'package:flutter/foundation.dart';
695652
import 'package:flutter/widgets.dart';
696653
697654
// ignore: must_be_immutable
@@ -704,7 +661,6 @@ class C extends Widget with Diagnosticable {
704661
}
705662
''');
706663
await assertHasFix('''
707-
import 'package:flutter/foundation.dart';
708664
import 'package:flutter/widgets.dart';
709665
710666
// ignore: must_be_immutable

‎pkg/analyzer/test/src/diagnostics/invalid_widget_preview_private_argument_test.dart‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,6 @@ Widget privateNameStringInterp() => Text('Foo');
140140

141141
await assertErrorsInCode(
142142
'''
143-
import 'dart:ui';
144143
import 'package:flutter/widget_previews.dart';
145144
import 'package:flutter/widgets.dart';
146145
@@ -156,7 +155,7 @@ Widget privateDoubles() => Text('Foo');
156155
[
157156
error(
158157
diag.invalidWidgetPreviewPrivateArgument,
159-
200,
158+
182,
160159
18,
161160
correctionContains: correctionMessageBuilder(
162161
kPrivateSize,
@@ -165,7 +164,7 @@ Widget privateDoubles() => Text('Foo');
165164
),
166165
error(
167166
diag.invalidWidgetPreviewPrivateArgument,
168-
222,
167+
204,
169168
33,
170169
correctionContains: correctionMessageBuilder(
171170
kPrivateTextScaleFactor,

0 commit comments

Comments
 (0)