Diff: show path on LibFoundAtUnexpectedPath error

Author: hojberg

src/UnisonShare/BranchDiffState.elm

@@ -27,7 +27,7 @@ type DiffError
         , constructorName2 : FQN
         }
     | StrayConstructor { culprit : DiffErrorCulprit, constructorName : FQN }
-    | LibFoundAtUnexpectedPath
+    | LibFoundAtUnexpectedPath { path : FQN }
     | UnknownError
 
 
@@ -74,6 +74,10 @@ decodeDiffError =
         makeStrayConstructor culprit ctor =
             StrayConstructor
                 { culprit = culprit, constructorName = ctor }
+
+        makeLibFoundAtUnexpectedPath path =
+            LibFoundAtUnexpectedPath
+                { path = path }
     in
     Decode.oneOf
         [ whenTagIs "impossibleError"
@@ -102,7 +106,7 @@ decodeDiffError =
                 (Decode.field "constructorName" FQN.decode)
             )
         , whenTagIs "libFoundAtUnexpectedPath"
-            (Decode.succeed LibFoundAtUnexpectedPath)
+            (Decode.map makeLibFoundAtUnexpectedPath (Decode.field "path" FQN.decode))
         , Decode.succeed UnknownError
         ]
 

src/UnisonShare/Page/ProjectContributionChangesPage.elm

@@ -995,9 +995,10 @@ view appContext projectRef contribution model =
                                 , text " branch."
                                 ]
 
-                        BranchDiffState.LibFoundAtUnexpectedPath ->
+                        BranchDiffState.LibFoundAtUnexpectedPath { path } ->
                             Just
-                                [ text "lib namespace found at unexpected path."
+                                [ text "lib namespace found at unexpected path: "
+                                , FQN.view path
                                 ]
 
                         _ ->

tests/e2e/TestHelpers/Data.ts

@@ -211,28 +211,32 @@ type DiffErrorCulprit = "new" | "old";
 type DiffErrorDetails =
   | { tag: "impossibleError" }
   | {
-      tag: "constructorAlias";
-      oldOrNewBranch: DiffErrorCulprit;
-      typeName: string;
-      constructorName1: string;
-      constructorName2: string;
-    }
+    tag: "constructorAlias";
+    oldOrNewBranch: DiffErrorCulprit;
+    typeName: string;
+    constructorName1: string;
+    constructorName2: string;
+  }
   | {
-      tag: "missingConstructorName";
-      oldOrNewBranch: DiffErrorCulprit;
-      typeName: string;
-    }
+    tag: "missingConstructorName";
+    oldOrNewBranch: DiffErrorCulprit;
+    typeName: string;
+  }
   | {
-      tag: "nestedDeclAlias";
-      oldOrNewBranch: DiffErrorCulprit;
-      constructorName1: string;
-      constructorName2: string;
-    }
+    tag: "nestedDeclAlias";
+    oldOrNewBranch: DiffErrorCulprit;
+    constructorName1: string;
+    constructorName2: string;
+  }
+  | {
+    tag: "strayConstructor";
+    oldOrNewBranch: DiffErrorCulprit;
+    constructorName: string;
+  }
   | {
-      tag: "strayConstructor";
-      oldOrNewBranch: DiffErrorCulprit;
-      constructorName: string;
-    };
+    tag: "libFoundAtUnexpectedPath";
+    path: string;
+  };
 
 type ContributionDiffConfig =
   | { tag: "ok" }