Desugar stmt expr before checking whether it's suffixed

roc-lang · Oct 15, 2024 · 5c5c263 · 5c5c263
1 parent 4c55930
commit 5c5c263
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/crates/compiler/can/src/desugar.rs b/crates/compiler/can/src/desugar.rs
@@ -160,7 +160,9 @@ fn desugar_value_def<'a>(
             // _ : {}
             // _ = stmt_expr!
 
-            if env.fx_mode == FxMode::Task && !is_expr_suffixed(&stmt_expr.value) {
+            let desugared_expr = desugar_expr(env, scope, stmt_expr);
+
+            if env.fx_mode == FxMode::Task && !is_expr_suffixed(&desugared_expr.value) {
                 env.problems.push(Problem::StmtAfterExpr(stmt_expr.region));
 
                 return ValueDef::StmtAfterExpr;
@@ -182,7 +184,7 @@ fn desugar_value_def<'a>(
                 )),
                 lines_between: &[],
                 body_pattern: new_pat,
-                body_expr: desugar_expr(env, scope, stmt_expr),
+                body_expr: desugared_expr,
             }
         }
     }

diff --git a/crates/compiler/parse/src/ast.rs b/crates/compiler/parse/src/ast.rs
@@ -581,10 +581,7 @@ pub fn is_top_level_suffixed(expr: &Expr) -> bool {
 pub fn is_expr_suffixed(expr: &Expr) -> bool {
     match expr {
         // expression without arguments, `read!`
-        Expr::Var {
-            module_name: _,
-            ident,
-        } => ident.ends_with('!'),
+        Expr::Var { .. } => false,
 
         Expr::TrySuffix { .. } => true,
 

diff --git a/examples/cli/effects.roc b/examples/cli/effects.roc
@@ -5,5 +5,12 @@ import pf.Effect
 main : {} => {}
 main = \{} ->
     line = Effect.getLine! {}
+
+    if line == "secret" then
+        Effect.putLine! "You found the secret"
+        Effect.putLine! "Congratulations!"
+    else
+        {}
+
     Effect.putLine! "You entered: $(line)"
     Effect.putLine! "It is known"