Rename FunctionTypeI#getSubTypes to getDirectSubTypes.

------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=160461241
google · Jun 29, 2017 · b9f92fc · b9f92fc
1 parent e625c6a
commit b9f92fc
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 11 deletions.
diff --git a/src/com/google/javascript/jscomp/AmbiguateProperties.java b/src/com/google/javascript/jscomp/AmbiguateProperties.java
@@ -302,7 +302,7 @@ private void computeRelatedTypes(TypeI type) {
     // A class/interface is related to its subclasses/implementors.
     FunctionTypeI constructor = type.toMaybeObjectType().getConstructor();
     if (constructor != null) {
-      for (FunctionTypeI subType : constructor.getSubTypes()) {
+      for (FunctionTypeI subType : constructor.getDirectSubTypes()) {
         addRelatedInstance(subType, related);
       }
     }

diff --git a/src/com/google/javascript/jscomp/DisambiguateProperties.java b/src/com/google/javascript/jscomp/DisambiguateProperties.java
@@ -891,7 +891,7 @@ private Iterable<? extends TypeI> getTypeAlternatives(TypeI type) {
       FunctionTypeI constructor = objType != null ? objType.getConstructor() : null;
       if (constructor != null && constructor.isInterface()) {
         List<TypeI> list = new ArrayList<>();
-        for (FunctionTypeI impl : constructor.getSubTypes()) {
+        for (FunctionTypeI impl : constructor.getDirectSubTypes()) {
           list.add(impl.getInstanceType());
         }
         return list.isEmpty() ? null : list;

diff --git a/src/com/google/javascript/jscomp/newtypes/JSType.java b/src/com/google/javascript/jscomp/newtypes/JSType.java
@@ -1867,7 +1867,7 @@ public final Node getSource() {
   }
 
   @Override
-  public final Collection<FunctionTypeI> getSubTypes() {
+  public final Collection<FunctionTypeI> getDirectSubTypes() {
     Preconditions.checkState(this.isConstructor() || this.isInterface());
     ImmutableList.Builder<FunctionTypeI> result = ImmutableList.builder();
     NominalType nt =

diff --git a/src/com/google/javascript/rhino/FunctionTypeI.java b/src/com/google/javascript/rhino/FunctionTypeI.java
@@ -81,7 +81,7 @@ public interface FunctionTypeI extends TypeI {
    * null. This allows a downward traversal of the subtype graph.
    */
   // TODO(sdh): change the name to getDirectSubTypes()
-  Iterable<FunctionTypeI> getSubTypes();
+  Iterable<FunctionTypeI> getDirectSubTypes();
 
   /** Gets the type of {@code this} in this function. */
   TypeI getTypeOfThis();

diff --git a/src/com/google/javascript/rhino/jstype/FunctionType.java b/src/com/google/javascript/rhino/jstype/FunctionType.java
@@ -1264,7 +1264,7 @@ public void clearCachedValues() {
   }
 
   @Override
-  public Iterable<FunctionTypeI> getSubTypes() {
+  public Iterable<FunctionTypeI> getDirectSubTypes() {
     return Iterables.concat(
         subTypes != null ? subTypes : ImmutableList.<FunctionTypeI>of(),
         this.registry.getDirectImplementors(this));

diff --git a/test/com/google/javascript/jscomp/FunctionTypeBuilderTest.java b/test/com/google/javascript/jscomp/FunctionTypeBuilderTest.java
@@ -144,7 +144,7 @@ public void testExternSubTypes() throws Exception {
     List<FunctionTypeI> subtypes =
         ImmutableList.copyOf(
             ((ObjectType) getLastCompiler().getTypeRegistry().getType("Error"))
-                .getConstructor().getSubTypes());
+                .getConstructor().getDirectSubTypes());
     for (FunctionTypeI type : subtypes) {
       String typeName = type.getInstanceType().toString();
       FunctionType typeInRegistry = ((ObjectType) getLastCompiler()

diff --git a/test/com/google/javascript/rhino/jstype/JSTypeTest.java b/test/com/google/javascript/rhino/jstype/JSTypeTest.java
@@ -6186,19 +6186,19 @@ public void testGetAndSetJSDocInfoWithNoType() throws Exception {
   public void testObjectGetSubTypes() throws Exception {
     assertTrue(
         containsType(
-            OBJECT_FUNCTION_TYPE.getSubTypes(), googBar));
+            OBJECT_FUNCTION_TYPE.getDirectSubTypes(), googBar));
     assertTrue(
         containsType(
-            googBar.getSubTypes(), googSubBar));
+            googBar.getDirectSubTypes(), googSubBar));
     assertFalse(
         containsType(
-            googBar.getSubTypes(), googSubSubBar));
+            googBar.getDirectSubTypes(), googSubSubBar));
     assertFalse(
         containsType(
-            googSubBar.getSubTypes(), googSubBar));
+            googSubBar.getDirectSubTypes(), googSubBar));
     assertTrue(
         containsType(
-            googSubBar.getSubTypes(), googSubSubBar));
+            googSubBar.getDirectSubTypes(), googSubSubBar));
   }
 
   public void testImplementingType() throws Exception {