Version 2.18.0-225.0.dev

Merge commit 'c97f7b7fadca5b6a3e220a20dbefd4eaa3b442ba' into 'dev'

Author: Dart CI

DEPS

@@ -109,7 +109,7 @@ vars = {
   "dart_style_rev": "d7b73536a8079331c888b7da539b80e6825270ea", # manually rev'd
 
   "dartdoc_rev": "58348a98b992ce99b95d23131b67227bdb2b4875",
-  "devtools_rev": "51ac983d2db7eb19b3ce5956cb70b769d74fe784",
+  "devtools_rev": "0aa619c42a68d6db4c94a7838121811aba8f5eb1",
   "ffi_rev": "18b2b549d55009ff594600b04705ff6161681e07",
   "file_rev": "0132eeedea2933513bf230513a766a8baeab0c4f",
   "fixnum_rev": "164712f6547cdfb2709b752188186baf31fd1730",

pkg/analysis_server/benchmark/perf/flutter_completion_benchmark.dart

@@ -95,7 +95,7 @@ class FlutterCompletionBenchmark extends Benchmark implements FlutterBenchmark {
     );
 
     if (!quick) {
-      // This scenario is relatively easy - the file is small, less then 3KB.
+      // This scenario is relatively easy - the file is small, less than 3KB.
       // But we don't have any prefix to filter, so if we don't restrict the
       // number of suggestions, we might spend too much time serializing into
       // JSON in the server, and deserializing on the client.

pkg/analysis_server/lib/src/analytics/google_analytics_manager.dart

@@ -41,6 +41,11 @@ class GoogleAnalyticsManager implements AnalyticsManager {
   /// was enabled.
   final Map<String, int> _lintUsageCounts = {};
 
+  /// A map from the name of a diagnostic to a map whose values are the number
+  /// of times that the severity of the diagnostic was changed to the severity
+  /// represented by the key.
+  final Map<String, Map<String, int>> _severityAdjustments = {};
+
   /// Initialize a newly created analytics manager to report to the [analytics]
   /// service.
   GoogleAnalyticsManager(this.analytics);
@@ -66,12 +71,12 @@ class GoogleAnalyticsManager implements AnalyticsManager {
         var name = rule.name;
         _lintUsageCounts[name] = (_lintUsageCounts[name] ?? 0) + 1;
       }
-      // TODO(brianwilkerson) Collect other context-dependent information, such
-      //  as which codes have a different severity assigned to them:
-      // for (var processor in context.analysisOptions.errorProcessors) {
-      //   processor.code;
-      //   processor.severity;
-      // }
+      for (var processor in context.analysisOptions.errorProcessors) {
+        var severity = processor.severity?.name ?? 'ignore';
+        var severityCounts =
+            _severityAdjustments.putIfAbsent(processor.code, () => {});
+        severityCounts[severity] = (severityCounts[severity] ?? 0) + 1;
+      }
     }
   }
 
@@ -140,6 +145,7 @@ class GoogleAnalyticsManager implements AnalyticsManager {
     _sendPluginResponseTimes();
     _sendNotificationHandlingTimes();
     _sendLintUsageCounts();
+    _sendSeverityAdjustments();
 
     analytics.waitForLastPing(timeout: Duration(milliseconds: 200)).then((_) {
       analytics.close();
@@ -227,9 +233,11 @@ class GoogleAnalyticsManager implements AnalyticsManager {
   }
 
   void _sendLintUsageCounts() {
-    analytics.sendEvent('language_server', 'lintUsageCounts', parameters: {
-      'usageCounts': _lintUsageCounts.toString(),
-    });
+    if (_lintUsageCounts.isNotEmpty) {
+      analytics.sendEvent('language_server', 'lintUsageCounts', parameters: {
+        'usageCounts': json.encode(_lintUsageCounts),
+      });
+    }
   }
 
   /// Send information about the notifications handled by the server.
@@ -286,6 +294,15 @@ class GoogleAnalyticsManager implements AnalyticsManager {
       'plugins': _pluginData.usageCountData,
     });
   }
+
+  void _sendSeverityAdjustments() {
+    if (_severityAdjustments.isNotEmpty) {
+      analytics
+          .sendEvent('language_server', 'severityAdjustments', parameters: {
+        'adjustmentCounts': json.encode(_severityAdjustments),
+      });
+    }
+  }
 }
 
 /// Data about a request that was received and is being handled.

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

@@ -88,6 +88,8 @@ class MakeFinal extends CorrectionProducer {
     } else if (node is VariableDeclaration &&
         parent is VariableDeclarationList) {
       list = parent;
+    } else if (node is VariableDeclarationList) {
+      list = node;
     } else {
       return;
     }

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

@@ -0,0 +1,41 @@
+// Copyright (c) 2022, the Dart project authors. Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+import 'package:analysis_server/src/services/correction/dart/abstract_producer.dart';
+import 'package:analysis_server/src/services/correction/fix.dart';
+import 'package:analyzer/dart/ast/ast.dart';
+import 'package:analyzer/dart/ast/token.dart';
+import 'package:analyzer_plugin/utilities/change_builder/change_builder_core.dart';
+import 'package:analyzer_plugin/utilities/fixes/fixes.dart';
+import 'package:analyzer_plugin/utilities/range_factory.dart';
+
+class RemoveUnnecessaryFinal extends CorrectionProducer {
+  @override
+  bool get canBeAppliedInBulk => true;
+
+  @override
+  bool get canBeAppliedToFile => true;
+
+  @override
+  FixKind get fixKind => DartFixKind.REMOVE_UNNECESSARY_FINAL;
+
+  @override
+  FixKind get multiFixKind => DartFixKind.REMOVE_UNNECESSARY_FINAL_MULTI;
+
+  @override
+  Future<void> compute(ChangeBuilder builder) async {
+    var node = this.node;
+    Token? keyword;
+    if (node is FieldFormalParameter) {
+      keyword = node.keyword;
+    } else if (node is SuperFormalParameter) {
+      keyword = node.keyword;
+    }
+    if (keyword == null) return;
+
+    await builder.addDartFileEdit(file, (builder) {
+      builder.addDeletion(range.startStart(keyword!, keyword.next!));
+    });
+  }
+}

pkg/analysis_server/lib/src/services/correction/error_fix_status.yaml

@@ -1456,7 +1456,7 @@ HintCode.UNIGNORABLE_IGNORE:
 HintCode.UNNECESSARY_CAST:
   status: hasFix
 HintCode.UNNECESSARY_FINAL:
-  status: needsEvaluation
+  status: hasFix
 HintCode.UNNECESSARY_IGNORE:
   status: needsEvaluation
 HintCode.UNNECESSARY_IMPORT:

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

@@ -1128,6 +1128,16 @@ class DartFixKind {
     DartFixKindPriority.IN_FILE,
     'Remove all unnecessary casts in file',
   );
+  static const REMOVE_UNNECESSARY_FINAL = FixKind(
+    'dart.fix.remove.unnecessaryFinal',
+    DartFixKindPriority.DEFAULT,
+    "Remove unnecessary 'final'",
+  );
+  static const REMOVE_UNNECESSARY_FINAL_MULTI = FixKind(
+    'dart.fix.remove.unnecessaryFinal.multi',
+    DartFixKindPriority.IN_FILE,
+    "Remove all unnecessary 'final's in file",
+  );
   static const REMOVE_UNNECESSARY_CONST = FixKind(
     'dart.fix.remove.unnecessaryConst',
     DartFixKindPriority.DEFAULT,

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

@@ -139,6 +139,7 @@ import 'package:analysis_server/src/services/correction/dart/remove_this_express
 import 'package:analysis_server/src/services/correction/dart/remove_type_annotation.dart';
 import 'package:analysis_server/src/services/correction/dart/remove_type_arguments.dart';
 import 'package:analysis_server/src/services/correction/dart/remove_unnecessary_cast.dart';
+import 'package:analysis_server/src/services/correction/dart/remove_unnecessary_final.dart';
 import 'package:analysis_server/src/services/correction/dart/remove_unnecessary_late.dart';
 import 'package:analysis_server/src/services/correction/dart/remove_unnecessary_new.dart';
 import 'package:analysis_server/src/services/correction/dart/remove_unnecessary_parentheses.dart';
@@ -1326,6 +1327,9 @@ class FixProcessor extends BaseProcessor {
     HintCode.UNNECESSARY_CAST: [
       RemoveUnnecessaryCast.new,
     ],
+    HintCode.UNNECESSARY_FINAL: [
+      RemoveUnnecessaryFinal.new,
+    ],
     HintCode.UNNECESSARY_IMPORT: [
       RemoveUnusedImport.new,
     ],

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

@@ -230,7 +230,7 @@ class ExtractLocalRefactoringImpl extends RefactoringImpl
     }
     if (selectionOffset + selectionLength >= resolveResult.content.length) {
       return RefactoringStatus.fatal(
-          'The selection end offset must be less then the length of the file.');
+          'The selection end offset must be less than the length of the file.');
     }
 
     var selectionStr = utils.getRangeText(selectionRange);

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

@@ -458,7 +458,7 @@ class ExtractMethodRefactoringImpl extends RefactoringImpl
     }
     if (selectionOffset + selectionLength >= resolveResult.content.length) {
       return RefactoringStatus.fatal(
-          'The selection end offset must be less then the length of the file.');
+          'The selection end offset must be less than the length of the file.');
     }
 
     // Check for implicitly selected closure.
@@ -989,10 +989,19 @@ class _ExtractMethodAnalyzer extends StatementAnalyzer {
       if (element is FunctionElement || element is MethodElement) {
         invalidSelection('Cannot extract a single method name.');
       }
-      // name in property access
-      if (node.parent is PrefixedIdentifier &&
-          (node.parent as PrefixedIdentifier).identifier == node) {
-        invalidSelection('Can not extract name part of a property access.');
+      var parent = node.parent;
+      if (parent is PrefixedIdentifier) {
+        if (parent.identifier == node) {
+          // name in property access
+          invalidSelection('Cannot extract name part of a property access.');
+        } else if (parent.prefix == node && parent.parent is NamedType) {
+          // prefix in a named type (for example `io` in `io.File`)
+          invalidSelection('Cannot extract prefix part of a type reference.');
+        }
+      }
+      // part of a named type (for example `int` in `int?`)
+      if (node.parent is NamedType) {
+        invalidSelection('Cannot extract a single type reference.');
       }
     }
   }

pkg/analysis_server/test/lsp/code_actions_refactor_test.dart

@@ -364,6 +364,22 @@ void f() {}
     expect(codeAction, isNull);
   }
 
+  Future<void> test_invalidLocation_importPrefix() async {
+    const content = '''
+import 'dart:io' as io;
+
+i^o.File a;
+    ''';
+    newFile(mainFilePath, withoutMarkers(content));
+    await initialize();
+
+    final codeActions = await getCodeActions(mainFileUri.toString(),
+        position: positionFromMarker(content));
+    final codeAction =
+        findCommand(codeActions, Commands.performRefactor, extractMethodTitle);
+    expect(codeAction, isNull);
+  }
+
   Future<void> test_progress_clientProvided() async {
     const content = '''
 void f() {

pkg/analysis_server/test/services/refactoring/extract_method_test.dart

@@ -438,7 +438,7 @@ void f(A a) {
 ''');
     _createRefactoringWithSuffix('fff', ' = 1');
     return _assertConditionsFatal(
-        'Can not extract name part of a property access.');
+        'Cannot extract name part of a property access.');
   }
 
   Future<void> test_bad_newMethodName_notIdentifier() async {
@@ -752,6 +752,27 @@ void f() {
     return _assertConditionsFatal('Cannot extract a single type reference.');
   }
 
+  Future<void> test_bad_typeReference_nullable() async {
+    await indexTestUnit('''
+// Dummy comment ("The selection offset must be greater than zero")
+int? f;
+''');
+    _createRefactoringForString('int');
+    return _assertConditionsFatal('Cannot extract a single type reference.');
+  }
+
+  Future<void> test_bad_typeReference_prefix() async {
+    await indexTestUnit('''
+import 'dart:io' as io;
+void f() {
+  io.File f = io.File('');
+}
+''');
+    _createRefactoringWithSuffix('io', '.File f');
+    return _assertConditionsFatal(
+        'Cannot extract prefix part of a type reference.');
+  }
+
   Future<void> test_bad_variableDeclarationFragment() async {
     await indexTestUnit('''
 void f() {
@@ -1251,6 +1272,29 @@ void f() {
     expect(refactoring.lengths, unorderedEquals([5, 6]));
   }
 
+  Future<void> test_prefixPartOfQualified() async {
+    await indexTestUnit('''
+class A {
+  var fff;
+}
+void f(A a) {
+  a.fff = 5;
+}
+''');
+    _createRefactoringForStringOffset('a.fff');
+    // apply refactoring
+    return _assertSuccessfulRefactoring('''
+class A {
+  var fff;
+}
+void f(A a) {
+  res(a).fff = 5;
+}
+
+A res(A a) => a;
+''');
+  }
+
   Future<void> test_returnType_closure() async {
     await indexTestUnit('''
 process(f(x)) {}