change working directory before running bsc for ppxs

src/analyze/AsYouType.re

@@ -95,18 +95,18 @@ let justBscCommand = (~interface, compilerPath, sourceFile, includes, flags) =>
  )
 };
 
-let runBsc = (~interface, compilerPath, sourceFile, includes, flags) => {
+let runBsc = (~basePath, ~interface, compilerPath, sourceFile, includes, flags) => {
  let cmd = justBscCommand(~interface, compilerPath, sourceFile, includes, flags);
- Log.log("running bsc " ++ cmd);
- let (out, error, success) = Commands.execFull(cmd);
+ Log.log("running bsc " ++ cmd ++ " with pwd " ++ basePath);
+ let (out, error, success) = Commands.execFull(~pwd=basePath, cmd);
  if (success) {
  Ok(out @ error)
  } else {
  Error(out @ error)
  }
 };
 
-let process = (~uri, ~moduleName, text, ~cacheLocation, compilerPath, refmtPath, includes, flags) => {
+let process = (~uri, ~moduleName, ~basePath, text, ~cacheLocation, compilerPath, refmtPath, includes, flags) => {
  let interface = Utils.endsWith(uri, "i");
  let%try (syntaxError, astFile) = switch (refmtPath) {
  | Some(refmtPath) => runRefmt(~interface, ~moduleName, ~cacheLocation, text, refmtPath);
@@ -116,9 +116,9 @@ let process = (~uri, ~moduleName, text, ~cacheLocation, compilerPath, refmtPath,
  Ok((None, astFile))
  }
  };
- switch (runBsc(~interface, compilerPath, astFile, includes, flags)) {
+ switch (runBsc(~basePath, ~interface, compilerPath, astFile, includes, flags)) {
  | Error(lines) => {
- let cmtPath = cacheLocation /+ moduleName ++ ".cmt";
+ let cmtPath = cacheLocation /+ moduleName ++ ".cmt" ++ (interface ? "i" : "");
  if (!Files.isFile(cmtPath)) {
  Ok(TypeError(String.concat("\n", lines), SharedTypes.initFull(moduleName, uri)))
  } else {
@@ -139,7 +139,7 @@ let process = (~uri, ~moduleName, text, ~cacheLocation, compilerPath, refmtPath,
  }
  }
  | Ok(lines) => {
- let cmt = Cmt_format.read_cmt(cacheLocation /+ moduleName ++ ".cmt");
+ let cmt = Cmt_format.read_cmt(cacheLocation /+ moduleName ++ ".cmt" ++ (interface ? "i" : ""));
  let%try file = ProcessCmt.forCmt(uri, x => x, cmt);
  let%try_wrap extra = ProcessExtra.forCmt(~file, cmt);
  Success(lines, {file, extra})

src/analyze/State.re

@@ -452,6 +452,7 @@ let getCompilationResult = (uri, state, ~package) => {
  let%try result = AsYouType.process(
  ~uri,
  ~moduleName,
+ ~basePath=package.basePath,
  text,
  ~cacheLocation=package.tmpPath,
  package.compilerPath,

src/analyze/core/ProcessExtra.re

@@ -539,5 +539,10 @@ let forCmt = (~file, {cmt_modname, cmt_annots}: Cmt_format.cmt_infos) => switch
 | Implementation(structure) => {
  Ok(forItems(~file, structure.str_items, [||]))
 }
+| Partial_interface(_)
+| Interface(_) => {
+ /** TODO actually process signature items */
+ Ok(forItems(~file, [], [||]))
+}
 | _ => Error("Invalid cmt file")
 };

src/util/Commands.re

@@ -15,7 +15,22 @@ let execFull = (~input=?, ~pwd=?, ~env=Unix.environment(), cmd) => {
  | None => env
  | Some(pwd) => Array.map(item => String.length(item) > 4 && String.sub(item, 0, 4) == "PWD=" ? "PWD=" ++ pwd : item, env)
  };
+ let prevCwd = switch pwd {
+ | None => None
+ | Some(pwd) =>
+ let prevCwd = Unix.getcwd();
+ if (prevCwd == pwd) {
+ None
+ } else {
+ Unix.chdir(pwd);
+ Some(prevCwd)
+ }
+ }
  let (cmd_out, cmd_in, cmd_err) = Unix.open_process_full(cmd, env);
+ switch prevCwd {
+ | None => ()
+ | Some(prevCwd) => Unix.chdir(prevCwd)
+ };
 
  switch input {
  | None => ()

tests/lib/TestUtils.re

@@ -114,6 +114,7 @@ let setUp = (files, text) => {
  let%try_force result = AsYouType.process(
  ~uri,
  ~moduleName,
+ ~basePath=package.basePath,
  contents,
  ~cacheLocation=tmp,
  "./node_modules/.bin/bsc",
@@ -129,6 +130,7 @@ let setUp = (files, text) => {
  let%try_force result = AsYouType.process(
  ~uri=mainUri,
  ~moduleName="Test",
+ ~basePath=package.basePath,
  text,
  ~cacheLocation=tmp,
  "./node_modules/.bin/bsc",