Version 3.4.0-204.0.dev

Merge 888941c into dev

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

@@ -372,14 +372,36 @@ class FeatureComputer {
     return range.upper;
   }
 
-  /// Return the distance between the [reference] and the referenced local
-  /// [variable], where the distance is defined to be the number of variable
-  /// declarations between the local variable and the reference.
-  int localVariableDistance(AstNode reference, LocalVariableElement variable) {
+  /// Return the distance between the [reference] and [variable].
+  ///
+  /// For [LocalVariableElement] the distance is the number of variable
+  /// declarations between [variable] and the reference.
+  ///
+  /// For [ParameterElement] the first one is considered to be "closer".
+  /// Plus we add any local variables declared on the path to [reference].
+  int localVariableDistance(AstNode reference, VariableElement variable) {
     var distance = 0;
     AstNode? node = reference;
     while (node != null) {
-      if (node is ForStatement || node is ForElement) {
+      if (node is FunctionExpression) {
+        if (node.parameters case var parameterList?) {
+          for (var parameter in parameterList.parameters) {
+            if (parameter.declaredElement == variable) {
+              return distance;
+            }
+            distance++;
+          }
+        }
+      } else if (node is MethodDeclaration) {
+        if (node.parameters case var parameterList?) {
+          for (var parameter in parameterList.parameters) {
+            if (parameter.declaredElement == variable) {
+              return distance;
+            }
+            distance++;
+          }
+        }
+      } else if (node is ForStatement || node is ForElement) {
         var loopParts = node is ForStatement
             ? node.forLoopParts
             : (node as ForElement).forLoopParts;
@@ -448,7 +470,7 @@ class FeatureComputer {
   /// variable whose declaration is separated from the completion location by
   /// [distance] other variable declarations.
   double localVariableDistanceFeature(
-      AstNode reference, LocalVariableElement variable) {
+      AstNode reference, VariableElement variable) {
     var distance = localVariableDistance(reference, variable);
     return _distanceToPercent(distance);
   }

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

@@ -987,10 +987,13 @@ class SuggestionBuilder {
   /// Add a suggestion for a [parameter].
   void suggestParameter(ParameterElement parameter) {
     var variableType = parameter.type;
-    // TODO(brianwilkerson): Use the distance to the declaring function as
-    //  another feature.
+    var target = request.target;
+    var entity = target.entity;
+    var node = entity is AstNode ? entity : target.containingNode;
     var contextType = request.featureComputer
         .contextTypeFeature(request.contextType, variableType);
+    var localVariableDistance =
+        request.featureComputer.localVariableDistanceFeature(node, parameter);
     var elementKind = _computeElementKind(parameter);
     var isConstant = _preferConstants
         ? request.featureComputer.isConstantFeature(parameter)
@@ -999,6 +1002,7 @@ class SuggestionBuilder {
       contextType: contextType,
       elementKind: elementKind,
       isConstant: isConstant,
+      localVariableDistance: localVariableDistance,
     );
     _addBuilder(
       _createCompletionSuggestionBuilder(

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

@@ -95,42 +95,9 @@ CompletionDefaultArgumentList computeCompletionDefaultArgumentList(
     }
     offset = sb.length;
 
-    var parameterType = param.type;
-    if (parameterType is FunctionType) {
-      var rangeStart = offset;
-      int rangeLength;
-
-      // TODO(pq): consider adding ranges for params
-      // pending: https://github.com/dart-lang/sdk/issues/40207
-      // (types in closure param completions make this UX awkward)
-      final parametersString = buildClosureParameters(parameterType);
-      final blockBuffer = StringBuffer(parametersString);
-
-      blockBuffer.write(' ');
-
-      // TODO(pq): consider refactoring to share common logic w/
-      //  ArgListContributor.buildClosureSuggestions
-      final returnType = parameterType.returnType;
-      if (returnType is VoidType) {
-        blockBuffer.write('{');
-        rangeStart = sb.length + blockBuffer.length;
-        blockBuffer.write(' }');
-        rangeLength = 1;
-      } else {
-        final returnValue = returnType.isDartCoreBool ? 'false' : 'null';
-        blockBuffer.write('=> ');
-        rangeStart = sb.length + blockBuffer.length;
-        blockBuffer.write(returnValue);
-        rangeLength = returnValue.length;
-      }
-
-      sb.write(blockBuffer);
-      ranges.addAll([rangeStart, rangeLength]);
-    } else {
-      var name = param.name;
-      sb.write(name);
-      ranges.addAll([offset, name.length]);
-    }
+    var name = param.name;
+    sb.write(name);
+    ranges.addAll([offset, name.length]);
   }
 
   for (var param in namedParams) {

pkg/analysis_server/test/client/completion_driver_test.dart

@@ -122,8 +122,9 @@ abstract class AbstractCompletionDriverTest
 The actual suggestions do not match the expected suggestions$where.
 
 To accept the current state change the expectation to
-
-$actual
+\r${'-' * 64}
+\r${actual.trimRight().split('\n').join('\n\r')}
+\r${'-' * 64}
 ''');
     }
   }

pkg/analysis_server/test/services/completion/dart/declaration/type_member_test.dart

@@ -3400,8 +3400,8 @@ void f() {
 suggestions
   f0
     kind: methodInvocation
-    defaultArgumentList: x, (a, b) { }, y
-    defaultArgumentListRanges: [0, 1, 11, 1, 15, 1]
+    defaultArgumentList: x, closure, y
+    defaultArgumentListRanges: [0, 1, 3, 7, 12, 1]
 ''');
   }
 
@@ -3420,8 +3420,8 @@ void f() {
 suggestions
   f0
     kind: methodInvocation
-    defaultArgumentList: (a, b) => false
-    defaultArgumentListRanges: [10, 5]
+    defaultArgumentList: closure
+    defaultArgumentListRanges: [0, 7]
 ''');
   }
 
@@ -3440,8 +3440,8 @@ void f() {
 suggestions
   f0
     kind: methodInvocation
-    defaultArgumentList: (a, b) => null
-    defaultArgumentListRanges: [10, 4]
+    defaultArgumentList: closure
+    defaultArgumentListRanges: [0, 7]
 ''');
   }
 
@@ -3460,8 +3460,8 @@ void f() {
 suggestions
   f0
     kind: methodInvocation
-    defaultArgumentList: (a, b) { }
-    defaultArgumentListRanges: [8, 1]
+    defaultArgumentList: closure
+    defaultArgumentListRanges: [0, 7]
 ''');
   }