[DAS] Fixes missing case for create class

This also adds a new priority for mixins when the written type name starts with lowercase letters (to match the class existing ones) and tests the priority between it, create class and import fixes.

Fixes: #60874

Change-Id: Ie451db6a273fe8eb52df21725276068b1980e7f1
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/433500
Commit-Queue: Brian Wilkerson <[email protected]>
Auto-Submit: Felipe Morschel <[email protected]>
Reviewed-by: Samuel Rawlins <[email protected]>
Reviewed-by: Brian Wilkerson <[email protected]>

Author: FMorschel

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

@@ -3,6 +3,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'package:analysis_server/src/services/correction/fix.dart';
+import 'package:analysis_server/src/utilities/extensions/string.dart';
 import 'package:analysis_server_plugin/edit/dart/correction_producer.dart';
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/element/element.dart';
@@ -12,8 +13,6 @@ import 'package:analyzer_plugin/utilities/fixes/fixes.dart';
 import 'package:analyzer_plugin/utilities/range_factory.dart';
 
 class CreateClass extends MultiCorrectionProducer {
-  static final _lowerCaseRegex = RegExp(r'([_\$]||[_\$]+[0-9])*[a-z]');
-
   CreateClass({required super.context});
 
   @override
@@ -22,6 +21,7 @@ class CreateClass extends MultiCorrectionProducer {
     Element? prefixElement;
     ArgumentList? arguments;
 
+    var withKeyword = false;
     String? className;
     bool requiresConstConstructor = false;
     if (targetNode is Annotation) {
@@ -43,13 +43,19 @@ class CreateClass extends MultiCorrectionProducer {
           return const [];
         }
       }
+      withKeyword = node.parent is WithClause;
       className = targetNode.name.lexeme;
       requiresConstConstructor |= _requiresConstConstructor(targetNode);
     } else if (targetNode case SimpleIdentifier(
       :var parent,
     ) when parent is! PropertyAccess && parent is! PrefixedIdentifier) {
       className = targetNode.nameOfType ?? targetNode.name;
       requiresConstConstructor |= _requiresConstConstructor(targetNode);
+    } else if (targetNode case SimpleIdentifier(
+      parent: PrefixedIdentifier(:var identifier),
+    ) when targetNode != identifier) {
+      className = targetNode.nameOfType ?? targetNode.name;
+      requiresConstConstructor |= _requiresConstConstructor(targetNode);
     } else if (targetNode is PrefixedIdentifier) {
       prefixElement = targetNode.prefix.element;
       if (prefixElement == null) {
@@ -65,14 +71,15 @@ class CreateClass extends MultiCorrectionProducer {
       return const [];
     }
     // Lowercase class names are valid but not idiomatic so lower the priority.
-    if (className.startsWith(_lowerCaseRegex)) {
+    if (className.firstLetterIsLowercase) {
       return [
         _CreateClass.lowercase(
           context: context,
           targetNode: targetNode,
           prefixElement: prefixElement,
           className: className,
           requiresConstConstructor: requiresConstConstructor,
+          withKeyword: withKeyword,
           arguments: arguments,
         ),
       ];
@@ -84,6 +91,7 @@ class CreateClass extends MultiCorrectionProducer {
           prefixElement: prefixElement,
           className: className,
           requiresConstConstructor: requiresConstConstructor,
+          withKeyword: withKeyword,
           arguments: arguments,
         ),
       ];
@@ -126,12 +134,16 @@ class _CreateClass extends ResolvedCorrectionProducer {
     required AstNode targetNode,
     required Element? prefixElement,
     required String className,
+    required bool withKeyword,
   }) : _className = className,
        _prefixElement = prefixElement,
        _targetNode = targetNode,
        _requiresConstConstructor = requiresConstConstructor,
        _arguments = arguments,
-       fixKind = DartFixKind.CREATE_CLASS_LOWERCASE;
+       fixKind =
+           withKeyword
+               ? DartFixKind.CREATE_CLASS_LOWERCASE_WITH
+               : DartFixKind.CREATE_CLASS_LOWERCASE;
 
   _CreateClass.uppercase({
     required super.context,
@@ -140,12 +152,16 @@ class _CreateClass extends ResolvedCorrectionProducer {
     required AstNode targetNode,
     required Element? prefixElement,
     required String className,
+    required bool withKeyword,
   }) : _className = className,
        _prefixElement = prefixElement,
        _targetNode = targetNode,
        _requiresConstConstructor = requiresConstConstructor,
        _arguments = arguments,
-       fixKind = DartFixKind.CREATE_CLASS_UPPERCASE;
+       fixKind =
+           withKeyword
+               ? DartFixKind.CREATE_CLASS_UPPERCASE_WITH
+               : DartFixKind.CREATE_CLASS_UPPERCASE;
 
   @override
   CorrectionApplicability get applicability =>

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

@@ -3,6 +3,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'package:analysis_server/src/services/correction/fix.dart';
+import 'package:analysis_server/src/utilities/extensions/string.dart';
 import 'package:analysis_server_plugin/edit/dart/correction_producer.dart';
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/element/element.dart';
@@ -11,64 +12,110 @@ import 'package:analyzer_plugin/utilities/change_builder/change_builder_core.dar
 import 'package:analyzer_plugin/utilities/fixes/fixes.dart';
 import 'package:analyzer_plugin/utilities/range_factory.dart';
 
-class CreateMixin extends ResolvedCorrectionProducer {
-  String _mixinName = '';
-
+class CreateMixin extends MultiCorrectionProducer {
   CreateMixin({required super.context});
 
   @override
-  CorrectionApplicability get applicability =>
-      // TODO(applicability): comment on why.
-      CorrectionApplicability.singleLocation;
-
-  @override
-  List<String> get fixArguments => [_mixinName];
-
-  @override
-  FixKind get fixKind => DartFixKind.CREATE_MIXIN;
-
-  @override
-  Future<void> compute(ChangeBuilder builder) async {
+  Future<List<ResolvedCorrectionProducer>> get producers async {
+    String mixinName = '';
     Element? prefixElement;
+    var withKeyword = false;
     var node = this.node;
     if (node is NamedType) {
       var importPrefix = node.importPrefix;
       if (importPrefix != null) {
         prefixElement = importPrefix.element2;
         if (prefixElement == null) {
-          return;
+          return const [];
         }
       }
-      _mixinName = node.name.lexeme;
+      withKeyword = node.parent is WithClause;
+      mixinName = node.name.lexeme;
     } else if (node is SimpleIdentifier) {
       var parent = node.parent;
       switch (parent) {
-        case PrefixedIdentifier():
-          if (parent.identifier == node) {
-            return;
-          }
-        case PropertyAccess():
-          if (parent.propertyName == node) {
-            return;
-          }
-        case ExpressionFunctionBody():
-          if (parent.expression == node) {
-            return;
+        // Not the first identifier or the body of a function
+        case PrefixedIdentifier(identifier: Expression invalid) ||
+            PropertyAccess(propertyName: Expression invalid) ||
+            ExpressionFunctionBody(expression: var invalid):
+          if (invalid == node) {
+            return const [];
           }
       }
-      _mixinName = node.name;
+      mixinName = node.name;
     } else if (node is PrefixedIdentifier) {
       if (node.parent is InstanceCreationExpression) {
-        return;
+        return const [];
       }
       prefixElement = node.prefix.element;
       if (prefixElement == null) {
-        return;
+        return const [];
       }
-      _mixinName = node.identifier.name;
+      mixinName = node.identifier.name;
     } else {
-      return;
+      return const [];
+    }
+    if (mixinName.isEmpty) {
+      return const [];
     }
+    return [
+      // Lowercase mixin names are valid but not idiomatic so lower the
+      // priority.
+      if (mixinName.firstLetterIsLowercase)
+        _CreateMixin.lowercase(
+          mixinName,
+          prefixElement,
+          withKeyword: withKeyword,
+          context: context,
+        )
+      else
+        _CreateMixin.uppercase(
+          mixinName,
+          prefixElement,
+          withKeyword: withKeyword,
+          context: context,
+        ),
+    ];
+  }
+}
+
+class _CreateMixin extends ResolvedCorrectionProducer {
+  final String _mixinName;
+  final Element? prefixElement;
+
+  @override
+  final FixKind fixKind;
+
+  _CreateMixin.lowercase(
+    this._mixinName,
+    this.prefixElement, {
+    required bool withKeyword,
+    required super.context,
+  }) : fixKind =
+           withKeyword
+               ? DartFixKind.CREATE_MIXIN_LOWERCASE_WITH
+               : DartFixKind.CREATE_MIXIN_LOWERCASE;
+
+  _CreateMixin.uppercase(
+    this._mixinName,
+    this.prefixElement, {
+    required bool withKeyword,
+    required super.context,
+  }) : fixKind =
+           withKeyword
+               ? DartFixKind.CREATE_MIXIN_UPPERCASE_WITH
+               : DartFixKind.CREATE_MIXIN_UPPERCASE;
+
+  @override
+  CorrectionApplicability get applicability =>
+      // TODO(applicability): comment on why.
+      CorrectionApplicability.singleLocation;
+
+  @override
+  List<String> get fixArguments => [_mixinName];
+
+  @override
+  Future<void> compute(ChangeBuilder builder) async {
     // prepare environment
     LibraryFragment targetUnit;
     var prefix = '';

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

@@ -733,11 +733,21 @@ abstract final class DartFixKind {
     DartFixKindPriority.standard + 2,
     "Create class '{0}'",
   );
+  static const CREATE_CLASS_UPPERCASE_WITH = FixKind(
+    'dart.fix.create.class.uppercase.with',
+    DartFixKindPriority.standard + 1,
+    "Create class '{0}'",
+  );
   static const CREATE_CLASS_LOWERCASE = FixKind(
     'dart.fix.create.class.lowercase',
     DartFixKindPriority.standard - 5,
     "Create class '{0}'",
   );
+  static const CREATE_CLASS_LOWERCASE_WITH = FixKind(
+    'dart.fix.create.class.lowercase.with',
+    DartFixKindPriority.standard - 6,
+    "Create class '{0}'",
+  );
   static const CREATE_CONSTRUCTOR = FixKind(
     'dart.fix.create.constructor',
     DartFixKindPriority.standard,
@@ -820,11 +830,26 @@ abstract final class DartFixKind {
     DartFixKindPriority.standard + 1,
     'Create {0} missing override{1}',
   );
-  static const CREATE_MIXIN = FixKind(
-    'dart.fix.create.mixin',
+  static const CREATE_MIXIN_UPPERCASE = FixKind(
+    'dart.fix.create.mixin.uppercase',
     DartFixKindPriority.standard,
     "Create mixin '{0}'",
   );
+  static const CREATE_MIXIN_UPPERCASE_WITH = FixKind(
+    'dart.fix.create.mixin.uppercase.with',
+    DartFixKindPriority.standard + 2,
+    "Create mixin '{0}'",
+  );
+  static const CREATE_MIXIN_LOWERCASE = FixKind(
+    'dart.fix.create.mixin.lowercase',
+    DartFixKindPriority.standard - 6,
+    "Create mixin '{0}'",
+  );
+  static const CREATE_MIXIN_LOWERCASE_WITH = FixKind(
+    'dart.fix.create.mixin.lowercase.with',
+    DartFixKindPriority.standard - 5,
+    "Create mixin '{0}'",
+  );
   static const CREATE_NO_SUCH_METHOD = FixKind(
     'dart.fix.create.noSuchMethod',
     DartFixKindPriority.standard - 1,