Some rewatch fixes (#1033)

* pick up on namespace-entry

* fix workspace lookup

* fix crash when log file dissappears

* fix

* remove log

* add changelog items

Author: jfrolich

CHANGELOG.md

@@ -12,6 +12,18 @@
 
 ## master
 
+#### :bug: Bug Fix
+
+- Fix a regression with incremental typechecking in monorepos with rewatch, where the workspace directory was not properly set.
+
+#### :bug: Bug Fix
+
+- When log files are deleted (due to a clean), the editor tooling doesn't crash anymore
+
+#### :rocket: New Feature
+
+- Support for the `namespace-entry` feature of rewatch, to allow entrypoint modules for namespaced packages.
+
 ## 1.54.0
 
 #### :nail_care: Polish

analysis/src/FindFiles.ml

@@ -95,14 +95,18 @@ let nameSpaceToName n =
 
 let getNamespace config =
   let ns = config |> Json.get "namespace" in
+  let namespaceEntry = config |> Json.get "namespace-entry" in
   let fromString = ns |> bind Json.string in
   let isNamespaced =
     ns |> bind Json.bool |> Option.value ~default:(fromString |> Option.is_some)
   in
   let either x y = if x = None then y else x in
   if isNamespaced then
     let fromName = config |> Json.get "name" |> bind Json.string in
-    either fromString fromName |> Option.map nameSpaceToName
+    let name = either fromString fromName |> Option.map nameSpaceToName in
+    match (namespaceEntry, name) with
+    | Some _, Some name -> Some ("@" ^ name)
+    | _ -> name
   else None
 
 module StringSet = Set.Make (String)

server/src/incrementalCompilation.ts

@@ -376,7 +376,7 @@ function triggerIncrementalCompilationOfFile(
       return;
     }
     const workspaceRootPath = projectRootPath
-      ? utils.findProjectRootOfFile(projectRootPath)
+      ? utils.findProjectRootOfFile(projectRootPath, true)
       : null;
 
     const bscBinaryLocation = project.bscBinaryLocation;

server/src/server.ts

@@ -227,13 +227,17 @@ let compilerLogsWatcher = chokidar
         }
       }
     } else {
-      sendUpdatedDiagnostics();
-      sendCompilationFinishedMessage();
-      if (config.extensionConfiguration.inlayHints?.enable === true) {
-        sendInlayHintsRefresh();
-      }
-      if (config.extensionConfiguration.codeLens === true) {
-        sendCodeLensRefresh();
+      try {
+        sendUpdatedDiagnostics();
+        sendCompilationFinishedMessage();
+        if (config.extensionConfiguration.inlayHints?.enable === true) {
+          sendInlayHintsRefresh();
+        }
+        if (config.extensionConfiguration.codeLens === true) {
+          sendCodeLensRefresh();
+        }
+      } catch {
+        console.log("Error while sending updated diagnostics");
       }
     }
   });

server/src/utils.ts

@@ -47,13 +47,14 @@ let findProjectRootOfFileInDir = (
 // TODO: races here?
 // TODO: this doesn't handle file:/// scheme
 export let findProjectRootOfFile = (
-  source: p.DocumentUri
+  source: p.DocumentUri,
+  skipParent?: boolean
 ): null | p.DocumentUri => {
   // First look in project files
   let foundRootFromProjectFiles: string | null = null;
 
   for (const rootPath of projectsFiles.keys()) {
-    if (source.startsWith(rootPath)) {
+    if (source.startsWith(rootPath) && (!skipParent || source !== rootPath)) {
       // Prefer the longest path (most nested)
       if (
         foundRootFromProjectFiles == null ||