Merge pull request #7548 from smores56/fix-pnc-try

Fix PNC + ? suffix interaction

Author: smores56

crates/check/can_solo/src/desugar.rs

@@ -93,49 +93,41 @@ fn new_op_call_expr<'a>(
                         ),
                     );
                 }
-                TrySuffix(fn_expr) => {
-                    let loc_fn = env.arena.alloc(Loc::at(right.region, **fn_expr));
-                    let function = desugar_expr(env, scope, loc_fn);
+                TrySuffix(PncApply(loc_fn_expr, loc_args)) => {
+                    let function = desugar_expr(env, scope, loc_fn_expr);
+
+                    let mut desugared_args = Vec::with_capacity_in(loc_args.len(), env.arena);
+                    desugared_args.push(desugar_expr(env, scope, left));
+                    for loc_arg in loc_args.iter() {
+                        desugared_args.push(desugar_expr(env, scope, loc_arg));
+                    }
 
                     return Loc::at(
                         region,
                         LowLevelTry(
                             env.arena.alloc(Loc::at(
                                 region,
-                                Expr::Apply(
+                                Expr::PncApply(
                                     function,
-                                    env.arena.alloc([desugar_expr(env, scope, left)]),
-                                    CalledVia::Try,
+                                    Collection::with_items(desugared_args.into_bump_slice()),
                                 ),
                             )),
                             ResultTryKind::OperatorSuffix,
                         ),
                     );
                 }
-                PncApply(
-                    &Loc {
-                        value: TrySuffix(fn_expr),
-                        region: fn_region,
-                    },
-                    loc_args,
-                ) => {
-                    let loc_fn = env.arena.alloc(Loc::at(fn_region, *fn_expr));
+                TrySuffix(fn_expr) => {
+                    let loc_fn = env.arena.alloc(Loc::at(right.region, **fn_expr));
                     let function = desugar_expr(env, scope, loc_fn);
 
-                    let mut desugared_args = Vec::with_capacity_in(loc_args.len() + 1, env.arena);
-                    desugared_args.push(desugar_expr(env, scope, left));
-                    for loc_arg in loc_args.items {
-                        desugared_args.push(desugar_expr(env, scope, loc_arg));
-                    }
-
                     return Loc::at(
                         region,
                         LowLevelTry(
                             env.arena.alloc(Loc::at(
                                 region,
                                 Expr::Apply(
                                     function,
-                                    desugared_args.into_bump_slice(),
+                                    env.arena.alloc([desugar_expr(env, scope, left)]),
                                     CalledVia::Try,
                                 ),
                             )),

crates/compiler/can/tests/test_can.rs

@@ -971,6 +971,29 @@ mod test_can {
         assert_str_value(&cond_args[0].1.value, "123");
     }
 
+    #[test]
+    fn try_desugar_pipe_suffix_pnc() {
+        let src = indoc!(
+            r#"
+                "123" |> Str.to_u64()?
+            "#
+        );
+        let arena = Bump::new();
+        let out = can_expr_with(&arena, test_home(), src);
+
+        assert_eq!(out.problems, Vec::new());
+
+        // Assert that we desugar to:
+        //
+        // Try(Str.to_u64 "123")
+
+        let cond_expr = assert_try_expr(&out.loc_expr.value);
+        let cond_args = assert_func_call(cond_expr, "to_u64", CalledVia::Space, &out.interns);
+
+        assert_eq!(cond_args.len(), 1);
+        assert_str_value(&cond_args[0].1.value, "123");
+    }
+
     #[test]
     fn try_desugar_works_elsewhere() {
         let src = indoc!(