Remove even more workarounds for the old AST structure of shorthand properties.

lauraharker · Tyler Breisacher · commit 2621850d3b6b · 2017-12-21T13:31:23.000-08:00
------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=179745653
diff --git a/src/com/google/javascript/jscomp/CheckMissingAndExtraRequires.java b/src/com/google/javascript/jscomp/CheckMissingAndExtraRequires.java
@@ -218,12 +218,6 @@ public void visit(NodeTraversal t, Node n, Node parent) {
           visitQualifiedName(t, n, parent);
         }
         break;
-      case STRING_KEY:
-        if (parent.isObjectLit() && !n.hasChildren()) {
-          // Object literal shorthand. This is a usage of the name.
-          visitQualifiedName(t, n, parent);
-        }
-        break;
       case CALL:
         visitCallNode(t, n, parent);
         break;
diff --git a/src/com/google/javascript/jscomp/Es6RewriteModules.java b/src/com/google/javascript/jscomp/Es6RewriteModules.java
@@ -234,8 +234,9 @@ private void visitImport(NodeTraversal t, Node importDecl, Node parent) {
             child.isImportStar(), "Expected an IMPORT_STAR node, but was: %s", child);
         // Namespace imports cannot be imported "as *".
         if (isNamespaceImport) {
-          compiler.report(t.makeError(importDecl, NAMESPACE_IMPORT_CANNOT_USE_STAR,
-              child.getString(), moduleName));
+          compiler.report(
+              t.makeError(
+                  importDecl, NAMESPACE_IMPORT_CANNOT_USE_STAR, child.getString(), moduleName));
         }
         importMap.put(
             child.getString(),
@@ -288,8 +289,7 @@ private void visitExport(NodeTraversal t, Node export, Node parent) {
       }
     } else if (export.getBooleanProp(Node.EXPORT_ALL_FROM)) {
       //   export * from 'moduleIdentifier';
-      compiler.report(JSError.make(export, Es6ToEs3Util.CANNOT_CONVERT_YET,
-          "Wildcard export"));
+      compiler.report(JSError.make(export, Es6ToEs3Util.CANNOT_CONVERT_YET, "Wildcard export"));
     } else if (export.hasTwoChildren()) {
       //   export {x, y as z} from 'moduleIdentifier';
       Node moduleIdentifier = export.getLastChild();
@@ -314,8 +314,8 @@ private void visitExport(NodeTraversal t, Node export, Node parent) {
       for (Node exportSpec : export.getFirstChild().children()) {
         String nameFromOtherModule = exportSpec.getFirstChild().getString();
         String exportedName = exportSpec.getLastChild().getString();
-        exportMap.put(exportedName,
-            new NameNodePair(moduleName + "." + nameFromOtherModule, exportSpec));
+        exportMap.put(
+            exportedName, new NameNodePair(moduleName + "." + nameFromOtherModule, exportSpec));
       }
       parent.removeChild(export);
     } else {
@@ -468,19 +468,6 @@ private void visitRequire(Node requireCall, Node parent) {
               compiler.report(JSError.make(parent.getParent(), LHS_OF_GOOG_REQUIRE_MUST_BE_CONST));
             }
 
-            // If the LHS is a destructuring pattern with the "shorthand" syntax,
-            // desugar it because otherwise the renaming will not be done correctly.
-            //   const {x} = goog.require('y')
-            // becomes
-            //   const {x: x} = goog.require('y');
-            if (parent.isObjectPattern()) {
-              for (Node key = parent.getFirstChild(); key != null; key = key.getNext()) {
-                if (!key.hasChildren()) {
-                  key.addChildToBack(IR.name(key.getString()).useSourceInfoFrom(key));
-                }
-              }
-            }
-
             Node replacement = NodeUtil.newQName(compiler, namespace).srcrefTree(requireCall);
             parent.replaceChild(requireCall, replacement);
             Node varNode = parent.getParent();
@@ -493,6 +480,7 @@ private void visitRequire(Node requireCall, Node parent) {
 
   /**
    * Traverses a node tree and
+   *
    * <ol>
    *   <li>Appends a suffix to all global variable names defined in this module.
    *   <li>Changes references to imported values to be property accesses on the
@@ -515,12 +503,7 @@ public void visit(NodeTraversal t, Node n, Node parent) {
         }
       }
 
-      boolean isShorthandObjLitKey =
-          (n.isStringKey() && !n.hasChildren())
-              || (n.isName()
-                  && n.getParent().isDefaultValue()
-                  && n.getGrandparent().isObjectPattern());
-      if (n.isName() || isShorthandObjLitKey) {
+      if (n.isName()) {
         String name = n.getString();
         if (suffix.equals(name)) {
           // TODO(moz): Investigate whether we need to return early in this unlikely situation.
@@ -531,14 +514,9 @@ public void visit(NodeTraversal t, Node n, Node parent) {
         if (var != null && var.isGlobal()) {
           // Avoid polluting the global namespace.
           String newName = name + "$$" + suffix;
-          if (isShorthandObjLitKey) {
-            // Change {a} to {a: a$$module$foo}
-            fixShorthandObjLit(t, n, IR.name(newName));
-          } else {
-            n.setString(newName);
-            n.setOriginalName(name);
-            t.reportCodeChange(n);
-          }
+          n.setString(newName);
+          n.setOriginalName(name);
+          t.reportCodeChange(n);
         } else if (var == null && importMap.containsKey(name)) {
           // Change to property access on the imported module object.
           if (parent.isCall() && parent.getFirstChild() == n) {
@@ -548,48 +526,19 @@ public void visit(NodeTraversal t, Node n, Node parent) {
           ModuleOriginalNamePair pair = importMap.get(name);
           boolean isImportStar = pair.originalName.isEmpty();
           Node moduleAccess = NodeUtil.newQName(compiler, pair.module);
-          if (isShorthandObjLitKey) {
-            if (isImportStar) {
-              fixShorthandObjLit(t, n, moduleAccess);
-            } else {
-              fixShorthandObjLit(t, n, IR.getprop(moduleAccess, IR.string(pair.originalName)));
-            }
+
+          if (isImportStar) {
+            n.replaceWith(moduleAccess.useSourceInfoIfMissingFromForTree(n));
           } else {
-            if (isImportStar) {
-              n.replaceWith(moduleAccess.useSourceInfoIfMissingFromForTree(n));
-            } else {
-              n.replaceWith(
-                  IR.getprop(moduleAccess, IR.string(pair.originalName))
-                      .useSourceInfoIfMissingFromForTree(n));
-            }
+            n.replaceWith(
+                IR.getprop(moduleAccess, IR.string(pair.originalName))
+                    .useSourceInfoIfMissingFromForTree(n));
             t.reportCodeChange(moduleAccess);
           }
         }
       }
     }
 
-    /**
-     * Replace shorthand object literal references to module imports with fully qualified
-     * value names. Eg: {foo} becomes {foo: module$imported.foo}.
-     */
-    private void fixShorthandObjLit(NodeTraversal t, Node n, Node newNode) {
-      if (n.isStringKey()) {
-        n.addChildToBack(newNode.useSourceInfoIfMissingFromForTree(n));
-      } else {
-        // The AST looks like:
-        // DEFAULT_VALUE
-        //   NAME oldName
-        //   VALUE
-        // It needs a STRING_KEY oldName added as the DEFAULT_VALUE's parent.
-        // Then to replace the oldName node with the new node.
-        Node stringKeyNode = IR.stringKey(n.getString()).srcref(n);
-        n.getParent().replaceWith(stringKeyNode);
-        stringKeyNode.addChildToBack(n.getParent());
-        n.replaceWith(newNode);
-      }
-      t.reportCodeChange(newNode);
-    }
-
     /**
      * Replace type name references. Change short names to fully qualified names
      * with namespace prefixes. Eg: {Foo} becomes {module$test.Foo}.
@@ -649,8 +598,7 @@ private void fixTypeNode(NodeTraversal t, Node typeNode) {
         }
       }
 
-      for (Node child = typeNode.getFirstChild(); child != null;
-           child = child.getNext()) {
+      for (Node child = typeNode.getFirstChild(); child != null; child = child.getNext()) {
         fixTypeNode(t, child);
       }
     }
diff --git a/src/com/google/javascript/jscomp/Normalize.java b/src/com/google/javascript/jscomp/Normalize.java
@@ -679,9 +679,8 @@ private void extractForInitializer(
                 List<Node> lhsNodes = NodeUtil.findLhsNodesInNode(lhs);
                 for (Node name : lhsNodes) {
                   // Add a declaration outside the for loop for the given name.
-                  // The lhs can be a string key in property shorthand.
                   checkState(
-                      name.isName() || name.isStringKey(),
+                      name.isName(),
                       "lhs in destructuring declaration should be a simple name.",
                       name);
                   Node newName = IR.name(name.getString()).srcref(name);
diff --git a/src/com/google/javascript/jscomp/PolymerClassRewriter.java b/src/com/google/javascript/jscomp/PolymerClassRewriter.java
@@ -69,10 +69,6 @@ final class PolymerClassRewriter {
   void rewritePolymerCall(
       Node exprRoot, final PolymerClassDefinition cls, boolean isInGlobalScope) {
     Node objLit = checkNotNull(cls.descriptor);
-    if (hasShorthandAssignment(objLit)) {
-      compiler.report(JSError.make(objLit, PolymerPassErrors.POLYMER_SHORTHAND_NOT_SUPPORTED));
-      return;
-    }
 
     // Add {@code @lends} to the object literal.
     JSDocInfoBuilder objLitDoc = new JSDocInfoBuilder(true);
@@ -306,11 +302,6 @@ private void addTypesToFunctions(
       if (!property.value.isObjectLit()) {
         continue;
       }
-      if (hasShorthandAssignment(property.value)){
-        compiler.report(
-            JSError.make(property.value, PolymerPassErrors.POLYMER_SHORTHAND_NOT_SUPPORTED));
-        return;
-      }
 
       Node defaultValue = NodeUtil.getFirstPropMatchingKey(property.value, "value");
       if (defaultValue == null || !defaultValue.isFunction()) {
@@ -598,16 +589,6 @@ private void addInterfaceExterns(
     compiler.reportChangeToEnclosingScope(stmts);
   }
 
-  private static boolean hasShorthandAssignment(Node objLit) {
-    checkState(objLit.isObjectLit());
-    for (Node property : objLit.children()){
-      if (property.isStringKey() && !property.hasChildren()){
-        return true;
-      }
-    }
-    return false;
-  }
-
   /**
    * @return The name of the generated extern interface which the element implements.
    */
diff --git a/src/com/google/javascript/jscomp/PolymerPassErrors.java b/src/com/google/javascript/jscomp/PolymerPassErrors.java
@@ -63,11 +63,6 @@ final class PolymerPassErrors {
       "JSC_POLYMER_UNANNOTATED_BEHAVIOR",
       "Behavior declarations must be annotated with @polymerBehavior.");
 
-  static final DiagnosticType POLYMER_SHORTHAND_NOT_SUPPORTED =
-      DiagnosticType.error(
-          "JSC_POLYMER_SHORTHAND_NOT_SUPPORTED",
-          "Shorthand assignment in object literal is not allowed in Polymer call arguments");
-
   static final DiagnosticType POLYMER_CLASS_PROPERTIES_INVALID =
       DiagnosticType.error(
           "JSC_POLYMER_CLASS_PROPERTIES_INVALID",
diff --git a/src/com/google/javascript/jscomp/PolymerPassStaticUtils.java b/src/com/google/javascript/jscomp/PolymerPassStaticUtils.java
@@ -115,10 +115,6 @@ static ImmutableList<MemberDefinition> extractProperties(
 
     ImmutableList.Builder<MemberDefinition> members = ImmutableList.builder();
     for (Node keyNode : properties.children()) {
-      if (!keyNode.hasChildren()) {
-        compiler.report(JSError.make(keyNode, PolymerPassErrors.POLYMER_SHORTHAND_NOT_SUPPORTED));
-        continue;
-      }
       members.add(new MemberDefinition(NodeUtil.getBestJSDocInfo(keyNode), keyNode,
           keyNode.getFirstChild()));
     }
