Remove special treatment of concat.

Author: cristianoc

analysis/.depend

@@ -10,7 +10,7 @@ src/FindFiles.cmx : src/Utils.cmx src/SharedTypes.cmx \
     src/Files.cmx src/BuildSystem.cmx
 src/Hover.cmx : src/Utils.cmx src/SharedTypes.cmx src/Shared.cmx \
     src/References.cmx src/ProcessCmt.cmx
-src/Infix.cmx : src/Log.cmx src/Files.cmx
+src/Infix.cmx : src/Log.cmx
 src/Log.cmx :
 src/ModuleResolution.cmx : src/Infix.cmx src/Files.cmx
 src/NewCompletions.cmx : src/Utils.cmx src/Uri2.cmx src/SharedTypes.cmx \

analysis/src/Files.ml

@@ -97,12 +97,3 @@ let rec collect ?(checkDir = fun _ -> true) path test =
       |> List.concat
     else []
   | _ -> if test path then [path] else []
-
-let fileConcat a b =
-  if
-    b <> ""
-    && b.[0] = '.'
-    && String.length b >= 2
-    && b.[1] = Filename.dir_sep.[0]
-  then Filename.concat a (String.sub b 2 (String.length b - 2))
-  else Filename.concat a b

analysis/src/FindFiles.ml

@@ -117,7 +117,7 @@ let collectFiles directory =
 let findProjectFiles ~debug namespace root sourceDirectories compiledBase =
   let files =
     sourceDirectories
-    |> List.map (Files.fileConcat root)
+    |> List.map (Filename.concat root)
     |> ifDebug debug "Source directories" (String.concat " - ")
     |> List.map (fun name -> Files.collect name isSourceFile)
     |> List.concat |> Utils.dedup
@@ -248,7 +248,7 @@ let findDependencyFiles ~debug base config =
                | Some compiledBase ->
                  if debug then Log.log ("Compiled base: " ^ compiledBase);
                  let compiledDirectories =
-                   directories |> List.map (Files.fileConcat compiledBase)
+                   directories |> List.map (Filename.concat compiledBase)
                  in
                  let compiledDirectories =
                    match namespace with

analysis/src/Infix.ml

@@ -27,4 +27,4 @@ let logIfAbsent message x =
     None
   | _ -> x
 
-let ( /+ ) = Files.fileConcat
+let ( /+ ) = Filename.concat