From 0d5cbe610204c8ddabde69460409c59920b5c3ff Mon Sep 17 00:00:00 2001
From: Logan Smyth <loganfsmyth@gmail.com>
Date: Thu, 14 Jul 2016 23:28:08 -0700
Subject: [PATCH] Move class static helpers off class.

---
 packages/babel-generator/src/index.js | 165 +++++++++++++-------------
 1 file changed, 82 insertions(+), 83 deletions(-)

diff --git a/packages/babel-generator/src/index.js b/packages/babel-generator/src/index.js
index 5e443c1df6..d16a06e299 100644
--- a/packages/babel-generator/src/index.js
+++ b/packages/babel-generator/src/index.js
@@ -13,7 +13,7 @@ class Generator extends Printer {
     opts = opts || {};
 
     const tokens = ast.tokens || [];
-    let format = Generator.normalizeOptions(code, opts, tokens);
+    let format = normalizeOptions(code, opts, tokens);
     let map = opts.sourceMaps ? new SourceMap(opts, code) : null;
     super(format, map, tokens);
 
@@ -39,88 +39,6 @@ class Generator extends Printer {
 
   ast: Object;
 
-  /**
-   * Normalize generator options, setting defaults.
-   *
-   * - Detects code indentation.
-   * - If `opts.compact = "auto"` and the code is over 100KB, `compact` will be set to `true`.
-   */
-
-  static normalizeOptions(code, opts, tokens) {
-    let style = "  ";
-    if (code && typeof code === "string") {
-      let indent = detectIndent(code).indent;
-      if (indent && indent !== " ") style = indent;
-    }
-
-    let format = {
-      auxiliaryCommentBefore: opts.auxiliaryCommentBefore,
-      auxiliaryCommentAfter: opts.auxiliaryCommentAfter,
-      shouldPrintComment: opts.shouldPrintComment,
-      retainLines: opts.retainLines,
-      comments: opts.comments == null || opts.comments,
-      compact: opts.compact,
-      minified: opts.minified,
-      concise: opts.concise,
-      quotes: opts.quotes || Generator.findCommonStringDelimiter(code, tokens),
-      indent: {
-        adjustMultilineComment: true,
-        style: style,
-        base: 0
-      }
-    };
-
-    if (format.minified) {
-      format.compact = true;
-    }
-
-    if (format.compact === "auto") {
-      format.compact = code.length > 100000; // 100KB
-
-      if (format.compact) {
-        console.error("[BABEL] " + messages.get("codeGeneratorDeopt", opts.filename, "100KB"));
-      }
-    }
-
-    if (format.compact) {
-      format.indent.adjustMultilineComment = false;
-    }
-
-    return format;
-  }
-
-  /**
-   * Determine if input code uses more single or double quotes.
-   */
-  static findCommonStringDelimiter(code, tokens) {
-    let occurences = {
-      single: 0,
-      double: 0
-    };
-
-    let checked = 0;
-
-    for (let i = 0; i < tokens.length; i++) {
-      let token = tokens[i];
-      if (token.type.label !== "string") continue;
-
-      let raw = code.slice(token.start, token.end);
-      if (raw[0] === "'") {
-        occurences.single++;
-      } else {
-        occurences.double++;
-      }
-
-      checked++;
-      if (checked >= 3) break;
-    }
-    if (occurences.single > occurences.double) {
-      return "single";
-    } else {
-      return "double";
-    }
-  }
-
   /**
    * Generate code and sourcemap from ast.
    *
@@ -135,6 +53,87 @@ class Generator extends Printer {
   }
 }
 
+/**
+ * Normalize generator options, setting defaults.
+ *
+ * - Detects code indentation.
+ * - If `opts.compact = "auto"` and the code is over 100KB, `compact` will be set to `true`.
+ */
+
+function normalizeOptions(code, opts, tokens) {
+  let style = "  ";
+  if (code && typeof code === "string") {
+    let indent = detectIndent(code).indent;
+    if (indent && indent !== " ") style = indent;
+  }
+
+  let format = {
+    auxiliaryCommentBefore: opts.auxiliaryCommentBefore,
+    auxiliaryCommentAfter: opts.auxiliaryCommentAfter,
+    shouldPrintComment: opts.shouldPrintComment,
+    retainLines: opts.retainLines,
+    comments: opts.comments == null || opts.comments,
+    compact: opts.compact,
+    minified: opts.minified,
+    concise: opts.concise,
+    quotes: opts.quotes || findCommonStringDelimiter(code, tokens),
+    indent: {
+      adjustMultilineComment: true,
+      style: style,
+      base: 0
+    }
+  };
+
+  if (format.minified) {
+    format.compact = true;
+  }
+
+  if (format.compact === "auto") {
+    format.compact = code.length > 100000; // 100KB
+
+    if (format.compact) {
+      console.error("[BABEL] " + messages.get("codeGeneratorDeopt", opts.filename, "100KB"));
+    }
+  }
+
+  if (format.compact) {
+    format.indent.adjustMultilineComment = false;
+  }
+
+  return format;
+}
+
+/**
+ * Determine if input code uses more single or double quotes.
+ */
+function findCommonStringDelimiter(code, tokens) {
+  let occurences = {
+    single: 0,
+    double: 0
+  };
+
+  let checked = 0;
+
+  for (let i = 0; i < tokens.length; i++) {
+    let token = tokens[i];
+    if (token.type.label !== "string") continue;
+
+    let raw = code.slice(token.start, token.end);
+    if (raw[0] === "'") {
+      occurences.single++;
+    } else {
+      occurences.double++;
+    }
+
+    checked++;
+    if (checked >= 3) break;
+  }
+  if (occurences.single > occurences.double) {
+    return "single";
+  } else {
+    return "double";
+  }
+}
 
 /**
  * We originally exported the Generator class above, but to make it extra clear that it is a private API,