Only add const in a constant context (issue 32819)

Change-Id: Ia149d812d2540fa98d76765ffb8b54fe32ecf010
Reviewed-on: https://dart-review.googlesource.com/50120
Commit-Queue: Brian Wilkerson <[email protected]>
Reviewed-by: Konstantin Shcheglov <[email protected]>

Author: bwilkerson

pkg/analysis_server/test/analysis/get_hover_test.dart

@@ -556,7 +556,7 @@ class A {
   const A(int i);
 }
 main() {
-  var a = A(0);
+  const a = A(0);
 }
 ''');
     HoverInformation hover = await prepareHover('A(0)');

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

@@ -6558,7 +6558,7 @@ class InstanceCreationExpressionImpl extends ExpressionImpl
     if (!isImplicit) {
       return keyword.keyword == Keyword.CONST;
     } else {
-      return inConstantContext || canBeConst();
+      return inConstantContext;
     }
   }
 

pkg/analyzer/test/src/dart/ast/ast_test.dart

@@ -49,34 +49,40 @@ class C {
     assertInContext("C(0", true);
   }
 
-  test_inConstantContext_instanceCreation_functionLiteral() {
+  test_inConstantContext_instanceCreation_fieldWithConstConstructor() {
     parse('''
-const V = () => C();
 class C {
+  final d = D();
   const C();
 }
+class D {
+  const D();
+}
 ''');
-    assertInContext("C()", false);
+    assertInContext("D()", false);
   }
 
-  test_inConstantContext_instanceCreation_initializer_false() {
+  test_inConstantContext_instanceCreation_fieldWithoutConstConstructor() {
     parse('''
-var c = C();
 class C {
-  const C();
+  final d = D();
+  C();
+}
+class D {
+  const D();
 }
 ''');
-    assertInContext("C()", false);
+    assertInContext("D()", false);
   }
 
-  test_inConstantContext_instanceCreation_initializer_true() {
+  test_inConstantContext_instanceCreation_functionLiteral() {
     parse('''
-const c = C();
+const V = () => C();
 class C {
   const C();
 }
 ''');
-    assertInContext("C()", true);
+    assertInContext("C()", false);
   }
 
   test_inConstantContext_instanceCreation_instanceCreation_false() {
@@ -216,6 +222,26 @@ class C {
     assertInContext("C()", true);
   }
 
+  test_inConstantContext_instanceCreation_topLevelVariable_false() {
+    parse('''
+var c = C();
+class C {
+  const C();
+}
+''');
+    assertInContext("C()", false);
+  }
+
+  test_inConstantContext_instanceCreation_topLevelVariable_true() {
+    parse('''
+const c = C();
+class C {
+  const C();
+}
+''');
+    assertInContext("C()", true);
+  }
+
   test_inConstantContext_listLiteral_annotation_true() {
     parse('''
 @C([])
@@ -475,7 +501,7 @@ class C {
   const C.c();
 }
 ''');
-    assertIsConst("C(C", true);
+    assertIsConst("C(C", false);
   }
 
   void test_isConst_notInContext_constructor_const_constParam_named() async {
@@ -486,7 +512,7 @@ class C {
   const C({c});
 }
 ''');
-    assertIsConst("C(c", true);
+    assertIsConst("C(c", false);
   }
 
   void
@@ -498,7 +524,7 @@ class C {
   const C({c});
 }
 ''');
-    assertIsConst("C(c", true);
+    assertIsConst("C(c", false);
   }
 
   void test_isConst_notInContext_constructor_const_constParam_parens() async {
@@ -510,7 +536,7 @@ class C {
   const C.c();
 }
 ''');
-    assertIsConst("C( (", true);
+    assertIsConst("C( (", false);
   }
 
   void test_isConst_notInContext_constructor_const_generic_named() async {
@@ -521,7 +547,7 @@ class C<E> {
   const C.n();
 }
 ''');
-    assertIsConst("C<int>.n", true);
+    assertIsConst("C<int>.n", false);
   }
 
   void
@@ -536,7 +562,7 @@ class C<E> {
 import 'c.dart' as p;
 f() => <Object>[p.C<int>.n()];
 ''');
-    assertIsConst("C<int>", true);
+    assertIsConst("C<int>", false);
   }
 
   void test_isConst_notInContext_constructor_const_generic_unnamed() async {
@@ -547,7 +573,7 @@ class C<E> {
   const C();
 }
 ''');
-    assertIsConst("C<int>", true);
+    assertIsConst("C<int>", false);
   }
 
   void
@@ -562,7 +588,7 @@ class C<E> {
 import 'c.dart' as p;
 f() => <Object>[p.C<int>()];
 ''');
-    assertIsConst("C<int>", true);
+    assertIsConst("C<int>", false);
   }
 
   void
@@ -605,7 +631,7 @@ class C<E> {
   const C.n();
 }
 ''');
-    assertIsConst("C.n()", true);
+    assertIsConst("C.n()", false);
   }
 
   void
@@ -620,7 +646,7 @@ class C {
 import 'c.dart' as p;
 f() => <Object>[p.C.n()];
 ''');
-    assertIsConst("C.n()", true);
+    assertIsConst("C.n()", false);
   }
 
   void test_isConst_notInContext_constructor_const_nonGeneric_unnamed() async {
@@ -631,7 +657,7 @@ class C {
   const C();
 }
 ''');
-    assertIsConst("C()", true);
+    assertIsConst("C()", false);
   }
 
   void
@@ -646,7 +672,7 @@ class C {
 import 'c.dart' as p;
 f() => <Object>[p.C()];
 ''');
-    assertIsConst("C()", true);
+    assertIsConst("C()", false);
   }
 
   void test_isConst_notInContext_constructor_nonConst() async {

tests/language_2/language_2_dartdevc.status

@@ -70,9 +70,6 @@ implicit_creation/implicit_const_context_constructor_generic_named_test: Compile
 implicit_creation/implicit_const_context_constructor_generic_test: CompileTimeError
 implicit_creation/implicit_const_context_prefix_constructor_generic_named_test: CompileTimeError
 implicit_creation/implicit_const_context_prefix_constructor_generic_test: CompileTimeError
-implicit_creation/implicit_new_or_const_composite_test: RuntimeError
-implicit_creation/implicit_new_or_const_generic_test: RuntimeError
-implicit_creation/implicit_new_or_const_test: RuntimeError
 implicit_downcast_during_compound_assignment_test: RuntimeError
 implicit_downcast_during_indexed_compound_assignment_test: RuntimeError
 implicit_downcast_during_indexed_if_null_assignment_test: RuntimeError