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

be aware of cascades when scraping type params for var replacement

Browse source 
Fixes: https://github.com/dart-lang/sdk/issues/44156

Change-Id: I5ceb69d4a3fa4bbc68cdb7af2f9eb065ac8ae0f4
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/171627
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
Commit-Queue: Phil Quitslund <pquitslund@google.com>
This commit is contained in:
pq 2020-11-11 21:08:29 +00:00 committed by commit-bot@chromium.org
parent e205acb506
commit c84ada0fd4
2 changed files with 33 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkg/analysis_server/lib/src/services/correction/dart/replace_with_var.dart
View file

@ -42,6 +42,9 @@ class ReplaceWithVar extends CorrectionProducer {
String typeArgumentsText;
int typeArgumentsOffset;
if (type is NamedType && type.typeArguments != null) {
if (initializer is CascadeExpression) {
initializer = (initializer as CascadeExpression).target;
}
if (initializer is TypedLiteral) {
if (initializer.typeArguments == null) {
typeArgumentsText = utils.getNodeText(type.typeArguments);

30
pkg/analysis_server/test/src/services/correction/fix/replace_with_var_test.dart
View file

@ -74,6 +74,21 @@ void f(List<int> list) {
''');
}
Future<void> test_generic_instanceCreation_cascade() async {
await resolveTestCode('''
Set f() {
Set<String> s = Set<String>()..addAll([]);
return s;
}
''');
await assertHasFix('''
Set f() {
var s = Set<String>()..addAll([]);
return s;
}
''');
}
Future<void> test_generic_instanceCreation_withArguments() async {
await resolveTestCode('''
C<int> f() {
@ -193,6 +208,21 @@ Set f() {
await assertNoFix();
}
Future<void> test_generic_setLiteral_cascade() async {
await resolveTestCode('''
Set f() {
Set<String> s = {}..addAll([]);
return s;
}
''');
await assertHasFix('''
Set f() {
var s = <String>{}..addAll([]);
return s;
}
''');
}
Future<void> test_generic_setLiteral_const() async {
await resolveTestCode('''
String f() {