Version 2.13.0-32.0.dev

Merge commit '2439c412f0df54c18992194056a3350a55f54085' into 'dev'

Author: Dart CI

DEPS

@@ -122,7 +122,7 @@ vars = {
   "logging_rev": "e2f633b543ef89c54688554b15ca3d7e425b86a2",
   "markupsafe_rev": "8f45f5cfa0009d2a70589bcda0349b8cb2b72783",
   "markdown_rev": "9c4beaac96d8f008078e00b027915f81b665d2de",
-  "matcher_rev": "43d5cac48fcd386643016e767164da87c5c25e29",
+  "matcher_rev": "1f7b6f0cb15eb6659a1de0513571575a5c8a51d0",
   "mime_rev": "c931f4bed87221beaece356494b43731445ce7b8",
   "mockito_rev": "d39ac507483b9891165e422ec98d9fb480037c8b",
   "mustache_rev": "664737ecad027e6b96d0d1e627257efa0e46fcb1",

pkg/_fe_analyzer_shared/lib/src/messages/codes_generated.dart

@@ -3766,32 +3766,6 @@ Message _withArgumentsFfiEmptyStruct(String name) {
       arguments: {'name': name});
 }
 
-// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
-const Template<
-    Message Function(
-        String
-            name)> templateFfiEmptyStructWarning = const Template<
-        Message Function(String name)>(
-    messageTemplate:
-        r"""Struct '#name' is empty. Support for empty structs is deprecated and will be removed in the next stable version of Dart. Use Opaque instead.""",
-    withArguments: _withArgumentsFfiEmptyStructWarning);
-
-// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
-const Code<Message Function(String name)> codeFfiEmptyStructWarning =
-    const Code<Message Function(String name)>("FfiEmptyStructWarning",
-        analyzerCodes: <String>["EMPTY_STRUCT_WARNING"],
-        severity: Severity.info);
-
-// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
-Message _withArgumentsFfiEmptyStructWarning(String name) {
-  if (name.isEmpty) throw 'No name provided';
-  name = demangleMixinApplicationName(name);
-  return new Message(codeFfiEmptyStructWarning,
-      message:
-          """Struct '${name}' is empty. Support for empty structs is deprecated and will be removed in the next stable version of Dart. Use Opaque instead.""",
-      arguments: {'name': name});
-}
-
 // DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
 const Code<Null> codeFfiExceptionalReturnNull = messageFfiExceptionalReturnNull;
 

pkg/analysis_server/lib/src/context_manager.dart

@@ -737,7 +737,7 @@ class ContextManagerImpl implements ContextManager {
     List<protocol.AnalysisError> convertedErrors;
     try {
       var file = resourceProvider.getFile(path);
-      var packageName = file.parent.parent.shortName;
+      var packageName = file.parent2.parent2.shortName;
       var content = _readFile(path);
       var errorListener = RecordingErrorListener();
       var errorReporter = ErrorReporter(errorListener, file.createSource());
@@ -1119,7 +1119,7 @@ class ContextManagerImpl implements ContextManager {
 
   /// Extract a new [packagespecFile]-based context from [oldInfo].
   void _extractContext(ContextInfo oldInfo, File packagespecFile) {
-    var newFolder = packagespecFile.parent;
+    var newFolder = packagespecFile.parent2;
     var newInfo =
         _createContext(oldInfo, newFolder, excludedPaths, packagespecFile);
     // prepare sources to extract

pkg/analysis_server/lib/src/edit/edit_dartfix.dart

@@ -147,13 +147,12 @@ class EditDartFix
     ).toResponse(request.id);
   }
 
-  Folder findPkgFolder(Folder folder) {
-    while (folder != null) {
+  Folder findPkgFolder(Folder start) {
+    for (var folder in start.withAncestors) {
       if (folder.getChild('analysis_options.yaml').exists ||
           folder.getChild('pubspec.yaml').exists) {
         return folder;
       }
-      folder = folder.parent;
     }
     return null;
   }

pkg/analysis_server/lib/src/services/completion/dart/feature_computer.dart

@@ -53,13 +53,13 @@ DartType impliedDartTypeWithName(TypeProvider typeProvider, String name) {
   } else if (numNames.contains(name)) {
     return typeProvider.numType;
   } else if (listNames.contains(name)) {
-    return typeProvider.listType2(typeProvider.dynamicType);
+    return typeProvider.listType(typeProvider.dynamicType);
   } else if (stringNames.contains(name)) {
     return typeProvider.stringType;
   } else if (name == 'iterator') {
     return typeProvider.iterableDynamicType;
   } else if (name == 'map') {
-    return typeProvider.mapType2(
+    return typeProvider.mapType(
         typeProvider.dynamicType, typeProvider.dynamicType);
   }
   return null;
@@ -890,7 +890,7 @@ class _ContextTypeVisitor extends SimpleAstVisitor<DartType> {
           if (currentNode.isSet) {
             return typeProvider.iterableDynamicType;
           }
-          return typeProvider.mapType2(
+          return typeProvider.mapType(
               typeProvider.dynamicType, typeProvider.dynamicType);
         }
         currentNode = currentNode.parent;

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

@@ -45,9 +45,9 @@ class AddNullCheck extends CorrectionProducer {
       toType = parent.realTarget.staticType;
     } else if (parent is ForEachPartsWithDeclaration) {
       toType =
-          typeProvider.iterableType2(parent.loopVariable.declaredElement.type);
+          typeProvider.iterableType(parent.loopVariable.declaredElement.type);
     } else if (parent is ForEachPartsWithIdentifier) {
-      toType = typeProvider.iterableType2(parent.identifier.staticType);
+      toType = typeProvider.iterableType(parent.identifier.staticType);
     } else if (parent is SpreadElement) {
       var literal = parent.thisOrAncestorOfType<TypedLiteral>();
       if (literal is ListLiteral) {

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

@@ -32,7 +32,7 @@ class UpdateSdkConstraints extends CorrectionProducer {
         break;
       }
       pubspecFile = null;
-      folder = folder.parent;
+      folder = folder.parent2;
     }
     if (pubspecFile == null) {
       return;