Version 2.12.0-245.0.dev

Merge commit '88c1be7e3b718bf00ff4f01b62d7ab1521abc5c7' into 'dev'

Author: Dart CI

CHANGELOG.md

@@ -79,14 +79,17 @@ opted out of null safety by adding `// @dart=2.9` to the beginning of the file.
 
 #### Linter
 
-Updated the Linter to `0.1.127`, which includes:
+Updated the Linter to `0.1.128`, which includes:
 
-* fixed crash in `prefer_collection_literals` when there is no static parameter
+* New lint: `avoid_dynamic_calls`.
+* (Internal): `avoid_type_to_string` updated to use `addArgumentList` registry API.
+* Miscellaneous documentation improvements.
+* Fixed crash in `prefer_collection_literals` when there is no static parameter
   element.
-* fixed false negatives for `prefer_collection_literals` when a LinkedHashSet or
+* Fixed false negatives for `prefer_collection_literals` when a LinkedHashSet or
   LinkedHashMap instantiation is passed as the argument to a function in any
   position other than the first.
-* fixed false negatives for `prefer_collection_literals` when a LinkedHashSet or
+* Fixed false negatives for `prefer_collection_literals` when a LinkedHashSet or
   LinkedHashMap instantiation is used in a place with a static type other than
   Set or Map.
 * (Internal): test updates to the new `PhysicalResourceProvider` API.

DEPS

@@ -118,7 +118,7 @@ vars = {
   "intl_tag": "0.17.0-nullsafety",
   "jinja2_rev": "2222b31554f03e62600cd7e383376a7c187967a1",
   "json_rpc_2_rev": "b8dfe403fd8528fd14399dee3a6527b55802dd4d",
-  "linter_tag": "0.1.127",
+  "linter_tag": "0.1.128",
   "logging_rev": "e2f633b543ef89c54688554b15ca3d7e425b86a2",
   "markupsafe_rev": "8f45f5cfa0009d2a70589bcda0349b8cb2b72783",
   "markdown_rev": "6f89681d59541ddb1cf3a58efbdaa2304ffc3f51",

pkg/analysis_server/lib/protocol/protocol_constants.dart

@@ -166,6 +166,7 @@ const String DIAGNOSTIC_RESPONSE_GET_DIAGNOSTICS_CONTEXTS = 'contexts';
 const String DIAGNOSTIC_RESPONSE_GET_SERVER_PORT_PORT = 'port';
 const String EDIT_REQUEST_BULK_FIXES = 'edit.bulkFixes';
 const String EDIT_REQUEST_BULK_FIXES_INCLUDED = 'included';
+const String EDIT_REQUEST_BULK_FIXES_IN_TEST_MODE = 'inTestMode';
 const String EDIT_REQUEST_DARTFIX = 'edit.dartfix';
 const String EDIT_REQUEST_DARTFIX_EXCLUDED_FIXES = 'excludedFixes';
 const String EDIT_REQUEST_DARTFIX_INCLUDED = 'included';

pkg/analysis_server/lib/protocol/protocol_generated.dart

@@ -7301,12 +7301,15 @@ class DiagnosticGetServerPortResult implements ResponseResult {
 ///
 /// {
 ///   "included": List<FilePath>
+///   "inTestMode": optional bool
 /// }
 ///
 /// Clients may not extend, implement or mix-in this class.
 class EditBulkFixesParams implements RequestParams {
   List<String> _included;
 
+  bool _inTestMode;
+
   /// A list of the files and directories for which edits should be suggested.
   ///
   /// If a request is made with a path that is invalid, e.g. is not absolute
@@ -7330,8 +7333,27 @@ class EditBulkFixesParams implements RequestParams {
     _included = value;
   }
 
-  EditBulkFixesParams(List<String> included) {
+  /// A flag indicating whether the bulk fixes are being run in test mode. The
+  /// only difference is that in test mode the fix processor will look for a
+  /// configuration file that can modify the content of the data file used to
+  /// compute the fixes when data-driven fixes are being considered.
+  ///
+  /// If this field is omitted the flag defaults to false.
+  bool get inTestMode => _inTestMode;
+
+  /// A flag indicating whether the bulk fixes are being run in test mode. The
+  /// only difference is that in test mode the fix processor will look for a
+  /// configuration file that can modify the content of the data file used to
+  /// compute the fixes when data-driven fixes are being considered.
+  ///
+  /// If this field is omitted the flag defaults to false.
+  set inTestMode(bool value) {
+    _inTestMode = value;
+  }
+
+  EditBulkFixesParams(List<String> included, {bool inTestMode}) {
     this.included = included;
+    this.inTestMode = inTestMode;
   }
 
   factory EditBulkFixesParams.fromJson(
@@ -7345,7 +7367,12 @@ class EditBulkFixesParams implements RequestParams {
       } else {
         throw jsonDecoder.mismatch(jsonPath, 'included');
       }
-      return EditBulkFixesParams(included);
+      bool inTestMode;
+      if (json.containsKey('inTestMode')) {
+        inTestMode = jsonDecoder.decodeBool(
+            jsonPath + '.inTestMode', json['inTestMode']);
+      }
+      return EditBulkFixesParams(included, inTestMode: inTestMode);
     } else {
       throw jsonDecoder.mismatch(jsonPath, 'edit.bulkFixes params', json);
     }
@@ -7360,6 +7387,9 @@ class EditBulkFixesParams implements RequestParams {
   Map<String, dynamic> toJson() {
     var result = <String, dynamic>{};
     result['included'] = included;
+    if (inTestMode != null) {
+      result['inTestMode'] = inTestMode;
+    }
     return result;
   }
 
@@ -7375,7 +7405,8 @@ class EditBulkFixesParams implements RequestParams {
   bool operator ==(other) {
     if (other is EditBulkFixesParams) {
       return listEqual(
-          included, other.included, (String a, String b) => a == b);
+              included, other.included, (String a, String b) => a == b) &&
+          inTestMode == other.inTestMode;
     }
     return false;
   }
@@ -7384,6 +7415,7 @@ class EditBulkFixesParams implements RequestParams {
   int get hashCode {
     var hash = 0;
     hash = JenkinsSmiHash.combine(hash, included.hashCode);
+    hash = JenkinsSmiHash.combine(hash, inTestMode.hashCode);
     return JenkinsSmiHash.finish(hash);
   }
 }

pkg/analysis_server/lib/src/services/correction/dart/add_late.dart

@@ -8,6 +8,7 @@ import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/ast/token.dart';
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/src/dart/ast/extensions.dart';
+import 'package:analyzer/src/generated/source.dart';
 import 'package:analyzer_plugin/utilities/change_builder/change_builder_core.dart';
 import 'package:analyzer_plugin/utilities/fixes/fixes.dart';
 
@@ -70,16 +71,18 @@ class AddLate extends CorrectionProducer {
             var keywordToken = declarationList.keyword;
             if (declarationList.variables.length == 1 &&
                 keywordToken.keyword == Keyword.FINAL) {
-              await _insertAt(builder, keywordToken.offset);
+              await _insertAt(builder, keywordToken.offset,
+                  source: declarationResult.element.source);
             }
           }
         }
       }
     }
   }
 
-  Future<void> _insertAt(ChangeBuilder builder, int offset) async {
-    await builder.addDartFileEdit(file, (builder) {
+  Future<void> _insertAt(ChangeBuilder builder, int offset,
+      {Source source}) async {
+    await builder.addDartFileEdit(source?.fullName ?? file, (builder) {
       builder.addSimpleInsertion(offset, 'late ');
     });
   }

pkg/analysis_server/test/completion_test.dart

@@ -1466,6 +1466,9 @@ f() { var vvv = 42; return !1 }''', <String>['1+vvv']);
 class num{}class Sunflower {static final n!2um MAX_D = 300;nu!3m xc, yc;Sun!4flower() {x!Xc = y!Yc = MA!1 }}''',
         <String>['1+MAX_D', 'X+xc', 'Y+yc', '2+num', '3+num', '4+Sunflower']);
 
+    buildTests('testCompletion_staticField_withoutVarOrFinal', '''
+class num{}class Sunflower {static n!1}''', <String>['1+num']);
+
     buildTests('testCompletion_super_superType', '''
 class A {
   var fa;

pkg/analysis_server/test/integration/support/integration_test_methods.dart

@@ -1582,6 +1582,15 @@ abstract class IntegrationTestMixin {
   ///   analysis.setAnalysisRoots), an error of type FILE_NOT_ANALYZED will be
   ///   generated.
   ///
+  /// inTestMode: bool (optional)
+  ///
+  ///   A flag indicating whether the bulk fixes are being run in test mode.
+  ///   The only difference is that in test mode the fix processor will look
+  ///   for a configuration file that can modify the content of the data file
+  ///   used to compute the fixes when data-driven fixes are being considered.
+  ///
+  ///   If this field is omitted the flag defaults to false.
+  ///
   /// Returns
   ///
   /// edits: List<SourceFileEdit>
@@ -1592,8 +1601,9 @@ abstract class IntegrationTestMixin {
   ///
   ///   Details that summarize the fixes associated with the recommended
   ///   changes.
-  Future<EditBulkFixesResult> sendEditBulkFixes(List<String> included) async {
-    var params = EditBulkFixesParams(included).toJson();
+  Future<EditBulkFixesResult> sendEditBulkFixes(List<String> included,
+      {bool inTestMode}) async {
+    var params = EditBulkFixesParams(included, inTestMode: inTestMode).toJson();
     var result = await server.send('edit.bulkFixes', params);
     var decoder = ResponseDecoder(null);
     return EditBulkFixesResult.fromJson(decoder, 'result', result);

pkg/analysis_server/test/integration/support/protocol_matchers.dart

@@ -2241,9 +2241,11 @@ final Matcher isDiagnosticGetServerPortResult = LazyMatcher(() =>
 ///
 /// {
 ///   "included": List<FilePath>
+///   "inTestMode": optional bool
 /// }
 final Matcher isEditBulkFixesParams = LazyMatcher(() => MatchesJsonObject(
-    'edit.bulkFixes params', {'included': isListOf(isFilePath)}));
+    'edit.bulkFixes params', {'included': isListOf(isFilePath)},
+    optionalFields: {'inTestMode': isBool}));
 
 /// edit.bulkFixes result
 ///

pkg/analysis_server/test/src/services/correction/fix/add_late_test.dart

@@ -37,7 +37,6 @@ class AddLateTest extends FixProcessorTest with WithNullSafetyMixin {
   @override
   FixKind get kind => DartFixKind.ADD_LATE;
 
-  @FailingTest(issue: 'https://github.com/dart-lang/sdk/issues/44534')
   Future<void> test_changeInImportedLib() async {
     addSource('/home/test/lib/a.dart', '''
 class C {
@@ -58,7 +57,7 @@ class C {
 ''', target: '/home/test/lib/a.dart');
   }
 
-  @FailingTest(issue: 'https://github.com/dart-lang/sdk/issues/44534')
+  @FailingTest(reason: 'The lint does not fire for parts.')
   Future<void> test_changeInPart() async {
     addSource('/home/test/lib/a.dart', '''
 part 'test.dart';

pkg/analysis_server/tool/spec/generated/java/AnalysisServer.java

@@ -481,8 +481,12 @@ public interface AnalysisServer {
    *         file which does not exist, or which is not currently subject to analysis (e.g. because
    *         it is not associated with any analysis root specified to analysis.setAnalysisRoots), an
    *         error of type FILE_NOT_ANALYZED will be generated.
+   * @param inTestMode A flag indicating whether the bulk fixes are being run in test mode. The only
+   *         difference is that in test mode the fix processor will look for a configuration file
+   *         that can modify the content of the data file used to compute the fixes when data-driven
+   *         fixes are being considered. If this field is omitted the flag defaults to false.
    */
-  public void edit_bulkFixes(List<String> included, BulkFixesConsumer consumer);
+  public void edit_bulkFixes(List<String> included, boolean inTestMode, BulkFixesConsumer consumer);
 
   /**
    * {@code edit.dartfix}