Version 2.10.0-114.0.dev

Merge commit '8e61018d4799e706b0d2ef9808185aae8d365c69' into 'dev'

Author: Dart CI

DEPS

@@ -44,7 +44,7 @@ vars = {
   # co19 is a cipd package. Use update.sh in tests/co19[_2] to update these
   # hashes. It requires access to the dart-build-access group, which EngProd
   # has.
-  "co19_rev": "d21ed3a1dd64107916db68afdce21709df65e85f",
+  "co19_rev": "b82516f08b02a10f5a65b7157e8cfdf00f10bdf4",
   "co19_2_rev": "e48b3090826cf40b8037648f19d211e8eab1b4b6",
 
   # The internal benchmarks to use. See go/dart-benchmarks-internal

pkg/analysis_server/lib/src/services/correction/fix/data_driven/modify_parameters.dart

@@ -26,10 +26,6 @@ class AddParameter extends ParameterModification {
   /// A flag indicating whether the parameter is a positional parameter.
   final bool isPositional;
 
-  /// The default value of the parameter, or `null` if the parameter doesn't
-  /// have a default value.
-  final ValueExtractor defaultValue;
-
   /// The value of the new argument in invocations of the function, or `null` if
   /// the parameter is optional and no argument needs to be added. The only time
   /// an argument needs to be added for an optional parameter is if the
@@ -41,7 +37,7 @@ class AddParameter extends ParameterModification {
   /// addition of a parameter. If provided, the [argumentValue] will be used as
   /// the value of the new argument in invocations of the function.
   AddParameter(this.index, this.name, this.isRequired, this.isPositional,
-      this.defaultValue, this.argumentValue)
+      this.argumentValue)
       : assert(index >= 0),
         assert(name != null);
 }

pkg/analysis_server/lib/src/services/correction/fix/data_driven/transform_set_parser.dart

@@ -23,7 +23,6 @@ class TransformSetParser {
   static const String _classKey = 'class';
   static const String _constantKey = 'constant';
   static const String _constructorKey = 'constructor';
-  static const String _defaultValueKey = 'defaultValue';
   static const String _elementKey = 'element';
   static const String _enumKey = 'enum';
   static const String _extensionKey = 'extension';
@@ -66,6 +65,18 @@ class TransformSetParser {
   static const String _removeParameterKind = 'removeParameter';
   static const String _renameKind = 'rename';
 
+  /// The valid values for the [_styleKey] in an [_addParameterKind] change.
+  static const List<String> validStyles = [
+    'optional_named',
+    'optional_positional',
+    'required_named',
+    'required_positional'
+  ];
+
+  /// The highest file version supported by this parser. The version needs to be
+  /// incremented any time the parser is updated to disallow input that would
+  /// have been valid in the most recently published version of server. This
+  /// includes removing support for keys and adding a new required key.
   static const int currentVersion = 1;
 
   /// The error reporter to which diagnostics will be reported.
@@ -173,7 +184,8 @@ class TransformSetParser {
   /// Translate the [node] into a add-parameter modification.
   void _translateAddParameterChange(YamlMap node) {
     _singleKey(node, [_indexKey, _nameKey]);
-    _reportUnsupportedKeys(node, const {_indexKey, _kindKey, _nameKey});
+    _reportUnsupportedKeys(node,
+        const {_argumentValueKey, _indexKey, _kindKey, _nameKey, _styleKey});
     var index = _translateInteger(node.valueAt(_indexKey), _indexKey);
     if (index == null) {
       return;
@@ -185,19 +197,12 @@ class TransformSetParser {
     var style = _translateString(node.valueAt(_styleKey), _styleKey);
     if (style == null) {
       return;
+    } else if (!validStyles.contains(style)) {
+      // TODO(brianwilkerson) Report the invalid style.
+      return;
     }
     var isRequired = style.startsWith('required_');
     var isPositional = style.endsWith('_positional');
-    // TODO(brianwilkerson) I originally thought we'd need a default value, but
-    //  it seems like we ought to be able to get it from the overridden method,
-    //  so investigate removing this field.
-    var defaultValue = _translateValueExtractor(
-        node.valueAt(_defaultValueKey), _defaultValueKey);
-    if (isRequired && defaultValue != null) {
-      // TODO(brianwilkerson) Report that required parameters can't have a
-      //  default value.
-      return;
-    }
     var argumentValue = _translateValueExtractor(
         node.valueAt(_argumentValueKey), _argumentValueKey);
     // TODO(brianwilkerson) We really ought to require an argument value for
@@ -212,8 +217,8 @@ class TransformSetParser {
       return;
     }
     _parameterModifications ??= [];
-    _parameterModifications.add(AddParameter(
-        index, name, isRequired, isPositional, defaultValue, argumentValue));
+    _parameterModifications.add(
+        AddParameter(index, name, isRequired, isPositional, argumentValue));
   }
 
   /// Translate the [node] into an add-type-parameter change. Return the

pkg/analysis_server/test/src/services/correction/fix/data_driven/modify_parameters_test.dart

@@ -30,7 +30,7 @@ class C {
 }
 ''');
     setPackageData(_modify(
-        ['C', 'm'], [AddParameter(0, 'a', false, false, null, null)],
+        ['C', 'm'], [AddParameter(0, 'a', false, false, null)],
         newName: 'm2'));
     await resolveTestUnit('''
 import '$importUri';
@@ -56,12 +56,9 @@ class C {
   void m2([int a, int b]) {}
 }
 ''');
-    setPackageData(_modify([
-      'C',
-      'm'
-    ], [
-      AddParameter(0, 'a', false, true, null, LiteralExtractor('0'))
-    ], newName: 'm2'));
+    setPackageData(_modify(
+        ['C', 'm'], [AddParameter(0, 'a', false, true, LiteralExtractor('0'))],
+        newName: 'm2'));
     await resolveTestUnit('''
 import '$importUri';
 
@@ -86,12 +83,9 @@ class C {
   void m2({int a, int b}) {}
 }
 ''');
-    setPackageData(_modify([
-      'C',
-      'm'
-    ], [
-      AddParameter(0, 'a', true, false, null, LiteralExtractor('0'))
-    ], newName: 'm2'));
+    setPackageData(_modify(
+        ['C', 'm'], [AddParameter(0, 'a', true, false, LiteralExtractor('0'))],
+        newName: 'm2'));
     await resolveTestUnit('''
 import '$importUri';
 
@@ -116,12 +110,9 @@ class C {
   void m2(int a, int b) {}
 }
 ''');
-    setPackageData(_modify([
-      'C',
-      'm'
-    ], [
-      AddParameter(0, 'a', true, true, null, LiteralExtractor('0'))
-    ], newName: 'm2'));
+    setPackageData(_modify(
+        ['C', 'm'], [AddParameter(0, 'a', true, true, LiteralExtractor('0'))],
+        newName: 'm2'));
     await resolveTestUnit('''
 import '$importUri';
 
@@ -147,7 +138,7 @@ class C {
 }
 ''');
     setPackageData(_modify(
-        ['C', 'm'], [AddParameter(1, 'b', false, false, null, null)],
+        ['C', 'm'], [AddParameter(1, 'b', false, false, null)],
         newName: 'm2'));
     await resolveTestUnit('''
 import '$importUri';
@@ -173,12 +164,9 @@ class C {
   void m2(int a, [int b]) {}
 }
 ''');
-    setPackageData(_modify([
-      'C',
-      'm'
-    ], [
-      AddParameter(1, 'b', false, true, null, LiteralExtractor('1'))
-    ], newName: 'm2'));
+    setPackageData(_modify(
+        ['C', 'm'], [AddParameter(1, 'b', false, true, LiteralExtractor('1'))],
+        newName: 'm2'));
     await resolveTestUnit('''
 import '$importUri';
 
@@ -203,12 +191,9 @@ class C {
   void m2(int a, {int b}) {}
 }
 ''');
-    setPackageData(_modify([
-      'C',
-      'm'
-    ], [
-      AddParameter(1, 'b', true, false, null, LiteralExtractor('1'))
-    ], newName: 'm2'));
+    setPackageData(_modify(
+        ['C', 'm'], [AddParameter(1, 'b', true, false, LiteralExtractor('1'))],
+        newName: 'm2'));
     await resolveTestUnit('''
 import '$importUri';
 
@@ -233,12 +218,9 @@ class C {
   void m2(int a, int b) {}
 }
 ''');
-    setPackageData(_modify([
-      'C',
-      'm'
-    ], [
-      AddParameter(1, 'b', true, true, null, LiteralExtractor('1'))
-    ], newName: 'm2'));
+    setPackageData(_modify(
+        ['C', 'm'], [AddParameter(1, 'b', true, true, LiteralExtractor('1'))],
+        newName: 'm2'));
     await resolveTestUnit('''
 import '$importUri';
 
@@ -267,9 +249,9 @@ class C {
       'C',
       'm'
     ], [
-      AddParameter(1, 'b', true, true, null, LiteralExtractor('1')),
-      AddParameter(2, 'c', true, true, null, LiteralExtractor('2')),
-      AddParameter(4, 'e', true, true, null, LiteralExtractor('4')),
+      AddParameter(1, 'b', true, true, LiteralExtractor('1')),
+      AddParameter(2, 'c', true, true, LiteralExtractor('2')),
+      AddParameter(4, 'e', true, true, LiteralExtractor('4')),
     ], newName: 'm2'));
     await resolveTestUnit('''
 import '$importUri';
@@ -293,12 +275,9 @@ class C {
   void m2(int a, int b) {}
 }
 ''');
-    setPackageData(_modify([
-      'C',
-      'm'
-    ], [
-      AddParameter(0, 'a', true, true, null, LiteralExtractor('0'))
-    ], newName: 'm2'));
+    setPackageData(_modify(
+        ['C', 'm'], [AddParameter(0, 'a', true, true, LiteralExtractor('0'))],
+        newName: 'm2'));
     await resolveTestUnit('''
 import '$importUri';
 
@@ -321,8 +300,8 @@ class C {
   void m(int a, int b) {}
 }
 ''');
-    setPackageData(_modify(['C', 'm'],
-        [AddParameter(0, 'a', true, true, null, LiteralExtractor('0'))]));
+    setPackageData(_modify(
+        ['C', 'm'], [AddParameter(0, 'a', true, true, LiteralExtractor('0'))]));
     await resolveTestUnit('''
 import '$importUri';
 
@@ -352,7 +331,7 @@ class C {
       'm'
     ], [
       RemoveParameter(PositionalParameterReference(0)),
-      AddParameter(2, 'c', true, true, null, LiteralExtractor('2'))
+      AddParameter(2, 'c', true, true, LiteralExtractor('2'))
     ], newName: 'm2'));
     await resolveTestUnit('''
 import '$importUri';
@@ -383,7 +362,7 @@ class C {
       'm'
     ], [
       RemoveParameter(PositionalParameterReference(1)),
-      AddParameter(0, 'a', true, true, null, LiteralExtractor('0'))
+      AddParameter(0, 'a', true, true, LiteralExtractor('0'))
     ], newName: 'm2'));
     await resolveTestUnit('''
 import '$importUri';
@@ -415,7 +394,7 @@ class C {
     ], [
       RemoveParameter(PositionalParameterReference(0)),
       RemoveParameter(PositionalParameterReference(1)),
-      AddParameter(0, 'c', true, true, null, LiteralExtractor('2')),
+      AddParameter(0, 'c', true, true, LiteralExtractor('2')),
     ], newName: 'm2'));
     await resolveTestUnit('''
 import '$importUri';
@@ -447,7 +426,7 @@ class C {
     ], [
       RemoveParameter(PositionalParameterReference(1)),
       RemoveParameter(PositionalParameterReference(2)),
-      AddParameter(1, 'd', true, true, null, LiteralExtractor('3')),
+      AddParameter(1, 'd', true, true, LiteralExtractor('3')),
     ], newName: 'm2'));
     await resolveTestUnit('''
 import '$importUri';
@@ -477,10 +456,10 @@ class C {
       'C',
       'm1'
     ], [
-      AddParameter(0, 'a', true, true, null, LiteralExtractor('0')),
+      AddParameter(0, 'a', true, true, LiteralExtractor('0')),
       RemoveParameter(PositionalParameterReference(1)),
       RemoveParameter(PositionalParameterReference(3)),
-      AddParameter(2, 'd', true, true, null, LiteralExtractor('3')),
+      AddParameter(2, 'd', true, true, LiteralExtractor('3')),
     ], newName: 'm2'));
     await resolveTestUnit('''
 import '$importUri';
@@ -848,7 +827,7 @@ void g(int a, int b) {}
     setPackageData(_modify([
       'f'
     ], [
-      AddParameter(0, 'a', true, true, null, LiteralExtractor('0')),
+      AddParameter(0, 'a', true, true, LiteralExtractor('0')),
     ], newName: 'g'));
     await resolveTestUnit('''
 import '$importUri';

pkg/analysis_server/test/src/services/correction/fix/data_driven/transform_set_parser_test.dart

@@ -70,9 +70,6 @@ transforms:
       index: 0
       name: 'p'
       style: optional_positional
-      defaultValue:
-        kind: 'argument'
-        index: 1
 ''');
     var transforms = result.transformsFor('f', ['test.dart']);
     expect(transforms, hasLength(1));
@@ -87,9 +84,6 @@ transforms:
     expect(modification.name, 'p');
     expect(modification.isRequired, false);
     expect(modification.isPositional, true);
-    var value = modification.defaultValue as ArgumentExtractor;
-    var parameter = value.parameter as PositionalParameterReference;
-    expect(parameter.index, 1);
   }
 
   void test_addParameter_requiredNamed() {

pkg/analyzer/lib/src/lint/pub.dart

@@ -24,7 +24,9 @@ PSDependencyList _processDependencies(YamlScalar key, YamlNode v) {
   YamlMap depsMap = v;
 
   _PSDependencyList deps = _PSDependencyList(_PSNode(key));
-  depsMap.nodes.forEach((k, v) => deps.add(_PSDependency(k, v)));
+  depsMap.nodes.forEach((k, v) {
+    if (k is YamlScalar) deps.add(_PSDependency(k, v));
+  });
   return deps;
 }
 
@@ -159,25 +161,20 @@ class _PSDependency extends PSDependency {
   @override
   PSGitRepo git;
 
-  factory _PSDependency(dynamic k, YamlNode v) {
-    if (k is! YamlScalar) {
-      return null;
-    }
-    YamlScalar key = k;
-
+  factory _PSDependency(YamlScalar key, YamlNode value) {
     _PSDependency dep = _PSDependency._();
 
     dep.name = _PSNode(key);
 
-    if (v is YamlScalar) {
+    if (value is YamlScalar) {
       // Simple version
-      dep.version = PSEntry(null, _PSNode(v));
-    } else if (v is YamlMap) {
+      dep.version = PSEntry(null, _PSNode(value));
+    } else if (value is YamlMap) {
       // hosted:
       //   name: transmogrify
       //   url: http://your-package-server.com
       //   version: '>=0.4.0 <1.0.0'
-      YamlMap details = v;
+      YamlMap details = value;
       details.nodes.forEach((k, v) {
         if (k is! YamlScalar) {
           return;

pkg/dds/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 1.3.3
+
+- Fixed issue where `DartDevelopmentService.sseUri` did not return a URI with a
+  `sse` scheme.
+
 # 1.3.2
 
 - Add IPv6 hosting support.

pkg/dds/lib/src/dds_impl.dart

@@ -205,7 +205,7 @@ class _DartDevelopmentService implements DartDevelopmentService {
     }
     final pathSegments = _cleanupPathSegments(uri);
     pathSegments.add(_kSseHandlerPath);
-    return uri.replace(pathSegments: pathSegments);
+    return uri.replace(scheme: 'sse', pathSegments: pathSegments);
   }
 
   String _getNamespace(_DartDevelopmentServiceClient client) =>