Handle one more special case. Fixes #216.

typetools · Jul 28, 2019 · 95c57d6 · 95c57d6
1 parent 27b51ae
commit 95c57d6
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/annotation-file-utilities/src/annotator/find/TreeFinder.java b/annotation-file-utilities/src/annotator/find/TreeFinder.java
@@ -1054,6 +1054,10 @@ public Void scan(Tree node, List<Insertion> p) {
               if (parentKind == Tree.Kind.NEW_CLASS) {
                 continue;
               }
+              IdentifierTree id = (IdentifierTree) node;
+              if (id.getName().contentEquals("this")) {
+                continue;
+              }
               break;
             default:
               // TODO: make this switch statement exhaustive and check each case.

diff --git a/annotation-file-utilities/tests/Issue216.goal b/annotation-file-utilities/tests/Issue216.goal
@@ -1,7 +1,8 @@
-class Issue216 {
+public class Issue216 {
 
     Object value;
     Object value2 = new Object();
+    Issue216 t = this;
 
     @org.checkerframework.dataflow.qual.SideEffectFree
     public Issue216() {}

diff --git a/annotation-file-utilities/tests/Issue216.jaif b/annotation-file-utilities/tests/Issue216.jaif
@@ -4,7 +4,5 @@ annotation @SideEffectFree: @java.lang.annotation.Retention(value=RUNTIME) @java
 package :
 class Issue216:
 
-    field value:
-
     method <init>()V: @org.checkerframework.dataflow.qual.SideEffectFree
         return:
diff --git a/annotation-file-utilities/tests/Issue216.java b/annotation-file-utilities/tests/Issue216.java
@@ -1,7 +1,8 @@
-class Issue216 {
+public class Issue216 {
 
     Object value;
     Object value2 = new Object();
+    Issue216 t = this;
 
     public Issue216() {}
 }