make code reuseable

Author: ido

intellij-common/src/com/wix/nodejs/NodeFinder.java

@@ -16,10 +16,9 @@
 import java.util.regex.Pattern;
 
 public final class NodeFinder {
-    public static final String RT_BASE_NAME = SystemInfo.isWindows ? "rt.cmd" : "rt";
+//    public static final String RT_BASE_NAME = SystemInfo.isWindows ? "rt.cmd" : "rt";
     private static final Pattern NVM_NODE_DIR_NAME_PATTERN = Pattern.compile("^v?(\\d+)\\.(\\d+)\\.(\\d+)$");
     public static final String NODE_MODULES = "node_modules";
-    public static final String DEFAULT_RT_BIN = SystemInfo.isWindows ? "node_modules\\.bin\\rt.cmd" : "node_modules/react-templates/bin/rt.js";
 
     // TODO figure out a way to automatically get this path or add it to config
     // should read from /usr/local/lib/node_modules/eslint/lib/rules
@@ -29,16 +28,20 @@ public final class NodeFinder {
     private NodeFinder() {
     }
 
+    public static String getBinName(String baseBinName) {
+        return SystemInfo.isWindows ? baseBinName + ".cmd" : baseBinName;
+    }
+
     // List infos = ContainerUtil.newArrayList();
     // NodeModuleSearchUtil.findModulesWithName(infos, "eslint", project.getBaseDir(), null, false);
 
-    @Nullable
-    public static File findInterpreterInPath() {
-        return PathEnvironmentVariableUtil.findInPath(RT_BASE_NAME);
-    }
+//    @Nullable
+//    public static File findInterpreterInPath() {
+//        return PathEnvironmentVariableUtil.findInPath(RT_BASE_NAME);
+//    }
 
     @NotNull
-    public static List<File> listPossibleRTExe(String exeFileName) {
+    public static List<File> searchNodeModulesBin(String exeFileName) {
         Set<File> interpreters = ContainerUtil.newLinkedHashSet();
         List<File> fromPath = PathEnvironmentVariableUtil.findAllExeFilesInPath(exeFileName);
         List<File> nvmInterpreters = listNodeInterpretersFromNvm(exeFileName);
@@ -51,11 +54,35 @@ public static List<File> listPossibleRTExe(String exeFileName) {
         return ContainerUtil.newArrayList(interpreters);
     }
 
+    @NotNull
+    public static List<File> searchAllScopesForBin(File projectRoot, String exeFileName) {
+//        List<File> nodeModules = searchProjectNodeModules(projectRoot);
+        List<File> globalJscsBin = searchNodeModulesBin(exeFileName);
+        File file = resolvePath(projectRoot, NODE_MODULES, ".bin", exeFileName);
+        if (file.exists()) {
+            globalJscsBin.add(file);
+        }
+
+//        if (SystemInfo.isWindows) {
+//            File file = resolvePath(projectRoot, NODE_MODULES, ".bin", exeFileName);
+//            if (file.exists()) {
+//                globalJscsBin.add(file);
+//            }
+//        } else {
+//            File file = resolvePath(projectRoot, NODE_MODULES, ".bin", exeFileName);
+//            if (file.exists()) {
+//                globalJscsBin.add(file);
+//            }
+//        }
+//        globalJscsBin.addAll(nodeModules);
+        return globalJscsBin;
+    }
+
 //    @NotNull
 //    public static List<File> searchForRTBin(File projectRoot) {
 ////        List<File> nodeModules = searchProjectNodeModules(projectRoot);
 //        List<File> globalRTBin = listPossibleRTExe(exeFileName);
-//
+
 //        if (SystemInfo.isWindows) {
 //            File file = resolvePath(projectRoot, NODE_MODULES, ".bin", "rt.cmd");
 //            if (file.exists()) {

intellij-common/src/com/wix/utils/FileUtils.java

@@ -274,4 +274,48 @@ public static VirtualFile findFileByPath(VirtualFile path, String valuePath) {
         }
         return file;
     }
+
+
+    public static String join(String file, String ext) {
+        return file + '/' + ext;
+    }
+
+    public static String removeExt(String file, String ext) {
+        if (file.endsWith(ext)) {
+            return file.replace(ext, "");
+        }
+        return file;
+    }
+
+    public static String relativePath(VirtualFile root, VirtualFile file) {
+        // get project relative path
+        return file.getPath().substring(root.getPath().length() + 1);
+    }
+
+    public static String getNormalizedPath(int doubleDotCount, String[] pathsOfPath) {
+        StringBuilder newValuePath = new StringBuilder();
+        for (int i = 0; i < pathsOfPath.length - doubleDotCount; i++) {
+            if (0 != i) {
+                newValuePath.append('/');
+            }
+            newValuePath.append(pathsOfPath[i]);
+        }
+        return newValuePath.toString();
+    }
+
+    public static int getDoubleDotCount(String valuePath) {
+        int doubleDotCount = (valuePath.length() - valuePath.replaceAll("\\.\\.", "").length()) / 2;
+        boolean doubleDotCountTrues = false;
+
+        while (!doubleDotCountTrues && 0 != doubleDotCount) {
+            if (valuePath.startsWith(StringUtil.repeat("../", doubleDotCount))) {
+                doubleDotCountTrues = true;
+            } else if (valuePath.startsWith(StringUtil.repeat("../", doubleDotCount - 1) + "..")) {
+                doubleDotCountTrues = true;
+            } else {
+                doubleDotCount--;
+            }
+        }
+        return doubleDotCount;
+    }
 }