bugfix: require relative names in import{Wordy,Symboly}Id

unison-src/transcripts/idempotent/fix-4536.md

@@ -0,0 +1,154 @@
+``` ucm
+scratch/main> builtins.merge lib.builtin
+
+  Done.
+```
+
+``` unison :error
+foo : Nat
+foo =
+  use Nat .+
+  1 + 2
+```
+
+``` ucm :added-by-ucm
+  Loading changes detected in scratch.u.
+
+  I got confused here:
+
+      3 |   use Nat .+
+
+
+  I was surprised to find a '.' here.
+  I was expecting one of these instead:
+
+  * bang
+  * binding
+  * do
+  * false
+  * force
+  * handle
+  * if
+  * lambda
+  * let
+  * newline or semicolon
+  * pattern
+  * quote
+  * termLink
+  * true
+  * tuple
+  * typeLink
+```
+
+``` unison :error
+foo : Nat
+foo =
+  use .lib.builtin.Nat +
+  1 + 2
+```
+
+``` ucm :added-by-ucm
+  Loading changes detected in scratch.u.
+
+    😶
+
+    I was expecting something after the use keyword
+
+        3 |   use .lib.builtin.Nat +
+
+    Here's a few examples of valid `use` statements:
+
+      use math sqrt    Introduces `sqrt` as a local alias for
+                       `math.sqrt`
+      use List :+      Introduces `:+` as a local alias for
+                       `List.:+`.
+      use .foo bar.baz Introduces `bar.baz` as a local alias for
+                       the absolute name `.foo.bar.baz`
+```
+
+``` unison :error
+namespace .foo
+```
+
+``` ucm :added-by-ucm
+  Loading changes detected in scratch.u.
+
+  I got confused here:
+
+      1 | namespace .foo
+
+
+  I was surprised to find a .foo here.
+```
+
+``` unison :error
+unique[.foo] type Foo = Foo
+```
+
+``` ucm :added-by-ucm
+  Loading changes detected in scratch.u.
+
+  I got confused here:
+
+      1 | unique[.foo] type Foo = Foo
+
+
+  I was surprised to find a .foo here.
+```
+
+``` unison :error
+.foo> 17
+```
+
+``` ucm :added-by-ucm
+  Loading changes detected in scratch.u.
+
+  This looks like the start of an expression here 
+
+      1 | .foo> 17
+
+  but at the file top-level, I expect one of the following:
+
+    - A binding, like .foo = 42 OR
+                      .foo : Nat
+                      .foo = 42
+    - A watch expression, like > .foo + 1
+    - An `ability` declaration, like unique ability Foo where ...
+    - A `type` declaration, like structural type Optional a = None | Some a
+```
+
+``` unison :error
+foo.> 17
+```
+
+``` ucm :added-by-ucm
+  Loading changes detected in scratch.u.
+
+  I got confused here:
+
+      1 | foo.> 17
+
+
+  I was surprised to find a foo.> here.
+  I was expecting one of these instead:
+
+  * ability
+  * bang
+  * binding
+  * do
+  * false
+  * force
+  * handle
+  * if
+  * lambda
+  * let
+  * namespace
+  * newline or semicolon
+  * quote
+  * termLink
+  * true
+  * tuple
+  * type
+  * typeLink
+  * use
+```

unison-src/transcripts/idempotent/generic-parse-errors.md

@@ -33,27 +33,7 @@ namespace.blah = 1
       1 | namespace.blah = 1
 
 
-  I was surprised to find a = here.
-  I was expecting one of these instead:
-
-  * ability
-  * bang
-  * binding
-  * do
-  * false
-  * force
-  * handle
-  * if
-  * lambda
-  * let
-  * newline or semicolon
-  * quote
-  * termLink
-  * true
-  * tuple
-  * type
-  * typeLink
-  * use
+  I was surprised to find a .blah here.
 ```
 
 ``` unison :error

unison-syntax/src/Unison/Syntax/Parser.hs

@@ -357,16 +357,16 @@ wordyDefinitionName = queryToken \case
   L.WordyId n -> Just $ Name.toVar (HQ'.toName n)
   _ -> Nothing
 
--- | Parse a wordyId as a Name, rejecting any hash
+-- | Parse a wordyId as a relative Name, rejecting any hash
 importWordyId :: (Ord v) => P v m (L.Token Name)
 importWordyId = queryToken \case
-  L.WordyId (HQ'.NameOnly n) -> Just n
+  L.WordyId (HQ'.NameOnly n) | Name.isRelative n -> Just n
   _ -> Nothing
 
--- | The `+` in: use Foo.bar + as a Name
+-- | The `+` in: use Foo.bar + as a relative Name
 importSymbolyId :: (Ord v) => P v m (L.Token Name)
 importSymbolyId = queryToken \case
-  L.SymbolyId (HQ'.NameOnly n) -> Just n
+  L.SymbolyId (HQ'.NameOnly n) | Name.isRelative n -> Just n
   _ -> Nothing
 
 -- | Parse a symboly ID like >>= or &&, discarding any hash