Skip to content

Commit 73a85ec

Browse files
scheglovCommit Queue
authored andcommitted
Elements. Deprecate FragmentImpl.name
Next I will remove it completely. And instead require `name2` as the constructor formal parameter. Change-Id: Ib4afac3266fe36a7299d60a8b6d87c99349dd64c Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/432125 Reviewed-by: Brian Wilkerson <[email protected]> Reviewed-by: Paul Berry <[email protected]> Commit-Queue: Konstantin Shcheglov <[email protected]>
1 parent 65d0d85 commit 73a85ec

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+311
-249
lines changed

pkg/analysis_server/lib/src/lsp/mapping.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -537,7 +537,7 @@ lsp.Location? fragmentToLocation(
537537
) when isSynthetic) {
538538
var element = nonSynthetic;
539539
nameOffset = element.nameOffset.nullIfNegative;
540-
nameLength = element.name?.length;
540+
nameLength = element.name2?.length;
541541
} else {
542542
nameOffset = fragment.nameOffset2;
543543
nameLength = fragment.name2?.length;

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import 'package:analyzer/dart/element/nullability_suffix.dart';
1515
import 'package:analyzer/dart/element/type.dart';
1616
import 'package:analyzer/source/source.dart';
1717
import 'package:analyzer/src/utilities/extensions/flutter.dart';
18-
import 'package:analyzer/src/utilities/extensions/string.dart';
1918
import 'package:analyzer_plugin/protocol/protocol_common.dart'
2019
as protocol
2120
show Element, ElementKind;
@@ -183,7 +182,7 @@ DefaultArgument? getDefaultStringParameterValue(
183182
var params = type.formalParameters.indexed
184183
.map((r) {
185184
var (index, parameter) = r;
186-
var name = parameter.displayName.ifNotEmptyOrElse('p${index + 1}');
185+
var name = parameter.name3 ?? 'p${index + 1}';
187186
return '${getTypeString(parameter.type)}$name';
188187
})
189188
.join(', ');

pkg/analysis_server/test/src/services/correction/fix/make_return_type_nullable_test.dart

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// BSD-style license that can be found in the LICENSE file.
44

55
import 'package:analysis_server/src/services/correction/fix.dart';
6-
import 'package:analyzer/src/error/codes.dart';
76
import 'package:analyzer_plugin/utilities/fixes/fixes.dart';
87
import 'package:test_reflective_loader/test_reflective_loader.dart';
98

@@ -87,24 +86,6 @@ class C {
8786
''');
8887
}
8988

90-
/// This code is parsed in such a way that we find `void` as an `Expression`.
91-
/// But this expression is a name in a `NamedType`, and so `NamedType` has
92-
/// the `type`, but not `void` - its type is `null`. So, the producer should
93-
/// check for `null`, and don't expect that every expression has a type.
94-
Future<void> test_getter_sync_invalidVoid() async {
95-
await resolveTestCode('''
96-
int f() {
97-
return void;
98-
}
99-
''');
100-
await assertNoFix(
101-
errorFilter:
102-
(e) =>
103-
e.errorCode ==
104-
CompileTimeErrorCode.RETURN_OF_INVALID_TYPE_FROM_FUNCTION,
105-
);
106-
}
107-
10889
Future<void> test_incompatibilityIsNotLimitedToNullability() async {
10990
await resolveTestCode('''
11091
int f() {

pkg/analyzer/lib/src/dart/ast/ast.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6408,7 +6408,7 @@ final class DeclaredVariablePatternImpl extends VariablePatternImpl
64086408
context,
64096409
this,
64106410
declaredElement2!,
6411-
declaredFragment!.name,
6411+
declaredFragment!.name2 ?? '',
64126412
type?.typeOrThrow.wrapSharedTypeView(),
64136413
);
64146414
declaredElement2!.type = result.staticType.unwrapTypeView();

pkg/analyzer/lib/src/dart/constant/evaluation.dart

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -229,10 +229,10 @@ class ConstantEvaluationEngine {
229229
if (constant is ConstFieldFragmentImpl && constant.isEnumConstant) {
230230
var enclosing = constant.enclosingElement3;
231231
if (enclosing is EnumFragmentImpl) {
232-
if (enclosing.name == 'values') {
232+
if (enclosing.name2 == 'values') {
233233
return;
234234
}
235-
if (constant.name == enclosing.name) {
235+
if (constant.name2 == enclosing.name2) {
236236
return;
237237
}
238238
}
@@ -490,7 +490,7 @@ class ConstantEvaluationEngine {
490490
if (enum_ is EnumFragmentImpl) {
491491
var index = enum_.constants.indexOf(element);
492492
assert(index >= 0);
493-
return _EnumConstant(index: index, name: element.name);
493+
return _EnumConstant(index: index, name: element.name2 ?? '');
494494
}
495495
}
496496
return null;
@@ -2875,7 +2875,7 @@ class _InstanceCreationEvaluator {
28752875
Constant evaluateFactoryConstructorCall(List<Expression> arguments) {
28762876
var definingClass = _constructor.asElement2.enclosingElement;
28772877
var argumentCount = arguments.length;
2878-
if (_constructor.name == "fromEnvironment") {
2878+
if (_constructor.name2 == "fromEnvironment") {
28792879
if (!_checkFromEnvironmentArguments(arguments, definingType)) {
28802880
return InvalidConstant.forEntity(
28812881
entity: _errorNode,
@@ -2908,14 +2908,14 @@ class _InstanceCreationEvaluator {
29082908
_declaredVariables,
29092909
).getString2(variableName, _namedValues, _constructor.asElement2);
29102910
}
2911-
} else if (_constructor.name == 'hasEnvironment' &&
2911+
} else if (_constructor.name2 == 'hasEnvironment' &&
29122912
definingClass == typeProvider.boolElement2) {
29132913
var name = argumentCount < 1 ? null : firstArgument?.toStringValue();
29142914
return FromEnvironmentEvaluator(
29152915
typeSystem,
29162916
_declaredVariables,
29172917
).hasEnvironment(name);
2918-
} else if (_constructor.name == "" &&
2918+
} else if (_constructor.name2 == 'new' &&
29192919
definingClass == typeProvider.symbolElement2 &&
29202920
argumentCount == 1) {
29212921
if (!_checkSymbolArguments(arguments)) {
@@ -2993,7 +2993,7 @@ class _InstanceCreationEvaluator {
29932993
SimpleIdentifierImpl(
29942994
token: StringToken(
29952995
TokenType.STRING,
2996-
parameter.name,
2996+
parameter.name2 ?? '',
29972997
parameter.nameOffset,
29982998
),
29992999
)
@@ -3008,7 +3008,7 @@ class _InstanceCreationEvaluator {
30083008
label: SimpleIdentifierImpl(
30093009
token: StringToken(
30103010
TokenType.STRING,
3011-
parameter.name,
3011+
parameter.name2 ?? '',
30123012
parameter.nameOffset,
30133013
),
30143014
)..element = parameter.asElement2,
@@ -3051,13 +3051,13 @@ class _InstanceCreationEvaluator {
30513051
CompileTimeErrorCode.CONST_CONSTRUCTOR_FIELD_TYPE_MISMATCH,
30523052
arguments: [
30533053
fieldValue.type.getDisplayString(),
3054-
field.name,
3054+
field.name2 ?? '',
30553055
fieldType.getDisplayString(),
30563056
],
30573057
isRuntimeException: isRuntimeException,
30583058
);
30593059
}
3060-
_fieldMap[field.name] = fieldValue;
3060+
_fieldMap[field.name2 ?? ''] = fieldValue;
30613061
}
30623062
}
30633063
return null;
@@ -3326,8 +3326,8 @@ class _InstanceCreationEvaluator {
33263326
DartObjectImpl? argumentValue;
33273327
AstNode? errorTarget;
33283328
if (baseParameter.isNamed) {
3329-
argumentValue = _namedValues[baseParameter.name];
3330-
errorTarget = _namedNodes[baseParameter.name];
3329+
argumentValue = _namedValues[baseParameter.name2 ?? ''];
3330+
errorTarget = _namedNodes[baseParameter.name2 ?? ''];
33313331
} else if (i < _argumentValues.length) {
33323332
argumentValue = _argumentValues[i];
33333333
errorTarget = arguments[i];
@@ -3392,7 +3392,7 @@ class _InstanceCreationEvaluator {
33923392
);
33933393
}
33943394
}
3395-
var fieldName = field.name;
3395+
var fieldName = field.name2 ?? '';
33963396
if (_fieldMap.containsKey(fieldName)) {
33973397
return InvalidConstant.forEntity(
33983398
entity: _errorNode,
@@ -3403,7 +3403,7 @@ class _InstanceCreationEvaluator {
34033403
_fieldMap[fieldName] = argumentValue;
34043404
}
34053405
}
3406-
_parameterMap[baseParameter.name] = argumentValue;
3406+
_parameterMap[baseParameter.name2 ?? ''] = argumentValue;
34073407
}
34083408
}
34093409
return null;

pkg/analyzer/lib/src/dart/element/display_string_builder.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@ class ElementDisplayStringBuilder {
3737
String toString() => _buffer.toString();
3838

3939
void writeAbstractElement(FragmentImpl element) {
40-
_write(element.name ?? '<unnamed $runtimeType>');
40+
_write(element.name2 ?? '<unnamed ${element.runtimeType}>');
4141
}
4242

4343
void writeAbstractElement2(ElementImpl2 element) {
44-
_write(element.name3 ?? '<unnamed $runtimeType>');
44+
_write(element.name3 ?? '<unnamed ${element.runtimeType}>');
4545
}
4646

4747
void writeClassElement(ClassFragmentImpl element) {
@@ -162,7 +162,7 @@ class ElementDisplayStringBuilder {
162162
_write('(');
163163
_writeType(element.representation.type);
164164
_write(' ');
165-
_write(element.representation.name);
165+
_write(element.representation.name2 ?? '<null-name}>');
166166
_write(')');
167167

168168
_writeTypesIfNotEmpty(' implements ', element.interfaces);

0 commit comments

Comments
 (0)