@prettier/plugin-php 0.20.0 → 0.20.1

package/src/util.js

@@ -1,4 +1,4 @@
-"use strict";
+import { util as prettierUtil, version as prettierVersion } from "prettier";
 
 const {
   hasNewline,
@@ -8,9 +8,7 @@ const {
   isPreviousLineEmpty: _isPreviousLineEmpty,
   getNextNonSpaceNonCommentCharacterIndex:
     _getNextNonSpaceNonCommentCharacterIndex,
-} = require("prettier").util;
-
-const prettierVersion = require("prettier").version;
+} = prettierUtil;
 
 function lookupIfPrettier2(options, prop) {
   return parseInt(prettierVersion[0]) > 1 ? options[prop] : options;
@@ -190,7 +188,7 @@ function getNodeListProperty(node) {
 }
 
 function getParentNodeListProperty(path) {
-  const parent = path.getParentNode();
+  const { parent } = path;
   if (!parent) {
     return null;
   }
@@ -216,12 +214,12 @@ function isLastStatement(path) {
   if (!body) {
     return true;
   }
-  const node = path.getValue();
+  const { node } = path;
   return body[body.length - 1] === node;
 }
 
 function isFirstChildrenInlineNode(path) {
-  const node = path.getValue();
+  const { node } = path;
 
   if (node.kind === "program") {
     const children = getNodeListProperty(node);
@@ -377,8 +375,7 @@ function docShouldHaveTrailingNewline(path, recurse = 0) {
 }
 
 function lineShouldEndWithSemicolon(path) {
-  const node = path.getValue();
-  const parentNode = path.getParentNode();
+  const { node, parent: parentNode } = path;
   if (!parentNode) {
     return false;
   }
@@ -407,7 +404,7 @@ function lineShouldEndWithSemicolon(path) {
     return true;
   }
   if (node.kind === "method") {
-    const parent = path.getParentNode();
+    const { parent } = path;
     if (parent && parent.kind === "interface") {
       return true;
     }
@@ -435,7 +432,7 @@ function lineShouldEndWithSemicolon(path) {
 }
 
 function fileShouldEndWithHardline(path) {
-  const node = path.getValue();
+  const { node } = path;
   const isProgramNode = node.kind === "program";
   const lastNode = node.children && getLast(node.children);
 
@@ -477,14 +474,6 @@ function hasDanglingComments(node) {
   );
 }
 
-function hasLeadingComment(node) {
-  return node.comments && node.comments.some((comment) => comment.leading);
-}
-
-function hasTrailingComment(node) {
-  return node.comments && node.comments.some((comment) => comment.trailing);
-}
-
 function isLookupNode(node) {
   return (
     node.kind === "propertylookup" ||
@@ -495,7 +484,7 @@ function isLookupNode(node) {
 }
 
 function shouldPrintHardLineAfterStartInControlStructure(path) {
-  const node = path.getValue();
+  const { node } = path;
 
   if (["try", "catch"].includes(node.kind)) {
     return false;
@@ -505,7 +494,7 @@ function shouldPrintHardLineAfterStartInControlStructure(path) {
 }
 
 function shouldPrintHardLineBeforeEndInControlStructure(path) {
-  const node = path.getValue();
+  const { node } = path;
 
   if (["try", "catch"].includes(node.kind)) {
     return true;
@@ -544,7 +533,7 @@ function getAlignment(text) {
 }
 
 function getNextNode(path, node) {
-  const parent = path.getParentNode();
+  const { parent } = path;
   const children = getNodeListProperty(parent);
 
   if (!children) {
@@ -606,7 +595,7 @@ function useDoubleQuote(node, options) {
 }
 
 function hasEmptyBody(path, name = "body") {
-  const node = path.getValue();
+  const { node } = path;
 
   return (
     node[name] &&
@@ -692,7 +681,7 @@ function normalizeMagicMethodName(name) {
   return name;
 }
 
-module.exports = {
+export {
   printNumber,
   getPrecedence,
   isBitwiseOperator,
@@ -708,8 +697,6 @@ module.exports = {
   fileShouldEndWithHardline,
   maybeStripLeadingSlashFromUse,
   hasDanglingComments,
-  hasLeadingComment,
-  hasTrailingComment,
   docShouldHaveTrailingNewline,
   isLookupNode,
   isFirstChildrenInlineNode,