languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-11-05 18:22:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove containingMemberName parameters from SuggestionBuilder

Browse source 
Change-Id: I5dc85773deffe98fd5d8308b0d4c8fe350a385f3
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/146063
Reviewed-by: Jaime Wren <jwren@google.com>
This commit is contained in:
Brian Wilkerson 2020-05-04 16:23:30 +00:00
parent 018fa4ef46
commit c562a628bd
2 changed files with 16 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
pkg/analysis_server/lib/src/services/completion/dart/suggestion_builder.dart
View file

@ -214,13 +214,11 @@ class MemberSuggestionBuilder {
/// Add a suggestion for the given [accessor].
void addSuggestionForAccessor(
{@required PropertyAccessorElement accessor,
String containingMethodName,
@required double inheritanceDistance}) {
if (accessor.isAccessibleIn(request.libraryElement)) {
var member = accessor.isSynthetic ? accessor.variable : accessor;
if (_shouldAddSuggestion(member)) {
builder.suggestAccessor(accessor,
containingMemberName: containingMethodName,
inheritanceDistance: inheritanceDistance);
}
}
@ -229,15 +227,12 @@ class MemberSuggestionBuilder {
/// Add a suggestion for the given [method].
void addSuggestionForMethod(
{@required MethodElement method,
String containingMethodName,
CompletionSuggestionKind kind,
@required double inheritanceDistance}) {
if (method.isAccessibleIn(request.libraryElement) &&
_shouldAddSuggestion(method)) {
builder.suggestMethod(method,
containingMemberName: containingMethodName,
kind: kind,
inheritanceDistance: inheritanceDistance);
kind: kind, inheritanceDistance: inheritanceDistance);
}
}
@ -376,9 +371,7 @@ class SuggestionBuilder {
/// distance feature computed for the accessor (or `-1.0` if the accessor is a
/// static accessor).
void suggestAccessor(PropertyAccessorElement accessor,
{String containingMemberName, @required double inheritanceDistance}) {
// TODO(brianwilkerson) Remove [containingMemberName].
containingMemberName ??= _containingMemberName;
{@required double inheritanceDistance}) {
assert(accessor.enclosingElement is ClassElement ||
accessor.enclosingElement is ExtensionElement);
if (accessor.isSynthetic) {
@ -388,9 +381,7 @@ class SuggestionBuilder {
if (accessor.isGetter) {
var variable = accessor.variable;
if (variable is FieldElement) {
suggestField(variable,
containingMemberName: containingMemberName,
inheritanceDistance: inheritanceDistance);
suggestField(variable, inheritanceDistance: inheritanceDistance);
}
}
} else {
@ -407,7 +398,7 @@ class SuggestionBuilder {
var startsWithDollar =
featureComputer.startsWithDollarFeature(accessor.name);
var superMatches = featureComputer.superMatchesFeature(
containingMemberName, accessor.name);
_containingMemberName, accessor.name);
relevance = _computeMemberRelevance(
contextType: contextType,
elementKind: elementKind,
@ -587,9 +578,7 @@ class SuggestionBuilder {
/// value of the inheritance distance feature computed for the field (or
/// `-1.0` if the field is a static field).
void suggestField(FieldElement field,
{String containingMemberName, @required double inheritanceDistance}) {
// TODO(brianwilkerson) Remove [containingMemberName].
containingMemberName ??= _containingMemberName;
{@required double inheritanceDistance}) {
int relevance;
if (request.useNewRelevance) {
var featureComputer = request.featureComputer;
@ -600,8 +589,8 @@ class SuggestionBuilder {
var hasDeprecated = featureComputer.hasDeprecatedFeature(field);
var startsWithDollar =
featureComputer.startsWithDollarFeature(field.name);
var superMatches =
featureComputer.superMatchesFeature(containingMemberName, field.name);
var superMatches = featureComputer.superMatchesFeature(
_containingMemberName, field.name);
relevance = _computeMemberRelevance(
contextType: contextType,
elementKind: elementKind,
@ -721,11 +710,7 @@ class SuggestionBuilder {
/// used as the kind for the suggestion. The [inheritanceDistance] is the
/// value of the inheritance distance feature computed for the method.
void suggestMethod(MethodElement method,
{String containingMemberName,
CompletionSuggestionKind kind,
@required double inheritanceDistance}) {
// TODO(brianwilkerson) Remove [containingMemberName].
containingMemberName ??= _containingMemberName;
{CompletionSuggestionKind kind, @required double inheritanceDistance}) {
// TODO(brianwilkerson) Refactor callers so that we're passing in the type
// of the target (assuming we don't already have that type available via
// the [request]) and compute the [inheritanceDistance] in this method.
@ -740,7 +725,7 @@ class SuggestionBuilder {
var startsWithDollar =
featureComputer.startsWithDollarFeature(method.name);
var superMatches = featureComputer.superMatchesFeature(
containingMemberName, method.name);
_containingMemberName, method.name);
relevance = _computeMemberRelevance(
contextType: contextType,
elementKind: elementKind,
@ -749,8 +734,7 @@ class SuggestionBuilder {
startsWithDollar: startsWithDollar,
superMatches: superMatches);
} else {
relevance = _computeOldMemberRelevance(method,
containingMethodName: containingMemberName);
relevance = _computeOldMemberRelevance(method);
if (request.opType.includeReturnValueSuggestions) {
relevance = request.opType
.returnValueSuggestionsFilter(method.returnType, relevance);
@ -971,13 +955,10 @@ class SuggestionBuilder {
}
/// Compute the old relevance score for a member.
int _computeOldMemberRelevance(Element member,
{String containingMethodName}) {
// TODO(brianwilkerson) Remove [containingMethodName].
containingMethodName ??= _containingMemberName;
int _computeOldMemberRelevance(Element member) {
if (member.hasOrInheritsDeprecated) {
return DART_RELEVANCE_LOW;
} else if (member.name == containingMethodName) {
} else if (member.name == _containingMemberName) {
// Boost the relevance of a super expression calling a method of the
// same name as the containing method.
return DART_RELEVANCE_HIGH;

23
pkg/analysis_server/lib/src/services/completion/dart/type_member_contributor.dart
View file

@ -74,7 +74,6 @@ class TypeMemberContributor extends DartCompletionContributor {
}
}
}
String containingMethodName;
List<InterfaceType> mixins;
List<InterfaceType> superclassConstraints;
if (expression is SuperExpression && type is InterfaceType) {
@ -82,16 +81,6 @@ class TypeMemberContributor extends DartCompletionContributor {
mixins = (type as InterfaceType).mixins;
superclassConstraints = (type as InterfaceType).superclassConstraints;
type = (type as InterfaceType).superclass;
// Determine the name of the containing method because the most likely
// completion is a super expression with same name.
var containingMethod =
expression.thisOrAncestorOfType<MethodDeclaration>();
if (containingMethod != null) {
var id = containingMethod.name;
if (id != null) {
containingMethodName = id.name;
}
}
}
if (type == null || type.isDynamic) {
// Suggest members from object if target is "dynamic".
@ -101,7 +90,7 @@ class TypeMemberContributor extends DartCompletionContributor {
// Build the suggestions.
if (type is InterfaceType) {
var memberBuilder = _SuggestionBuilder(request, builder);
memberBuilder.buildSuggestions(type, containingMethodName,
memberBuilder.buildSuggestions(type,
mixins: mixins, superclassConstraints: superclassConstraints);
} else if (type is FunctionType) {
builder.suggestFunctionCall();
@ -240,7 +229,7 @@ class _SuggestionBuilder extends MemberSuggestionBuilder {
/// Return completion suggestions for 'dot' completions on the given [type].
/// If the 'dot' completion is a super expression, then [containingMethodName]
/// is the name of the method in which the completion is requested.
void buildSuggestions(InterfaceType type, String containingMethodName,
void buildSuggestions(InterfaceType type,
{List<InterfaceType> mixins, List<InterfaceType> superclassConstraints}) {
// Visit all of the types in the class hierarchy, collecting possible
// completions. If multiple elements are found that complete to the same
@ -263,17 +252,13 @@ class _SuggestionBuilder extends MemberSuggestionBuilder {
// Exclude static methods when completion on an instance.
if (!method.isStatic) {
addSuggestionForMethod(
method: method,
containingMethodName: containingMethodName,
inheritanceDistance: inheritanceDistance);
method: method, inheritanceDistance: inheritanceDistance);
}
}
for (var accessor in targetType.accessors) {
if (!accessor.isStatic) {
addSuggestionForAccessor(
accessor: accessor,
containingMethodName: containingMethodName,
inheritanceDistance: inheritanceDistance);
accessor: accessor, inheritanceDistance: inheritanceDistance);
}
}
if (targetType.isDartCoreFunction) {