bugfix: don't consider shortening variables with use statements

sellout · Nov 25, 2024 · f37d844 · f37d844
1 parent c08c309
commit f37d844
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 29 deletions.
diff --git a/parser-typechecker/src/Unison/Syntax/TermPrinter.hs b/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)

diff --git a/unison-src/transcripts/fix-5464.md b/unison-src/transcripts/fix-5464.md
@@ -29,9 +29,9 @@ bar.baz : Nat
 bar.baz = 20
 ```
 
-This update should succeed, but it fails because `foo` is incorrectly printed with a `use bar baz` statement, which
-causes references to `bar.baz` to be captured by its locally-bound `baz`.
+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:error
+```ucm
 scratch/main> update
 ```
diff --git a/unison-src/transcripts/fix-5464.output.md b/unison-src/transcripts/fix-5464.output.md
@@ -68,8 +68,8 @@ bar.baz = 20
       foo : Nat
 
 ```
-This update should succeed, but it fails because `foo` is incorrectly printed with a `use bar baz` statement, which
-causes references to `bar.baz` to be captured by its locally-bound `baz`.
+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
@@ -79,29 +79,8 @@ scratch/main> update
 
   That's done. Now I'm making sure everything typechecks...
 
-  Typechecking failed. I've updated your scratch file with the
-  definitions that need fixing. Once the file is compiling, try
-  `update` again.
+  Everything typechecks, so I'm saving the results...
 
-```
-``` unison :added-by-ucm scratch.u
-foo : Nat
-foo =
-  use Nat +
-  use bar baz
-  baz = baz + baz
-  20
-
-bar.baz : Nat
-bar.baz = 20
-
--- The definitions below no longer typecheck with the changes above.
--- Please fix the errors and try `update` again.
-
-qux : Nat
-qux =
-  use Nat +
-  foo + foo
+  Done.
 
 ```
-