Version 2.11.0-247.0.dev

Merge commit 'a669f440a630feb951b6a641d21bf0879bb5dd23' into 'dev'

Author: Dart CI

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

@@ -45,7 +45,11 @@ class ReplaceWithVar extends CorrectionProducer {
         if (initializer is TypedLiteral) {
           if (initializer.typeArguments == null) {
             typeArgumentsText = utils.getNodeText(type.typeArguments);
-            typeArgumentsOffset = initializer.offset;
+            if (initializer is ListLiteral) {
+              typeArgumentsOffset = initializer.leftBracket.offset;
+            } else if (initializer is SetOrMapLiteral) {
+              typeArgumentsOffset = initializer.leftBracket.offset;
+            }
           }
         } else if (initializer is InstanceCreationExpression) {
           if (initializer.constructorName.type.typeArguments == null) {

pkg/analysis_server/lib/src/services/flutter/property.dart

@@ -24,7 +24,7 @@ String getFieldDocumentation(FieldElement field) {
 
 String getParameterDocumentation(ParameterElement parameter) {
   if (parameter is FieldFormalParameterElement) {
-    var rawComment = parameter.field.documentationComment;
+    var rawComment = parameter.field?.documentationComment;
     return getDartDocPlainText(rawComment);
   }
   return null;

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

@@ -123,6 +123,21 @@ List f() {
 ''');
   }
 
+  Future<void> test_generic_listLiteral_const() async {
+    await resolveTestUnit('''
+String f() {
+  const List<String> values = const ['a'];
+  return values[0];
+}
+''');
+    await assertHasFix('''
+String f() {
+  const values = const <String>['a'];
+  return values[0];
+}
+''');
+  }
+
   Future<void> test_generic_mapLiteral() async {
     await resolveTestUnit('''
 Map f() {
@@ -138,6 +153,21 @@ Map f() {
 ''');
   }
 
+  Future<void> test_generic_mapLiteral_const() async {
+    await resolveTestUnit('''
+Map f() {
+  const Map<String, int> m = const {};
+  return m;
+}
+''');
+    await assertHasFix('''
+Map f() {
+  const m = const <String, int>{};
+  return m;
+}
+''');
+  }
+
   Future<void> test_generic_setLiteral() async {
     await resolveTestUnit('''
 Set f() {
@@ -163,6 +193,21 @@ Set f() {
     await assertNoFix();
   }
 
+  Future<void> test_generic_setLiteral_const() async {
+    await resolveTestUnit('''
+String f() {
+  const Set<String> s = const {'a'};
+  return s.first;
+}
+''');
+    await assertHasFix('''
+String f() {
+  const s = const <String>{'a'};
+  return s.first;
+}
+''');
+  }
+
   Future<void> test_simple() async {
     await resolveTestUnit('''
 String f() {

pkg/analysis_server/test/src/services/flutter/widget_descriptions_test.dart

@@ -17,6 +17,37 @@ void main() {
 
 @reflectiveTest
 class GetDescriptionTest extends WidgetDescriptionBase {
+  Future<void> test_documentation_fieldFormalParameter() async {
+    await resolveTestUnit('''
+class MyWidget {
+  /// my doc
+  final int f;
+  MyWidget(this.f);
+}
+
+void f() {
+  MyWidget(0);
+}
+''');
+    var property = await getWidgetProperty('MyWidget(0', 'f');
+    expect(property.documentation, 'my doc');
+  }
+
+  Future<void> test_documentation_fieldFormalParameter_unresolvedField() async {
+    verifyNoTestUnitErrors = false;
+    await resolveTestUnit('''
+class MyWidget {
+  MyWidget(this.f);
+}
+
+void f() {
+  MyWidget(0);
+}
+''');
+    var property = await getWidgetProperty('MyWidget(0', 'f');
+    expect(property.documentation, isNull);
+  }
+
   Future<void> test_kind_named_notSet() async {
     await resolveTestUnit('''
 import 'package:flutter/material.dart';

pkg/analyzer/lib/src/dart/analysis/driver.dart

@@ -85,7 +85,7 @@ typedef WorkToWaitAfterComputingResult = Future<void> Function(String path);
 /// TODO(scheglov) Clean up the list of implicitly analyzed files.
 class AnalysisDriver implements AnalysisDriverGeneric {
   /// The version of data format, should be incremented on every format change.
-  static const int DATA_VERSION = 114;
+  static const int DATA_VERSION = 112;
 
   /// The length of the list returned by [_computeDeclaredVariablesSignature].
   static const int _declaredVariablesSignatureLength = 4;