Move getAlignmentSize() from printer to util

josephfrazier · josephfrazier · commit db0ec7a6356a · 2017-05-21T12:50:53.000-04:00
This addresses #1609 (comment)
diff --git a/index.js b/index.js
@@ -3,7 +3,7 @@
 const comments = require("./src/comments");
 const version = require("./package.json").version;
 const printAstToDoc = require("./src/printer").printAstToDoc;
-const getAlignmentSize = require("./src/printer").getAlignmentSize;
+const getAlignmentSize = require("./src/util").getAlignmentSize;
 const printDocToString = require("./src/doc-printer").printDocToString;
 const normalizeOptions = require("./src/options").normalize;
 const parser = require("./src/parser");
diff --git a/src/printer.js b/src/printer.js
@@ -49,25 +49,6 @@ function shouldPrintComma(options, level) {
   }
 }
 
-function getAlignmentSize(value, tabWidth, startIndex) {
-  startIndex = startIndex || 0;
-
-  let size = 0;
-  for (let i = startIndex; i < value.length; ++i) {
-    if (value[i] === '\t') {
-      // Tabs behave in a way that they are aligned to the nearest
-      // multiple of tabWidth:
-      // 0 -> 4, 1 -> 4, 2 -> 4, 3 -> 4
-      // 4 -> 8, 5 -> 8, 6 -> 8, 7 -> 8 ...
-      size = size + tabWidth - size % tabWidth;
-    } else {
-      size++;
-    }
-  }
-
-  return size;
-}
-
 function genericPrint(path, options, printPath, args) {
   assert.ok(path instanceof FastPath);
 
@@ -1684,7 +1665,7 @@ function genericPrintNoParens(path, options, print, args) {
           const index = value.lastIndexOf('\n');
           const tabWidth = options.tabWidth;
           if (index !== -1) {
-            size = getAlignmentSize(value, tabWidth, index + 1);
+            size = util.getAlignmentSize(value, tabWidth, index + 1);
           }
 
           let aligned = addAlignmentToDoc(expressions[i], size, tabWidth);
@@ -4287,4 +4268,4 @@ function addAlignmentToDoc(doc, size, tabWidth) {
   return aligned;
 }
 
-module.exports = { printAstToDoc, getAlignmentSize };
+module.exports = { printAstToDoc };
diff --git a/src/util.js b/src/util.js
@@ -320,6 +320,25 @@ function isBlockComment(comment) {
   return comment.type === "Block" || comment.type === "CommentBlock";
 }
 
+function getAlignmentSize(value, tabWidth, startIndex) {
+  startIndex = startIndex || 0;
+
+  let size = 0;
+  for (let i = startIndex; i < value.length; ++i) {
+    if (value[i] === '\t') {
+      // Tabs behave in a way that they are aligned to the nearest
+      // multiple of tabWidth:
+      // 0 -> 4, 1 -> 4, 2 -> 4, 3 -> 4
+      // 4 -> 8, 5 -> 8, 6 -> 8, 7 -> 8 ...
+      size = size + tabWidth - size % tabWidth;
+    } else {
+      size++;
+    }
+  }
+
+  return size;
+}
+
 module.exports = {
   getPrecedence,
   isExportDeclaration,
@@ -341,5 +360,6 @@ module.exports = {
   setLocEnd,
   startsWithNoLookaheadToken,
   hasBlockComments,
-  isBlockComment
+  isBlockComment,
+  getAlignmentSize
 };
