Merge pull request #5779 from unisonweb/713-fuzzy-name-res

Author: aryairani

parser-typechecker/src/Unison/PrintError.hs

@@ -740,7 +740,7 @@ renderTypeError e env src = case e of
                         ]
                     ),
                   "\n\n",
-                  Pr.wrap "I found some terms in scope that have matching names and types. Maybe you meant one of these:",
+                  Pr.wrap "I found some terms in scope that have matching names and types. Was any of these what you wanted?",
                   "\n\n",
                   intercalateMap "\n" (renderSuggestion env) suggestionsRightNameRightType
                 ]
@@ -889,9 +889,9 @@ renderTypeError e env src = case e of
               "different name",
               pl "" "s",
               ". ",
-              "Maybe you meant ",
-              pl "this" "one of these",
-              ":\n\n"
+              "Was ",
+              pl "this" "any of these",
+              " what you wanted?\n\n"
             ]
         )
     preambleDifferentNameWrongType pl =
@@ -908,9 +908,9 @@ renderTypeError e env src = case e of
               "different type",
               pl "" "s",
               ". ",
-              "Maybe you meant ",
-              pl "this" "one of these",
-              ":\n\n"
+              "Was ",
+              pl "this" "any of these",
+              " what you wanted?\n\n"
             ]
         )
     formatWrongs txt wrongs =

unison-src/transcripts-manual/rewrites.output.md

@@ -339,7 +339,7 @@ scratch/main> load
      19 |   bar21
 
   I found a term in scope with a similar name but a different 
-  type. Maybe you meant this:
+  type. Was this what you wanted?
 
   bar1 : Nat
 ```
@@ -392,7 +392,7 @@ scratch/main> load
       6 |   a1
 
   I found some terms in scope with similar names but different 
-  types. Maybe you meant one of these:
+  types. Was any of these what you wanted?
 
   (<|) : (i ->{g} o) -> i ->{g} o
   Bytes.at : Nat -> Bytes -> Optional Nat

unison-src/transcripts/idempotent/destructuring-binds.md

@@ -90,7 +90,7 @@ ex4 =
       2 |   (a,b) = (a Nat.+ b, 19)
 
   I found some terms in scope with similar names but different 
-  types. Maybe you meant one of these:
+  types. Was any of these what you wanted?
 
   (Float.*) : Float -> Float -> Float
   (Int.*) : Int -> Int -> Int

unison-src/transcripts/idempotent/fix845.md

@@ -43,7 +43,7 @@ Now, typecheck a file with a reference to `Blah.zonk` (which doesn't exist in th
       2 | > Blah.zonk [1,2,3]
 
   I found some terms in scope with similar names but different 
-  types. Maybe you meant one of these:
+  types. Was any of these what you wanted?
 
   Text.zonk : Text -> Text
   List.zonk : [a] -> [a]

unison-src/transcripts/idempotent/name-resolution-fuzzy.md

@@ -65,7 +65,7 @@ myFunction = TRuncate
       4 | myFunction = TRuncate
 
   I found some terms in scope with similar names but different 
-  types. Maybe you meant one of these:
+  types. Was any of these what you wanted?
 
   truncate0 : Int -> Nat
   truncate : Float -> Int
@@ -86,7 +86,7 @@ myFunction = builtin.io2.Ref.ca1
       4 | myFunction = builtin.io2.Ref.ca1
 
   I found a term in scope with a similar name but a different 
-  type. Maybe you meant this:
+  type. Was this what you wanted?
 
   cas : Ref {IO} a -> Ticket a -> a ->{IO} Boolean
 ```
@@ -117,7 +117,7 @@ x = biz.bete
       2 | x = biz.bete
 
   I found some terms in scope with similar names but different 
-  types. Maybe you meant one of these:
+  types. Was any of these what you wanted?
 
   byte : Boolean
   bite : Nat
@@ -141,7 +141,7 @@ myFunction = Flat.TRuncate2x4
       3 | myFunction = Flat.TRuncate2x4
 
   I found some terms in scope with similar names but different 
-  types. Maybe you meant one of these:
+  types. Was any of these what you wanted?
 
   truncate : Float -> Int
   truncate0 : Int -> Nat
@@ -162,7 +162,7 @@ myFunction = X
       4 | myFunction = X
 
   I found some terms in scope with similar names but different 
-  types. Maybe you meant one of these:
+  types. Was any of these what you wanted?
 
   (Float.*) : Float -> Float -> Float
   (Int.*) : Int -> Int -> Int
@@ -184,7 +184,7 @@ myFunction = In.X
       4 | myFunction = In.X
 
   I found some terms in scope with similar names but different 
-  types. Maybe you meant one of these:
+  types. Was any of these what you wanted?
 
   (Int.*) : Int -> Int -> Int
   (Int.+) : Int -> Int -> Int
@@ -216,7 +216,7 @@ f =
      10 |   if A then xYzlmno else ()
 
   I found some terms in scope with similar names but different 
-  types. Maybe you meant one of these:
+  types. Was any of these what you wanted?
 
   (Float.*) : Float -> Float -> Float
   (Int.*) : Int -> Int -> Int
@@ -244,7 +244,7 @@ f =
      10 |   if R.xYzlmno then A else ()
 
   I found a term in scope with a similar name but a different 
-  type. Maybe you meant this:
+  type. Was this what you wanted?
 
   L.xyzlmno : Int
 ```

unison-src/transcripts/idempotent/name-resolution.md

@@ -388,7 +388,7 @@ bar = foo + 10
   The name foo is ambiguous. Its type should be: Nat
 
   I found some terms in scope that have matching names and
-  types. Maybe you meant one of these:
+  types. Was any of these what you wanted?
 
   file.foo : Nat
   ns.foo : Nat

unison-src/transcripts/idempotent/resolution-failures.md

@@ -111,7 +111,7 @@ useAmbiguousTerm = ambiguousTerm
   by type, as any type would work here.
 
   I found some terms in scope that have matching names and
-  types. Maybe you meant one of these:
+  types. Was any of these what you wanted?
 
   one.ambiguousTerm : Text
   two.ambiguousTerm : Text

unison-src/transcripts/idempotent/suffixes.md

@@ -108,7 +108,7 @@ scratch/main> add
   by type, as any type would work here.
 
   I found some terms in scope that have matching names and
-  types. Maybe you meant one of these:
+  types. Was any of these what you wanted?
 
   cool.abra.cadabra : Text
   distributed.abra.cadabra : Text