Move the value property for IdentifierToken to a getter method with specific methods for common tasks

PiperOrigin-RevId: 722824771

Author: Closure Team

src/com/google/javascript/jscomp/parsing/IRFactory.java

@@ -1211,6 +1211,11 @@ void setLengthFrom(Node node, Node ref) {
 
   private class TransformDispatcher {
 
+    // For now, this is just a pass-through. Soon will distinguish based on an IdentifierType.
+    String getIdentifierValue(IdentifierToken identifierToken) {
+      return identifierToken.getValue();
+    }
+
     /**
      * Transforms the given object key `input` into a Node with token `output`.
      *
@@ -1527,7 +1532,8 @@ Node processBreakStatement(BreakStatementTree statementNode) {
 
     Node transformLabelName(IdentifierToken token) {
       Node label =
-          newStringNodeWithNonJSDocComment(Token.LABEL_NAME, token.value, token.getStart());
+          newStringNodeWithNonJSDocComment(
+              Token.LABEL_NAME, getIdentifierValue(token), token.getStart());
       setSourceInfo(label, token);
       return label;
     }
@@ -1919,7 +1925,7 @@ Node processFunction(FunctionDeclarationTree functionTree) {
 
       if (isMember) {
         setSourceInfo(node, functionTree);
-        Node member = newStringNode(Token.MEMBER_FUNCTION_DEF, name.value);
+        Node member = newStringNode(Token.MEMBER_FUNCTION_DEF, getIdentifierValue(name));
         member.addChildToBack(node);
         member.setStaticMember(functionTree.isStatic);
         // The source info should only include the identifier, not the entire function expression
@@ -1938,7 +1944,7 @@ Node processField(FieldDeclarationTree tree) {
 
       Node node =
           newStringNodeWithNonJSDocComment(
-              Token.MEMBER_FIELD_DEF, tree.name.value, tree.getStart());
+              Token.MEMBER_FIELD_DEF, getIdentifierValue(tree.name), tree.getStart());
       if (tree.initializer != null) {
         Node initializer = transform(tree.initializer);
         node.addChildToBack(initializer);
@@ -2170,7 +2176,7 @@ Node processName(IdentifierExpressionTree nameNode) {
     Node processName(IdentifierToken identifierToken, Token output) {
       NonJSDocComment comment = parseNonJSDocCommentAt(identifierToken.getStart(), true);
 
-      Node node = newStringNode(output, identifierToken.value);
+      Node node = newStringNode(output, getIdentifierValue(identifierToken));
 
       if (output == Token.NAME) {
         maybeWarnReservedKeyword(identifierToken);
@@ -2226,7 +2232,7 @@ Node processNameWithInlineComments(IdentifierToken identifierToken) {
       NonJSDocComment comment = parseNonJSDocCommentAt(identifierToken.getStart(), false);
 
       maybeWarnReservedKeyword(identifierToken);
-      Node node = newStringNode(Token.NAME, identifierToken.value);
+      Node node = newStringNode(Token.NAME, getIdentifierValue(identifierToken));
 
       if (info != null) {
         node.setJSDocInfo(info);
@@ -2254,7 +2260,7 @@ private void maybeWarnKeywordProperty(Node node) {
     }
 
     private void maybeWarnReservedKeyword(IdentifierToken token) {
-      String identifier = token.value;
+      String identifier = getIdentifierValue(token);
       boolean isIdentifier = false;
       if (TokenStream.isKeyword(identifier)) {
         features = features.with(Feature.ES3_KEYWORDS_AS_IDENTIFIERS);
@@ -2463,7 +2469,7 @@ Node processPropertyGet(MemberExpressionTree getNode) {
 
       Node getProp =
           newStringNodeWithNonJSDocComment(
-              Token.GETPROP, propName.value, getNode.memberName.getStart());
+              Token.GETPROP, getIdentifierValue(propName), getNode.memberName.getStart());
       getProp.addChildToBack(leftChild);
       setSourceInfo(getProp, propName);
       maybeWarnKeywordProperty(getProp);
@@ -2481,7 +2487,7 @@ Node processOptChainPropertyGet(OptionalMemberExpressionTree getNode) {
 
       Node getProp =
           newStringNodeWithNonJSDocComment(
-              Token.OPTCHAIN_GETPROP, propName.value, getNode.memberName.getStart());
+              Token.OPTCHAIN_GETPROP, getIdentifierValue(propName), getNode.memberName.getStart());
       getProp.addChildToBack(leftChild);
       getProp.setIsOptionalChainStart(getNode.isStartOfOptionalChain);
       setSourceInfo(getProp, propName);
@@ -2928,7 +2934,7 @@ private boolean validateClassConstructorMember(ParseTree member) {
       }
 
       if (!memberName.type.equals(TokenType.IDENTIFIER)
-          || !memberName.asIdentifier().value.equals("constructor")) {
+          || !memberName.asIdentifier().valueEquals("constructor")) {
         // There's only a potential issue if the member is named "constructor".
         // TODO(b/123769080): Also check for quoted string literals with the value "constructor".
         return false;
@@ -3022,7 +3028,8 @@ Node processImportDecl(ImportDeclarationTree tree) {
         // changed to use only "{foo}" part.
         setSourceInfo(secondChild, tree);
       } else {
-        secondChild = newStringNode(Token.IMPORT_STAR, tree.nameSpaceImportIdentifier.value);
+        secondChild =
+            newStringNode(Token.IMPORT_STAR, getIdentifierValue(tree.nameSpaceImportIdentifier));
         setSourceInfo(secondChild, tree.nameSpaceImportIdentifier);
       }
       Node thirdChild = processString(tree.moduleSpecifier);

src/com/google/javascript/jscomp/parsing/parser/IdentifierToken.java

@@ -20,6 +20,8 @@
 
 /** A token representing an identifier. */
 public class IdentifierToken extends Token {
+  private final String value;
+
   public IdentifierToken(SourceRange location, String value) {
     super(TokenType.IDENTIFIER, location);
     this.value = value;
@@ -30,5 +32,21 @@ public String toString() {
     return value;
   }
 
-  public final String value;
+  public boolean isKeyword() {
+    return Keywords.isKeyword(value);
+  }
+
+  public boolean valueEquals(String str) {
+    return value.equals(str);
+  }
+
+  /**
+   * Gets the value of the identifier.
+   *
+   * <p>Prefer calling {@link #isKeyword()} or {@link #valueEquals(String)} if those methods meet
+   * your needs.
+   */
+  public String getValue() {
+    return value;
+  }
 }

src/com/google/javascript/jscomp/parsing/parser/Parser.java

@@ -257,11 +257,6 @@ public FeatureSet getFeatures() {
     return sourceMapURL;
   }
 
-  /** Returns true if the string value should be treated as a keyword in the current context. */
-  private boolean isKeyword(String value) {
-    return Keywords.isKeyword(value);
-  }
-
   // 14 Program
   public @Nullable ProgramTree parseProgram() {
     try {
@@ -394,7 +389,7 @@ private ParseTree parseImportSpecifier() {
     if (peekPredefinedString(PredefinedName.AS)) {
       eatPredefinedString(PredefinedName.AS);
       destinationName = eatId();
-    } else if (isKeyword(importedName.value)) {
+    } else if (importedName.isKeyword()) {
       reportExpectedError(null, PredefinedName.AS);
     }
     return new ImportSpecifierTree(getTreeLocation(start), importedName, destinationName);
@@ -481,8 +476,8 @@ private ParseTree parseExportDeclaration() {
     } else if (isExportSpecifier) {
       for (ParseTree tree : exportSpecifierList) {
         IdentifierToken importedName = tree.asExportSpecifier().importedName;
-        if (isKeyword(importedName.value)) {
-          reportError(importedName, "cannot use keyword '%s' here.", importedName.value);
+        if (importedName.isKeyword()) {
+          reportError(importedName, "cannot use keyword '%s' here.", importedName);
         }
       }
     }
@@ -646,7 +641,7 @@ private void parseClassElementName(ClassOrObjectElementInfo elementInfo) {
     if (peekPropertyName(0)) {
       if (peekIdOrKeyword()) {
         elementInfo.setName(eatIdOrKeywordAsId());
-        if (Keywords.isKeyword(elementInfo.getName().value)) {
+        if (elementInfo.getName().isKeyword()) {
           recordFeatureUsed(Feature.KEYWORDS_AS_PROPERTIES);
         }
       } else {
@@ -2060,7 +2055,7 @@ private boolean peekPredefinedString(String string) {
 
   private @Nullable Token eatPredefinedString(String string) {
     Token token = eatId();
-    if (token == null || !token.asIdentifier().value.equals(string)) {
+    if (token == null || !token.asIdentifier().valueEquals(string)) {
       reportExpectedError(token, string);
       return null;
     }
@@ -2069,7 +2064,7 @@ private boolean peekPredefinedString(String string) {
 
   private boolean peekPredefinedString(int index, String string) {
     return peek(index, TokenType.IDENTIFIER)
-        && ((IdentifierToken) peekToken(index)).value.equals(string);
+        && ((IdentifierToken) peekToken(index)).valueEquals(string);
   }
 
   private ParseTree parseObjectLiteralGetAccessor() {
@@ -2144,7 +2139,7 @@ private ParseTree parseObjectLiteralPropertyNameAssignment() {
     if (colon == null) {
       if (name.type != TokenType.IDENTIFIER) {
         reportExpectedError(peekToken(), TokenType.COLON);
-      } else if (Keywords.isKeyword(name.asIdentifier().value)) {
+      } else if (name.asIdentifier().isKeyword()) {
         reportError(name, "Cannot use keyword in short object literal");
       } else if (peek(TokenType.EQUAL)) {
         IdentifierExpressionTree idTree =
@@ -2367,7 +2362,7 @@ private boolean isStartOfAsyncArrowFunction(ParseTree partialExpression) {
           partialExpression.asIdentifierExpression().identifierToken;
       // partialExpression is `async`
       // followed by `[no newline] bindingIdentifier [no newline] =>`
-      return identifierToken.value.equals(ASYNC)
+      return identifierToken.valueEquals(ASYNC)
           && !peekImplicitSemiColon(0)
           && peekId()
           && !peekImplicitSemiColon(1)
@@ -2379,7 +2374,7 @@ && peekId()
       // partialExpression is `async [no newline] (parameters)`
       // followed by `[no newline] =>`
       return callee.type == ParseTreeType.IDENTIFIER_EXPRESSION
-          && callee.asIdentifierExpression().identifierToken.value.equals(ASYNC)
+          && callee.asIdentifierExpression().identifierToken.valueEquals(ASYNC)
           && callee.location.end.line == arguments.location.start.line
           && !peekImplicitSemiColon()
           && peek(TokenType.ARROW);
@@ -3380,11 +3375,10 @@ private ParseTree parseObjectPatternField(PatternKind kind) {
 
     Token name;
     if (peekIdOrKeyword()) {
-      name = eatIdOrKeywordAsId();
+      IdentifierToken idToken = eatIdOrKeywordAsId();
       if (!peek(TokenType.COLON)) {
-        IdentifierToken idToken = (IdentifierToken) name;
-        if (Keywords.isKeyword(idToken.value)) {
-          reportError("cannot use keyword '%s' here.", name);
+        if (idToken.isKeyword()) {
+          reportError("cannot use keyword '%s' here.", idToken);
         }
         if (peek(TokenType.EQUAL)) {
           IdentifierExpressionTree idTree =
@@ -3393,8 +3387,9 @@ private ParseTree parseObjectPatternField(PatternKind kind) {
           ParseTree defaultValue = parseAssignmentExpression();
           return new DefaultParameterTree(getTreeLocation(start), idTree, defaultValue);
         }
-        return new PropertyNameAssignmentTree(getTreeLocation(start), name, null);
+        return new PropertyNameAssignmentTree(getTreeLocation(start), idToken, null);
       }
+      name = idToken;
     } else {
       name = parseLiteralExpression().literalToken;
     }