fix offset for var replacement in const collection literals

Fixes: dart-lang/sdk#43895

Change-Id: Iaea95178505859f33ed44d36b8a902cc135e5023
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/168880
Commit-Queue: Phil Quitslund <pquitslund@google.com>
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>

Author: pq

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

@@ -45,7 +45,11 @@ class ReplaceWithVar extends CorrectionProducer {
         if (initializer is TypedLiteral) {
           if (initializer.typeArguments == null) {
             typeArgumentsText = utils.getNodeText(type.typeArguments);
-            typeArgumentsOffset = initializer.offset;
+            if (initializer is ListLiteral) {
+              typeArgumentsOffset = initializer.leftBracket.offset;
+            } else if (initializer is SetOrMapLiteral) {
+              typeArgumentsOffset = initializer.leftBracket.offset;
+            }
           }
         } else if (initializer is InstanceCreationExpression) {
           if (initializer.constructorName.type.typeArguments == null) {

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

@@ -123,6 +123,21 @@ List f() {
 ''');
   }
 
+  Future<void> test_generic_listLiteral_const() async {
+    await resolveTestUnit('''
+String f() {
+  const List<String> values = const ['a'];
+  return values[0];
+}
+''');
+    await assertHasFix('''
+String f() {
+  const values = const <String>['a'];
+  return values[0];
+}
+''');
+  }
+
   Future<void> test_generic_mapLiteral() async {
     await resolveTestUnit('''
 Map f() {
@@ -138,6 +153,21 @@ Map f() {
 ''');
   }
 
+  Future<void> test_generic_mapLiteral_const() async {
+    await resolveTestUnit('''
+Map f() {
+  const Map<String, int> m = const {};
+  return m;
+}
+''');
+    await assertHasFix('''
+Map f() {
+  const m = const <String, int>{};
+  return m;
+}
+''');
+  }
+
   Future<void> test_generic_setLiteral() async {
     await resolveTestUnit('''
 Set f() {
@@ -163,6 +193,21 @@ Set f() {
     await assertNoFix();
   }
 
+  Future<void> test_generic_setLiteral_const() async {
+    await resolveTestUnit('''
+String f() {
+  const Set<String> s = const {'a'};
+  return s.first;
+}
+''');
+    await assertHasFix('''
+String f() {
+  const s = const <String>{'a'};
+  return s.first;
+}
+''');
+  }
+
   Future<void> test_simple() async {
     await resolveTestUnit('''
 String f() {