Version 2.11.0-160.0.dev

Merge commit '75ffae6a5c523810989c929f0c4ba4aece8590bc' into 'dev'

Author: Dart CI

pkg/analysis_server/analysis_options.yaml

@@ -15,6 +15,7 @@ analyzer:
 
 linter:
   rules:
+    - await_only_futures
     - empty_statements
     - unnecessary_brace_in_string_interps
     #

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

@@ -561,7 +561,7 @@ class EditDomainHandler extends AbstractRequestHandler {
     }
 
     // Prepare the file information.
-    var result = await server.getParsedUnit(file);
+    var result = server.getParsedUnit(file);
     if (result == null) {
       server.sendResponse(Response.fileNotAnalyzed(request, file));
       return;

pkg/analysis_server/lib/src/edit/fix/fix_code_task.dart

@@ -28,7 +28,7 @@ mixin FixCodeProcessor {
     }
   }
 
-  void processPackage(Folder pkgFolder) async {
+  Future<void> processPackage(Folder pkgFolder) async {
     for (var task in _codeTasks) {
       await task.processPackage(pkgFolder);
     }

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

@@ -44,7 +44,7 @@ class AddLate extends CorrectionProducer {
     }
   }
 
-  void _insertAt(ChangeBuilder builder, int offset) async {
+  Future<void> _insertAt(ChangeBuilder builder, int offset) async {
     await builder.addDartFileEdit(file, (builder) {
       builder.addSimpleInsertion(offset, 'late ');
     });

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

@@ -60,7 +60,8 @@ class FlutterConvertToChildren extends CorrectionProducer {
       if (newlineLoc == childArgSrc.length) {
         newlineLoc -= 1;
       }
-      String indentOld = getLinePrefix(childArg.offset + 1 + newlineLoc);
+      String indentOld =
+          getLinePrefix(childArg.offset + eol.length + newlineLoc);
       var indentNew = '$indentOld${getIndent(1)}';
       // The separator includes 'child:' but that has no newlines.
       String separator =

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

@@ -28,7 +28,7 @@ class FlutterWrapGeneric extends CorrectionProducer {
     if (newlineIdx < 0 || newlineIdx == literalSrc.length - 1) {
       return; // Lists need to be in multi-line format already.
     }
-    var indentOld = utils.getLinePrefix(node.offset + 1 + newlineIdx);
+    var indentOld = utils.getLinePrefix(node.offset + eol.length + newlineIdx);
     var indentArg = '$indentOld${utils.getIndent(1)}';
     var indentList = '$indentOld${utils.getIndent(2)}';
 

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

@@ -21,7 +21,7 @@ class RemoveAnnotation extends CorrectionProducer {
 
   @override
   Future<void> compute(ChangeBuilder builder) async {
-    void addFix(Annotation node) async {
+    Future<void> addFix(Annotation node) async {
       if (node == null) {
         return;
       }

pkg/analysis_server/lib/src/services/correction/fix/analysis_options/fix_generator.dart

@@ -87,7 +87,7 @@ class AnalysisOptionsFixGenerator {
     return fixes;
   }
 
-  void _addFix_removeSetting() async {
+  Future<void> _addFix_removeSetting() async {
     if (coveringNodePath[0] is YamlScalar) {
       SourceRange deletionRange;
       var index = 1;

pkg/analysis_server/lib/src/services/refactoring/extract_method.dart

@@ -754,7 +754,7 @@ class ExtractMethodRefactoringImpl extends RefactoringImpl
   }
 
   Future<void> _initializeReturnType() async {
-    var typeProvider = await resolveResult.typeProvider;
+    var typeProvider = resolveResult.typeProvider;
     if (_selectionFunctionExpression != null) {
       variableType = '';
       returnType = '';

pkg/analysis_server/lib/src/status/diagnostics.dart

@@ -391,7 +391,7 @@ class ContentsPage extends DiagnosticPageWithNav {
           raw: true);
       return;
     }
-    var file = await server.resourceProvider.getFile(filePath);
+    var file = server.resourceProvider.getFile(filePath);
     if (!file.exists) {
       p('The file <code>${escape(filePath)}</code> does not exist.', raw: true);
       return;