Merge pull request #5465 from unisonweb/fix-count-uses-bug

parser-typechecker/src/Unison/Syntax/TermPrinter.hs

@@ -1285,7 +1285,6 @@ instance Monoid PrintAnnotation where
 
 suffixCounterTerm :: (Var v) => PrettyPrintEnv -> Set Name -> Set Name -> Term2 v at ap v a -> PrintAnnotation
 suffixCounterTerm n usedTm usedTy = \case
-  Var' v -> countHQ mempty $ HQ.unsafeFromVar v
   Ref' r -> countHQ usedTm $ PrettyPrintEnv.termName n (Referent.Ref r)
   Constructor' r | noImportRefs (r ^. ConstructorReference.reference_) -> mempty
   Constructor' r -> countHQ usedTm $ PrettyPrintEnv.termName n (Referent.Con r CT.Data)

unison-src/transcripts/fix-5464.md

@@ -0,0 +1,37 @@
+```ucm
+scratch/main> builtins.merge lib.builtin
+```
+
+```unison
+foo : Nat
+foo =
+  baz = bar.baz + bar.baz
+  19
+
+bar.baz : Nat
+bar.baz = 20
+
+qux : Nat
+qux = foo + foo
+```
+
+```ucm
+scratch/main> add
+```
+
+```unison
+foo : Nat
+foo =
+  baz = bar.baz + bar.baz
+  20
+
+bar.baz : Nat
+bar.baz = 20
+```
+
+This update used to fail because `foo` would incorrectly print with a `use bar baz` statement, which caused references
+to `bar.baz` to be captured by its locally-bound `baz`.
+
+```ucm
+scratch/main> update
+```

unison-src/transcripts/fix-5464.output.md

@@ -0,0 +1,86 @@
+``` ucm
+scratch/main> builtins.merge lib.builtin
+
+  Done.
+
+```
+``` unison
+foo : Nat
+foo =
+  baz = bar.baz + bar.baz
+  19
+
+bar.baz : Nat
+bar.baz = 20
+
+qux : Nat
+qux = foo + foo
+```
+
+``` ucm
+
+  Loading changes detected in scratch.u.
+
+  I found and typechecked these definitions in scratch.u. If you
+  do an `add` or `update`, here's how your codebase would
+  change:
+  
+    ⍟ These new definitions are ok to `add`:
+    
+      bar.baz : Nat
+      foo     : Nat
+      qux     : Nat
+
+```
+``` ucm
+scratch/main> add
+
+  ⍟ I've added these definitions:
+  
+    bar.baz : Nat
+    foo     : Nat
+    qux     : Nat
+
+```
+``` unison
+foo : Nat
+foo =
+  baz = bar.baz + bar.baz
+  20
+
+bar.baz : Nat
+bar.baz = 20
+```
+
+``` ucm
+
+  Loading changes detected in scratch.u.
+
+  I found and typechecked these definitions in scratch.u. If you
+  do an `add` or `update`, here's how your codebase would
+  change:
+  
+    ⊡ Previously added definitions will be ignored: bar.baz
+    
+    ⍟ These names already exist. You can `update` them to your
+      new definition:
+    
+      foo : Nat
+
+```
+This update used to fail because `foo` would incorrectly print with a `use bar baz` statement, which caused references
+to `bar.baz` to be captured by its locally-bound `baz`.
+
+``` ucm
+scratch/main> update
+
+  Okay, I'm searching the branch for code that needs to be
+  updated...
+
+  That's done. Now I'm making sure everything typechecks...
+
+  Everything typechecks, so I'm saving the results...
+
+  Done.
+
+```