From ce095ffef279096a7d5e5091c87ab5258fe98208 Mon Sep 17 00:00:00 2001
From: awturner <awturner@google.com>
Date: Wed, 31 Jul 2019 08:40:16 -0700
Subject: [PATCH] VisitorState: add getElements() method, and use instead of
 getTreeMaker().Literal(...)

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=260932977
---
 .../src/main/java/com/google/errorprone/VisitorState.java   | 6 ++++++
 .../errorprone/bugpatterns/ThreeLetterTimeZoneID.java       | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/check_api/src/main/java/com/google/errorprone/VisitorState.java b/check_api/src/main/java/com/google/errorprone/VisitorState.java
index 0d15f10ff61..8ecae645ce8 100644
--- a/check_api/src/main/java/com/google/errorprone/VisitorState.java
+++ b/check_api/src/main/java/com/google/errorprone/VisitorState.java
@@ -43,6 +43,7 @@
 import com.sun.tools.javac.code.Type.ClassType;
 import com.sun.tools.javac.code.Types;
 import com.sun.tools.javac.comp.Modules;
+import com.sun.tools.javac.model.JavacElements;
 import com.sun.tools.javac.parser.Tokens.Token;
 import com.sun.tools.javac.tree.JCTree;
 import com.sun.tools.javac.tree.JCTree.JCCompilationUnit;
@@ -56,6 +57,7 @@
 import java.util.List;
 import java.util.Map;
 import javax.annotation.Nullable;
+import javax.lang.model.util.Elements;
 
 /** @author alexeagle@google.com (Alex Eagle) */
 public class VisitorState {
@@ -260,6 +262,10 @@ public Types getTypes() {
     return sharedState.types;
   }
 
+  public Elements getElements() {
+    return JavacElements.instance(context);
+  }
+
   public Symtab getSymtab() {
     return sharedState.symtab;
   }
diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/ThreeLetterTimeZoneID.java b/core/src/main/java/com/google/errorprone/bugpatterns/ThreeLetterTimeZoneID.java
index 367887c130a..dfc110f82a3 100644
--- a/core/src/main/java/com/google/errorprone/bugpatterns/ThreeLetterTimeZoneID.java
+++ b/core/src/main/java/com/google/errorprone/bugpatterns/ThreeLetterTimeZoneID.java
@@ -78,7 +78,7 @@ public Description matchMethodInvocation(MethodInvocationTree tree, final Visito
     for (String r : replacement.replacements) {
       builder.addFix(
           SuggestedFix.replace(
-              tree.getArguments().get(0), state.getTreeMaker().Literal(r).toString()));
+              tree.getArguments().get(0), state.getElements().getConstantExpression(r)));
     }
     return builder.build();
   }