commit 49c46f0b6af135b057dd6fbedc01ae9f93fbe408
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Nov 03 12:54:42 2022 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Nov 03 12:54:42 2022 +0000
tree fb8a5bd78035cc8ccf9be79427fa9bad60f0af96
parent fef95aa492fade9282c01bc07f4e79abc533ab22
parent 5b5b00aff64d220e4eb9311457023b55bf151ebf

Snap for 9251088 from 5b5b00aff64d220e4eb9311457023b55bf151ebf to studio-flamingo-release

Change-Id: I58ebd2f52204147fdccbb5b9d27593134b285f17

src/com/google/devrel/cluestick/studioclient/PsiHelpers.java

diff --git a/src/com/google/devrel/cluestick/studioclient/PsiHelpers.java b/src/com/google/devrel/cluestick/studioclient/PsiHelpers.java
index a3725c9..bc184af 100644
--- a/src/com/google/devrel/cluestick/studioclient/PsiHelpers.java
+++ b/src/com/google/devrel/cluestick/studioclient/PsiHelpers.java
@@ -180,7 +180,7 @@
 
       // PsiMember is a member, e.g., a field (enum/variable) or method, on a class.
       if (targetElement instanceof PsiMember) {
-        yield((PsiMember) targetElement);
+        this.yield((PsiMember) targetElement);
       }
 
       // PsiMethod is a method on a class. Find all the methods it overrides, regardless of how
@@ -192,7 +192,7 @@
 
         for (int i = 0; i < queue.size(); ++i) {
           PsiMethod method = queue.get(i);
-          if (i > 0 && !yield(method)) {  // don't yield first method, done as PsiMember above
+          if (i > 0 && !this.yield(method)) {  // don't yield first method, done as PsiMember above
             continue;
           }
           List<MethodSignatureBackedByPsiMethod> supers =
@@ -218,7 +218,7 @@
         if (type instanceof PsiClassType) {
           targetElement = ((PsiClassType) type).resolve();
         } else {
-          yield(type.getCanonicalText());  // probably int, float etc
+          this.yield(type.getCanonicalText());  // probably int, float etc
         }
       }
 
@@ -237,14 +237,14 @@
         // Yield all binary super classes, in order closest -> farthest. This will yield e.g.,
         // MainActivity to [Activity,Context].
         while ((current = nearestBinaryClass(current)) != null) {
-          yield(current);
+          this.yield(current);
           current = current.getSuperClass();
         }
 
         // Yield only directly implemented interfaces.
         PsiClass interfaces[] = targetClass.getInterfaces();
         for (PsiClass i : interfaces) {
-          yield(i);
+          this.yield(i);
         }
       }
     }
@@ -267,7 +267,7 @@
      */
     private boolean yield(@Nullable PsiClass c) {
       if (elementInBinaryClass(c)) {
-        return yield(c.getQualifiedName());
+        return this.yield(c.getQualifiedName());
       }
       return false;
     }
@@ -288,7 +288,7 @@
           classPrefix = String.format("%s.", qualifiedName);
         }
       }
-      return yield(String.format("%s%s", classPrefix, m.getName()));
+      return this.yield(String.format("%s%s", classPrefix, m.getName()));
     }
   }
 }