Extract getAlignmentSize(), use instead of countIndents()

josephfrazier · josephfrazier · commit e1c993e865e3 · 2017-05-16T16:46:01.000-04:00
See https://github.com/prettier/prettier/pull/1609/files/c1a61ebde8be73414c0a54bde3f323ac24295715#r116804694
diff --git a/index.js b/index.js
@@ -3,6 +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 printDocToString = require("./src/doc-printer").printDocToString;
 const normalizeOptions = require("./src/options").normalize;
 const parser = require("./src/parser");
@@ -62,7 +63,7 @@ function format(text, opts, addIndents) {
   // so this is just to get the non-range tests passing for now.
   if (opts.rangeEnd !== Infinity && (0 < rangeStart || rangeEnd < text.length)) {
     const rangeString = text.substring(rangeStart, rangeEnd)
-    const numIndents = countIndents(rangeString, opts);
+    const numIndents = Math.floor(getAlignmentSize(rangeString.slice(0, rangeString.search(/[^ \t]/)), opts.tabWidth) / opts.tabWidth);
 
     const rangeFormatted = format(rangeString, Object.assign({}, opts, {
       rangeStart: 0,
@@ -86,13 +87,6 @@ function format(text, opts, addIndents) {
   return str;
 }
 
-function countIndents(text, opts) {
-  const tabSpaces = ' '.repeat(opts.tabWidth);
-  const indentation = text.match(/^([ \t]*)/)[1].replace(/\t/g, tabSpaces);
-  const numIndents = Math.floor(indentation.length / opts.tabWidth);
-  return numIndents;
-}
-
 function formatWithShebang(text, opts) {
   if (!text.startsWith("#!")) {
     return format(text, opts);
diff --git a/src/printer.js b/src/printer.js
@@ -49,6 +49,25 @@ 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);
 
@@ -1662,17 +1681,7 @@ function genericPrintNoParens(path, options, print, args) {
           const index = value.lastIndexOf('\n');
           const tabWidth = options.tabWidth;
           if (index !== -1) {
-            for (let i = index + 1; 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++;
-              }
-            }
+            size = getAlignmentSize(value, tabWidth, index + 1);
           }
 
           let aligned = removeLines(expressions[i]);
@@ -4273,4 +4282,4 @@ function addIndentsToDoc(doc, numIndents) {
   return addIndentsToDoc(indent(doc), numIndents - 1);
 }
 
-module.exports = { printAstToDoc };
+module.exports = { printAstToDoc, getAlignmentSize };
