Set TypeName type of unresolved class with prefixed identifier in instance creation.

scheglov · commit-bot@chromium.org · commit 7f483c067ca9 · 2020-02-29T00:24:50.000Z
It was crashing prefer_void_to_null lint. R=brianwilkerson@google.com Change-Id: Ie9301d53267f264907ecc9e84d0c9252532172e6 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/137827 Reviewed-by: Brian Wilkerson <brianwilkerson@google.com> Commit-Queue: Konstantin Shcheglov <scheglov@google.com>
diff --git a/pkg/analyzer/lib/src/dart/resolver/type_name_resolver.dart b/pkg/analyzer/lib/src/dart/resolver/type_name_resolver.dart
@@ -81,8 +81,8 @@ class TypeNameResolver {
     TypeArgumentList argumentList = node.typeArguments;
     Element element = nameScope.lookup(typeName, definingLibrary);
     if (element == null) {
+      node.type = dynamicType;
       if (nameScope.shouldIgnoreUndefined(typeName)) {
-        node.type = dynamicType;
         return;
       }
       //
@@ -102,7 +102,6 @@ class TypeNameResolver {
           element = nameScope.lookup(prefix, definingLibrary);
           if (element is PrefixElement) {
             if (nameScope.shouldIgnoreUndefined(typeName)) {
-              node.type = dynamicType;
               return;
             }
             AstNode grandParent = parent.parent;
@@ -143,7 +142,6 @@ class TypeNameResolver {
         }
       }
       if (nameScope.shouldIgnoreUndefined(typeName)) {
-        node.type = dynamicType;
         return;
       }
     }
diff --git a/pkg/analyzer/test/src/dart/resolution/type_name_test.dart b/pkg/analyzer/test/src/dart/resolution/type_name_test.dart
@@ -3,6 +3,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'package:analyzer/dart/analysis/features.dart';
+import 'package:analyzer/src/error/codes.dart';
 import 'package:analyzer/src/generated/engine.dart';
 import 'package:analyzer/src/test_utilities/find_element.dart';
 import 'package:test_reflective_loader/test_reflective_loader.dart';
@@ -133,6 +134,57 @@ f(F<int> a) {}
     );
   }
 
+  test_instanceCreation_explicitNew_prefix_unresolvedClass() async {
+    await assertErrorsInCode(r'''
+import 'dart:math' as math;
+
+main() {
+  new math.A();
+}
+''', [
+      error(StaticWarningCode.NEW_WITH_NON_TYPE, 49, 1),
+    ]);
+
+    assertTypeName(
+      findNode.typeName('A();'),
+      null,
+      'dynamic',
+      expectedPrefix: findElement.prefix('math'),
+    );
+  }
+
+  test_instanceCreation_explicitNew_resolvedClass() async {
+    await assertNoErrorsInCode(r'''
+class A {}
+
+main() {
+  new A();
+}
+''');
+
+    assertTypeName(
+      findNode.typeName('A();'),
+      findElement.class_('A'),
+      typeStr('A', 'A*'),
+    );
+  }
+
+  test_instanceCreation_explicitNew_unresolvedClass() async {
+    await assertErrorsInCode(r'''
+main() {
+  new A();
+}
+''', [
+      error(CompileTimeErrorCode.UNDEFINED_CLASS, 15, 1),
+    ]);
+
+    assertTypeName(
+      findNode.typeName('A();'),
+      null,
+      'dynamic',
+    );
+  }
+
   test_never() async {
     await assertNoErrorsInCode(r'''
 f(Never a) {}

Original file line number	Diff line number	Diff line change
`@@ -81,8 +81,8 @@ class TypeNameResolver {`
`81`	`81`	`TypeArgumentList argumentList = node.typeArguments;`
`82`	`82`	`Element element = nameScope.lookup(typeName, definingLibrary);`
`83`	`83`	`if (element == null) {`
	`84`	`+ node.type = dynamicType;`
`84`	`85`	`if (nameScope.shouldIgnoreUndefined(typeName)) {`
`85`		`- node.type = dynamicType;`
`86`	`86`	`return;`
`87`	`87`	`}`
`88`	`88`	`//`
`@@ -102,7 +102,6 @@ class TypeNameResolver {`
`102`	`102`	`element = nameScope.lookup(prefix, definingLibrary);`
`103`	`103`	`if (element is PrefixElement) {`
`104`	`104`	`if (nameScope.shouldIgnoreUndefined(typeName)) {`
`105`		`- node.type = dynamicType;`
`106`	`105`	`return;`
`107`	`106`	`}`
`108`	`107`	`AstNode grandParent = parent.parent;`
`@@ -143,7 +142,6 @@ class TypeNameResolver {`
`143`	`142`	`}`
`144`	`143`	`}`
`145`	`144`	`if (nameScope.shouldIgnoreUndefined(typeName)) {`
`146`		`- node.type = dynamicType;`
`147`	`145`	`return;`
`148`	`146`	`}`
`149`	`147`	`}`