Add support in ASTHelpersSuggestions for getEnclosedElements

See #4026. `Symbol.getEnclosedElements()` is another method that can cause compatibility issues across JDK versions (#3895). Fixes #4027 FUTURE_COPYBARA_INTEGRATE_REVIEW=#4027 from msridhar:asthelperssuggestions-getenclosedelements b4c01ba PiperOrigin-RevId: 552505468
google · Jul 31, 2023 · 713a17c · 713a17c
1 parent 29b0e54
commit 713a17c
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 1 deletion.
diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/ASTHelpersSuggestions.java b/core/src/main/java/com/google/errorprone/bugpatterns/ASTHelpersSuggestions.java
@@ -50,7 +50,8 @@ public class ASTHelpersSuggestions extends BugChecker implements MethodInvocatio
       anyOf(
           instanceMethod()
               .onDescendantOf("com.sun.tools.javac.code.Symbol")
-              .namedAnyOf("isDirectlyOrIndirectlyLocal", "isLocal", "packge"),
+              .namedAnyOf(
+                  "isDirectlyOrIndirectlyLocal", "isLocal", "packge", "getEnclosedElements"),
           instanceMethod()
               .onClass((t, s) -> isSubtype(MODULE_SYMBOL.get(s), t, s))
               .namedAnyOf("isStatic"));

diff --git a/core/src/test/java/com/google/errorprone/bugpatterns/ASTHelpersSuggestionsTest.java b/core/src/test/java/com/google/errorprone/bugpatterns/ASTHelpersSuggestionsTest.java
@@ -87,4 +87,29 @@ public void onSymbolSubtype() {
             "jdk.compiler/com.sun.tools.javac.code", "jdk.compiler/com.sun.tools.javac.util")
         .doTest();
   }
+
+  @Test
+  public void symbolGetEnclosedElements() {
+    testHelper
+        .addInputLines(
+            "Test.java",
+            "import com.sun.tools.javac.code.Symbol.ClassSymbol;",
+            "class Test {",
+            "  void f(ClassSymbol s) {",
+            "    s.getEnclosedElements();",
+            "  }",
+            "}")
+        .addOutputLines(
+            "Test.java",
+            "import static com.google.errorprone.util.ASTHelpers.getEnclosedElements;",
+            "import com.sun.tools.javac.code.Symbol.ClassSymbol;",
+            "class Test {",
+            "  void f(ClassSymbol s) {",
+            "    getEnclosedElements(s);",
+            "  }",
+            "}")
+        .addModules(
+            "jdk.compiler/com.sun.tools.javac.code", "jdk.compiler/com.sun.tools.javac.util")
+        .doTest();
+  }
 }