Remote copy of utils from the main prettier repo, use the exported shared utils instead

Author: FuegoFro

src/_util-from-prettier.js

@@ -1,7 +1,6 @@
 "use strict";
 
-const utilShared = require("prettier").util;
-const util = require("./_util-from-prettier");
+const util = require("prettier").util;
 const parse = require("./parser");
 const print = require("./printer");
 
@@ -43,9 +42,7 @@ function locStart(node) {
     return node.start;
   }
   if (node.source) {
-    return (
-      utilShared.lineColumnToIndex(node.source.start, node.source.input.css) - 1
-    );
+    return util.lineColumnToIndex(node.source.start, node.source.input.css) - 1;
   }
   if (node.loc) {
     return node.loc.start;
@@ -55,7 +52,7 @@ function locStart(node) {
 function locEnd(node) {
   // This function is copied from the code that used to live in the main prettier repo.
 
-  const endNode = node.nodes && utilShared.getLast(node.nodes);
+  const endNode = node.nodes && util.getLast(node.nodes);
   if (endNode && node.source && !node.source.end) {
     node = endNode;
   }
@@ -66,7 +63,7 @@ function locEnd(node) {
   } else if (typeof node.end === "number") {
     loc = node.end;
   } else if (node.source) {
-    loc = utilShared.lineColumnToIndex(node.source.end, node.source.input.css);
+    loc = util.lineColumnToIndex(node.source.end, node.source.input.css);
   }
 
   if (node.__location) {
@@ -136,7 +133,6 @@ function clean(ast, newObj) {
 const printers = {
   python: {
     print,
-    hasPrettierIgnore: util.hasIgnoreComment,
     printComment,
     canAttachComment,
     massageAstNode: clean

src/index.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const util = require("../_util-from-prettier");
+const util = require("prettier").util;
 const tokens = require("./tokens");
 
 const docBuilders = require("prettier").doc.builders;