fixed signed int issue

and tweaked output message
unisonweb · Nov 28, 2023 · 5c5f8f5 · 5c5f8f5
1 parent 5bc3324
commit 5c5f8f5
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 19 deletions.
diff --git a/unison-cli/src/Unison/Codebase/Editor/HandleInput/Update2.hs b/unison-cli/src/Unison/Codebase/Editor/HandleInput/Update2.hs
@@ -381,9 +381,9 @@ findCtorNames names forwardCtorNames ctorCount n =
       insertShortest m _ = m
       m = foldl' insertShortest mempty (Foldable.toList center)
       ctorCountGuess = fromMaybe (Map.size m) ctorCount
-   in if Map.size m == ctorCountGuess && all (isJust . flip Map.lookup m) [0 .. fromIntegral ctorCountGuess - 1]
+   in if Map.size m == ctorCountGuess && all (isJust . flip Map.lookup m . fromIntegral) [0 .. ctorCountGuess - 1]
         then Right $ Map.elems m
-        else Left $ Output.UpdateIncompleteConstructorSet n m ctorCountGuess
+        else Left $ Output.UpdateIncompleteConstructorSet n m ctorCount
 
 -- Used by `findCtorNames` to filter `forwardCtorNames` to a narrow range which will be searched linearly.
 -- >>> incrementLastSegmentChar $ ForwardName.fromName $ Name.unsafeFromText "foo.bar.quux"

diff --git a/unison-cli/src/Unison/Codebase/Editor/Output.hs b/unison-cli/src/Unison/Codebase/Editor/Output.hs
@@ -390,7 +390,7 @@ data Output
   | UpdateStartTypechecking
   | UpdateTypecheckingFailure
   | UpdateTypecheckingSuccess
-  | UpdateIncompleteConstructorSet Name (Map ConstructorId Name) Int
+  | UpdateIncompleteConstructorSet Name (Map ConstructorId Name) (Maybe Int)
   | UpgradeFailure !NameSegment !NameSegment
   | UpgradeSuccess !NameSegment !NameSegment
 

diff --git a/unison-cli/src/Unison/CommandLine/OutputMessages.hs b/unison-cli/src/Unison/CommandLine/OutputMessages.hs
@@ -2193,7 +2193,7 @@ notifyUser dir = \case
       P.lines
         [ P.wrap $
             "I couldn't complete the update because I couldn't find"
-              <> fromString (show expectedCount)
+              <> fromString (maybe "" show expectedCount)
               <> "constructor(s) for"
               <> prettyName name
               <> "where I expected to."

diff --git a/unison-src/transcripts/update-type-add-new-record.md b/unison-src/transcripts/update-type-add-new-record.md
@@ -6,9 +6,7 @@
 unique type Foo = { bar : Nat }
 ```
 
-This shouldn't be an error.
-
-```ucm:error
+```ucm
 .> update
 .> view Foo
 ```
diff --git a/unison-src/transcripts/update-type-add-new-record.output.md b/unison-src/transcripts/update-type-add-new-record.output.md
@@ -16,8 +16,6 @@ unique type Foo = { bar : Nat }
       Foo.bar.set    : Nat -> Foo -> Foo
 
 ```
-This shouldn't be an error.
-
 ```ucm
 .> update
 
@@ -28,18 +26,10 @@ This shouldn't be an error.
 
   Everything typechecks, so I'm saving the results...
 
-  I couldn't complete the update because I couldn't find 0
-  constructor(s) for Foo where I expected to. I found: []
-  
-  You can use `view Foo` and
-  `alias.term <hash> Foo.<ConstructorName>` to give names to
-  each constructor, and then try again.
+  Done.
 
 .> view Foo
 
-  ⚠️
-  
-  The following names were not found in the codebase. Check your spelling.
-    Foo
+  unique type Foo = { bar : Nat }
 
 ```