refactor isFile to canPrint in operator node

Angry-Potato · Jul 19, 2019 · 4f28afa · 4f28afa
1 parent 18b9b52
commit 4f28afa
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 12 deletions.
diff --git a/src/nodes.js b/src/nodes.js
@@ -38,8 +38,6 @@ const nodes = {
   [NODE_TYPES.FUNCTION_CALL]: require(`./nodes/${NODE_TYPES.FUNCTION_CALL}`)
 };
 
-const isOperator = node => node.token;
-
 const isFunctionCall = node => node.expr && node.typeArgs && node.args;
 
 const assignType = node => {
@@ -77,7 +75,7 @@ const assignType = node => {
     return { ...node, astType: NODE_TYPES.TYPE };
   } else if (nodes[NODE_TYPES.INTEGER].canPrint(node)) {
     return { ...node, astType: NODE_TYPES.INTEGER };
-  } else if (isOperator(node)) {
+  } else if (nodes[NODE_TYPES.OPERATOR].canPrint(node)) {
     return { ...node, astType: NODE_TYPES.OPERATOR };
   } else if (isFunctionCall(node)) {
     return { ...node, astType: NODE_TYPES.FUNCTION_CALL };

diff --git a/src/nodes/operator.js b/src/nodes/operator.js
@@ -4,14 +4,17 @@ const {
   }
 } = require("prettier");
 
-module.exports = (path, opts, print) => {
-  const node = path.getValue();
-  switch (node.token.toLowerCase()) {
-    case "eq":
-      return " == ";
-    case "dot":
-      return ".";
-    default:
-      throw new Error(`UNKNOWN_OPERATOR = ${node.token.toLowerCase()}`);
+module.exports = {
+  canPrint: node => node.token,
+  print: (path, opts, print) => {
+    const node = path.getValue();
+    switch (node.token.toLowerCase()) {
+      case "eq":
+        return " == ";
+      case "dot":
+        return ".";
+      default:
+        throw new Error(`UNKNOWN_OPERATOR = ${node.token.toLowerCase()}`);
+    }
   }
 };