Clean up Infix.

Author: cristianoc

src/rescript-editor-support/EditorSupportCommands.re

@@ -1,4 +1,3 @@
-open Infix;
 module J = JsonShort;
 
 let dumpLocations = (state, ~package, ~file, ~extra, ~selectPos, uri) => {
@@ -51,10 +50,12 @@ let dumpLocations = (state, ~package, ~file, ~extra, ~selectPos, uri) => {
              ~markdown=!state.settings.clientNeedsPlainText,
              ~showPath=state.settings.showModulePathOnHover,
              loc,
-           )
-           |? "";
+           );
          let hover =
-           hoverText == "" ? [] : [("hover", dedupHover(hoverText, i))];
+           switch (hoverText) {
+           | None => []
+           | Some(s) => [("hover", dedupHover(s, i))]
+           };
 
          let uriLocOpt =
            References.definitionForLoc(
@@ -134,7 +135,7 @@ let dump = files => {
   files
   |> List.iter(pathWithPos => {
        let (filePath, selectPos) = pathWithPos |> splitLineChar;
-       let filePath = maybeConcat(Unix.getcwd(), filePath);
+       let filePath = Files.maybeConcat(Unix.getcwd(), filePath);
        let uri = Utils.toUri(filePath);
        let result =
          switch (State.getFullFromCmt(uri, state)) {
@@ -174,7 +175,7 @@ let complete = (~pathWithPos, ~currentFile) => {
   };
   switch (pathWithPos |> splitLineChar) {
   | (filePath, Some(pos)) =>
-    let filePath = maybeConcat(Unix.getcwd(), filePath);
+    let filePath = Files.maybeConcat(Unix.getcwd(), filePath);
     let uri = Utils.toUri(filePath);
     let result =
       switch (State.getFullFromCmt(uri, state)) {

src/rescript-editor-support/Files.re

@@ -187,3 +187,23 @@ let rec collect = (~checkDir=_ => true, path, test) =>
     }
   | _ => test(path) ? [path] : []
   };
+
+let fileConcat = (a, b) =>
+  if (b != ""
+      && b.[0] == '.'
+      && String.length(b) >= 2
+      && b.[1] == Filename.dir_sep.[0]) {
+    Filename.concat(a, String.sub(b, 2, String.length(b) - 2));
+  } else {
+    Filename.concat(a, b);
+  };
+
+let isFullPath = b =>
+  b.[0] == '/' || Sys.win32 && String.length(b) > 1 && b.[1] == ':';
+
+let maybeConcat = (a, b) =>
+  if (b != "" && isFullPath(b)) {
+    b;
+  } else {
+    fileConcat(a, b);
+  };

src/rescript-editor-support/FindFiles.re

@@ -147,7 +147,7 @@ let findProjectFiles =
     (~debug, namespace, root, sourceDirectories, compiledBase) => {
   let files =
     sourceDirectories
-    |> List.map(Infix.fileConcat(root))
+    |> List.map(Files.fileConcat(root))
     |> ifDebug(debug, "Source directories", String.concat(" - "))
     |> List.map(name => Files.collect(name, isSourceFile))
     |> List.concat
@@ -308,7 +308,7 @@ let findDependencyFiles = (~debug, base, config) => {
                    Log.log("Compiled base: " ++ compiledBase);
                  };
                  let compiledDirectories =
-                   directories |> List.map(Infix.fileConcat(compiledBase));
+                   directories |> List.map(Files.fileConcat(compiledBase));
                  let compiledDirectories =
                    namespace == None
                      ? compiledDirectories

src/rescript-editor-support/Infix.re

@@ -52,16 +52,6 @@ let (|?<) = (o, fn) =>
   | Some(v) => fn(v)
   };
 
-let fileConcat = (a, b) =>
-  if (b != ""
-      && b.[0] == '.'
-      && String.length(b) >= 2
-      && b.[1] == Filename.dir_sep.[0]) {
-    Filename.concat(a, String.sub(b, 2, String.length(b) - 2));
-  } else {
-    Filename.concat(a, b);
-  };
-
 let logIfAbsent = (message, x) =>
   switch (x) {
   | None =>
@@ -70,14 +60,4 @@ let logIfAbsent = (message, x) =>
   | _ => x
   };
 
-let isFullPath = b =>
-  b.[0] == '/' || Sys.win32 && String.length(b) > 1 && b.[1] == ':';
-
-let maybeConcat = (a, b) =>
-  if (b != "" && isFullPath(b)) {
-    b;
-  } else {
-    fileConcat(a, b);
-  };
-
-let (/+) = fileConcat;
+let (/+) = Files.fileConcat;

src/rescript-editor-support/Packages.re

@@ -112,7 +112,7 @@ let newBsPackage = (~reportDiagnostics, state, rootPath) => {
     "Got source directories " ++ String.concat(" - ", localSourceDirs),
   );
   let localCompiledDirs =
-    localSourceDirs |> List.map(Infix.fileConcat(compiledBase));
+    localSourceDirs |> List.map(Files.fileConcat(compiledBase));
   let localCompiledDirs =
     namespace == None
       ? localCompiledDirs : [compiledBase, ...localCompiledDirs];