NamedType: resolve to NoResolvedType for typeof UnknownTypeName

Previously such types were resolved to `?`, which doesn't provide
enough information for clutz to correctly generate `typeof` references
for its .d.ts output file.

PiperOrigin-RevId: 326076424

Author: brad4d

src/com/google/javascript/rhino/jstype/NamedType.java

@@ -334,18 +334,8 @@ private boolean resolveTypeof(ErrorReporter reporter) {
     String scopeName = reference.substring("typeof ".length());
     JSType type = resolutionScope.lookupQualifiedName(QualifiedName.of(scopeName));
     if (type == null || type.isUnknownType()) {
-      if (registry.isForwardDeclaredType(scopeName)) {
-        // Preserve the "typeof" as a `NoResolvedType`.
-        // This is depended on by Clutz so it can generate `typeof ImportedType` instead of `any`
-        // when `ImportedType` is not defined in the files it can see.
-        setReferencedType(new NoResolvedType(registry, getReferenceName(), getTemplateTypes()));
-        if (validator != null) {
-          validator.apply(getReferencedType());
-        }
-      } else {
-        warning(reporter, "Missing type for `typeof` value. The value must be declared and const.");
-        setReferencedAndResolvedType(registry.getNativeType(JSTypeNative.UNKNOWN_TYPE), reporter);
-      }
+      warning(reporter, "Missing type for `typeof` value. The value must be declared and const.");
+      setReferencedAndResolvedType(registry.getNativeType(JSTypeNative.UNKNOWN_TYPE), reporter);
     } else {
       if (type.isLiteralObject()) {
         // Create an extra layer of wrapping so that the "typeof" name is preserved for namespaces.

src/com/google/javascript/rhino/testing/BaseJSTypeTestCase.java

@@ -60,11 +60,12 @@
 
 /** A base class for tests on {@code JSType}s. */
 public abstract class BaseJSTypeTestCase {
+  protected static final String FORWARD_DECLARED_TYPE_NAME = "forwardDeclared";
 
   protected static final Joiner LINE_JOINER = Joiner.on('\n');
 
   protected final TestErrorReporter errorReporter = new TestErrorReporter();
-  protected JSTypeRegistry registry;
+  protected final JSTypeRegistry registry;
 
   protected JSType ALL_TYPE;
   protected ObjectType NO_OBJECT_TYPE;
@@ -120,16 +121,11 @@ public BaseJSTypeTestCase() {
   public BaseJSTypeTestCase(JSTypeRegistry registry) {
     this.registry =
         (registry == null)
-            ? new JSTypeRegistry(errorReporter, ImmutableSet.of())
+            ? new JSTypeRegistry(errorReporter, ImmutableSet.of(FORWARD_DECLARED_TYPE_NAME))
             : registry;
     initTypes();
   }
 
-  protected void resetRegistryWithForwardDeclaredName(String name) {
-    this.registry = new JSTypeRegistry(errorReporter, ImmutableSet.of(name));
-    initTypes();
-  }
-
   @After
   public void validateWarningsAndErrors() {
     errorReporter.verifyHasEncounteredAllWarningsAndErrors();

src/com/google/javascript/rhino/testing/TypeSubject.java

@@ -130,11 +130,6 @@ public void isNotUnknown() {
     check("isUnknownType()").that(actualNonNull().isUnknownType()).isFalse();
   }
 
-  public void isNoResolvedType(String referenceName) {
-    check("isNoResolvedType()").that(actual.isNoResolvedType()).isTrue();
-    getReferenceNameIsEqualTo(referenceName);
-  }
-
   public void isNotEmpty() {
     check("isEmptyType()").that(actualNonNull().isEmptyType()).isFalse();
   }

test/com/google/javascript/rhino/jstype/JSTypeTest.java

@@ -103,7 +103,6 @@ public class JSTypeTest extends BaseJSTypeTestCase {
   @Before
   @SuppressWarnings({"MustBeClosedChecker"})
   public void setUp() throws Exception {
-    resetRegistryWithForwardDeclaredName("forwardDeclared");
     try (JSTypeResolver.Closer closer = this.registry.getResolver().openForDefinition()) {
       final ObjectType googObject = registry.createAnonymousObjectType(null);
       MapBasedScope scope = new MapBasedScope(ImmutableMap.of("goog", googObject));

test/com/google/javascript/rhino/jstype/NamedTypeTest.java

@@ -55,6 +55,7 @@
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
+/** @author [email protected] (Nick Santos) */
 @RunWith(JUnit4.class)
 public class NamedTypeTest extends BaseJSTypeTestCase {
 
@@ -115,11 +116,9 @@ public void testResolutionPropagatesNamedTypePropertiesToResolvedType() {
 
   @Test
   public void testStateOfForwardDeclaredType_Unresolved() {
-    resetRegistryWithForwardDeclaredName("forwardDeclared");
-
     try (JSTypeResolver.Closer closer = this.registry.getResolver().openForDefinition()) {
       // Given
-      NamedType type = namedTypeBuilder("forwardDeclared").build();
+      NamedType type = namedTypeBuilder(FORWARD_DECLARED_TYPE_NAME).build();
 
       // Then
       assertThat(type.isResolved()).isFalse();
@@ -131,10 +130,8 @@ public void testStateOfForwardDeclaredType_Unresolved() {
 
   @Test
   public void testStateOfForwardDeclaredType_UnsuccesfullyResolved() {
-    resetRegistryWithForwardDeclaredName("forwardDeclared");
-
     // Given
-    NamedType type = namedTypeBuilder("forwardDeclared").build();
+    NamedType type = namedTypeBuilder(FORWARD_DECLARED_TYPE_NAME).build();
 
     // Then
     assertThat(type.isUnsuccessfullyResolved()).isTrue();
@@ -361,18 +358,6 @@ public void testBuilderForTypeof_emitsUnrecognizedTypeError() {
         "Missing type for `typeof` value. The value must be declared and const.");
   }
 
-  @Test
-  public void testBuilderForTypeof_yieldsNoResolvedTypeWithForwardDeclaredName() {
-    resetRegistryWithForwardDeclaredName("Foo");
-
-    NamedType.Builder typeofFooBuilder = NamedType
-        .builder(registry, "typeof Foo")
-        .setScope(emptyScope())
-        .setResolutionKind(ResolutionKind.TYPEOF);
-
-    assertType(typeofFooBuilder.build()).isNoResolvedType("typeof Foo");
-  }
-
   @Test
   public void testBuilderForTypeof_requiresReferenceToStartWithTypeof() {
     NamedType.Builder typeofFooBuilder = NamedType.builder(registry, "Foo")