Refactor prefs.js for MD-Settings

third_party/closure_compiler/runner/src/com/google/javascript/jscomp/ChromePass.java

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package com.google.javascript.jscomp;
 
 import com.google.javascript.jscomp.NodeTraversal.AbstractPostOrderCallback;
 import com.google.javascript.rhino.IR;
 import com.google.javascript.rhino.JSDocInfoBuilder;
 import com.google.javascript.rhino.JSTypeExpression;
@@ skipping 30 matching lines @@
 
     private static final String CR_DEFINE_COMMON_EXPLANATION = "It should be called like this:"
             + " cr.define('name.space', function() '{ ... return {Export: Internal}; }');";
 
     static final DiagnosticType CR_DEFINE_WRONG_NUMBER_OF_ARGUMENTS =
             DiagnosticType.error("JSC_CR_DEFINE_WRONG_NUMBER_OF_ARGUMENTS",
                     "cr.define() should have exactly 2 arguments. " + CR_DEFINE_COMMON_EXPLANATION);
 
     static final DiagnosticType CR_EXPORT_PATH_WRONG_NUMBER_OF_ARGUMENTS =
             DiagnosticType.error("JSC_CR_EXPORT_PATH_WRONG_NUMBER_OF_ARGUMENTS",
-                    "cr.exportPath() should have exactly 1 argument: namespace name.");
+                    "cr.exportPath() should have between 1 and 3 arguments: "
+                    + "namespace name[, object to expose[, object to export to]].");
 
     static final DiagnosticType CR_DEFINE_INVALID_FIRST_ARGUMENT =
             DiagnosticType.error("JSC_CR_DEFINE_INVALID_FIRST_ARGUMENT",
                     "Invalid first argument for cr.define(). " + CR_DEFINE_COMMON_EXPLANATION);
 
     static final DiagnosticType CR_DEFINE_INVALID_SECOND_ARGUMENT =
             DiagnosticType.error("JSC_CR_DEFINE_INVALID_SECOND_ARGUMENT",
                     "Invalid second argument for cr.define(). " + CR_DEFINE_COMMON_EXPLANATION);
 
     static final DiagnosticType CR_DEFINE_INVALID_RETURN_IN_FUNCTION =
@@ skipping 181 matching lines @@
                 } else {
                     compiler.report(JSError.make(jsDocSourceNode, CR_MAKE_PUBLIC_HAS_NO_JSDOC));
                 }
                 publicAPIStrings.remove(publicName);
             }
         }
         return changesMade;
     }
 
     private void visitExportPath(Node crExportPathNode, Node parent) {
-        if (crExportPathNode.getChildCount() != 2) {
+        int childCount = crExportPathNode.getChildCount();
+        if (childCount < 2 || childCount > 4) {
             compiler.report(JSError.make(crExportPathNode,
                     CR_EXPORT_PATH_WRONG_NUMBER_OF_ARGUMENTS));
+        }
+        if (childCount != 2)
             return;
-        }
 
         createAndInsertObjectsForQualifiedName(parent,
                 crExportPathNode.getChildAtIndex(1).getString());

[Dan Beam, 2015/08/29 01:49:30]

cr.exportPath(pathName);  // throws without a 'literal'

[michaelpg, 2015/08/29 01:53:23]

Acknowledged.

     }
 
     private void createAndInsertObjectsForQualifiedName(Node scriptChild, String namespace) {
         List<Node> objectsForQualifiedName = createObjectsForQualifiedName(namespace);
         for (Node n : objectsForQualifiedName) {
             scriptChild.getParent().addChildBefore(n, scriptChild);
         }
     }
 
     private void visitNamespaceDefinition(Node crDefineCallNode, Node parent) {
@@ skipping 174 matching lines @@
             }
         }
 
         private Node buildQualifiedName(Node internalName) {
             String externalName = this.exports.get(internalName.getString());
             return NodeUtil.newQName(compiler, this.namespaceName + "." + externalName).srcrefTree(
                     internalName);
         }
     }
 }