Use notDefault extension method.

Change-Id: Iaa58435a5e7bbd6565758f6c862cddbec5de82a5
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/347649
Commit-Queue: Konstantin Shcheglov <[email protected]>
Reviewed-by: Brian Wilkerson <[email protected]>
Reviewed-by: Phil Quitslund <[email protected]>

Author: scheglov

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

@@ -11,6 +11,7 @@ import 'package:analysis_server/src/services/completion/dart/visibility_tracker.
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/dart/element/type.dart';
+import 'package:analyzer/src/dart/ast/extensions.dart';
 import 'package:analyzer/src/dart/element/element.dart';
 import 'package:analyzer/src/dart/element/member.dart';
 import 'package:analyzer/src/dart/element/type_algebra.dart';
@@ -153,9 +154,7 @@ class DeclarationHelper {
     }
     // Skip fields that are already initialized in the parameter list.
     for (var parameter in constructor.parameters.parameters) {
-      if (parameter is DefaultFormalParameter) {
-        parameter = parameter.parameter;
-      }
+      parameter = parameter.notDefault;
       if (parameter is FieldFormalParameter) {
         var parameterElement = parameter.declaredElement;
         if (parameterElement is FieldFormalParameterElement) {

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

@@ -7,6 +7,7 @@ import 'package:analysis_server/src/services/correction/dart/abstract_producer.d
 import 'package:analysis_server/src/services/correction/fix.dart';
 import 'package:analysis_server/src/utilities/extensions/ast.dart';
 import 'package:analyzer/dart/ast/ast.dart';
+import 'package:analyzer/src/dart/ast/extensions.dart';
 import 'package:analyzer_plugin/utilities/assist/assist.dart';
 import 'package:analyzer_plugin/utilities/change_builder/change_builder_core.dart';
 import 'package:analyzer_plugin/utilities/fixes/fixes.dart';
@@ -49,9 +50,7 @@ class ConvertToGenericFunctionSyntax extends ParsedCorrectionProducer {
   /// have an explicit type annotation.
   bool _allParametersHaveTypes(FormalParameterList parameters) {
     for (var parameter in parameters.parameters) {
-      if (parameter is DefaultFormalParameter) {
-        parameter = parameter.parameter;
-      }
+      parameter = parameter.notDefault;
       if (parameter is SimpleFormalParameter) {
         if (parameter.type == null) {
           return false;

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

@@ -6,6 +6,7 @@ import 'package:analysis_server/src/services/correction/dart/abstract_producer.d
 import 'package:analysis_server/src/services/correction/fix.dart';
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/element/element.dart';
+import 'package:analyzer/src/dart/ast/extensions.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';
@@ -106,9 +107,7 @@ class ConvertToInitializingFormal extends ResolvedCorrectionProducer {
     var parameterElement = expression.staticElement;
     for (var parameter in constructor.parameters.parameters) {
       if (parameter.declaredElement == parameterElement) {
-        if (parameter is DefaultFormalParameter) {
-          parameter = parameter.parameter;
-        }
+        parameter = parameter.notDefault;
         return parameter is SimpleFormalParameter ? parameter : null;
       }
     }

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

@@ -12,6 +12,7 @@ import 'package:analyzer/dart/ast/token.dart';
 import 'package:analyzer/dart/ast/visitor.dart';
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/source/source_range.dart';
+import 'package:analyzer/src/dart/ast/extensions.dart';
 import 'package:analyzer_plugin/utilities/assist/assist.dart';
 import 'package:analyzer_plugin/utilities/change_builder/change_builder_core.dart';
 import 'package:analyzer_plugin/utilities/fixes/fixes.dart';
@@ -358,9 +359,7 @@ class ConvertToSuperParameters extends ResolvedCorrectionProducer {
   Map<ParameterElement, _Parameter> _parameterMap(
       FormalParameterList parameterList) {
     bool validParameter(FormalParameter parameter) {
-      if (parameter is DefaultFormalParameter) {
-        parameter = parameter.parameter;
-      }
+      parameter = parameter.notDefault;
       return parameter is SimpleFormalParameter ||
           parameter is FunctionTypedFormalParameter;
     }

pkg/analysis_server/lib/src/services/refactoring/legacy/extract_widget.dart

@@ -305,9 +305,7 @@ class ExtractWidgetRefactoringImpl extends RefactoringImpl
       var parameterList = method.parameters;
       if (parameterList != null) {
         for (var parameter in parameterList.parameters) {
-          if (parameter is DefaultFormalParameter) {
-            parameter = parameter.parameter;
-          }
+          parameter = parameter.notDefault;
           if (parameter is NormalFormalParameter) {
             final element = parameter.declaredElement!;
             _parameters.add(_Parameter(element.name, element.type,

pkg/analyzer/lib/src/error/constructor_fields_verifier.dart

@@ -5,6 +5,7 @@
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/error/listener.dart';
 import 'package:analyzer/src/dart/ast/ast.dart';
+import 'package:analyzer/src/dart/ast/extensions.dart';
 import 'package:analyzer/src/dart/element/element.dart';
 import 'package:analyzer/src/dart/element/type_system.dart';
 import 'package:analyzer/src/error/codes.dart';
@@ -244,7 +245,7 @@ class ConstructorFieldsVerifier {
   void _updateWithParameters(ConstructorDeclaration node) {
     var formalParameters = node.parameters.parameters;
     for (FormalParameter parameter in formalParameters) {
-      parameter = _baseParameter(parameter);
+      parameter = parameter.notDefault;
       if (parameter is FieldFormalParameter) {
         var fieldElement =
             (parameter.declaredElement as FieldFormalParameterElementImpl)
@@ -270,13 +271,6 @@ class ConstructorFieldsVerifier {
       }
     }
   }
-
-  static FormalParameter _baseParameter(FormalParameter parameter) {
-    if (parameter is DefaultFormalParameter) {
-      return parameter.parameter;
-    }
-    return parameter;
-  }
 }
 
 /// The four states of a field initialization state through a constructor

pkg/analyzer/lib/src/generated/error_verifier.dart

@@ -5671,10 +5671,7 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
     NodeList<FormalParameter> parameters = node.parameters;
     int length = parameters.length;
     for (int i = 0; i < length; i++) {
-      FormalParameter parameter = parameters[i];
-      if (parameter is DefaultFormalParameter) {
-        parameter = parameter.parameter;
-      }
+      var parameter = parameters[i].notDefault;
       var keyword = parameter.covariantKeyword;
       if (keyword != null) {
         errorReporter.reportErrorForToken(
@@ -6065,9 +6062,7 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
 
     List<FormalParameter> parameters = constructor.parameters.parameters;
     for (FormalParameter parameter in parameters) {
-      if (parameter is DefaultFormalParameter) {
-        parameter = parameter.parameter;
-      }
+      parameter = parameter.notDefault;
       if (parameter is FieldFormalParameter) {
         final element =
             parameter.declaredElement as FieldFormalParameterElement;