add always return for do blocks with yas style

domluna · Dec 1, 2024 · 8ac2807 · 8ac2807
1 parent aadf4cc
commit 8ac2807
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/src/styles/blue/pretty.jl b/src/styles/blue/pretty.jl
@@ -6,7 +6,7 @@ getstyle(s::BlueStyle) = s.innerstyle isa NoopStyle ? s : s.innerstyle
 
 function options(::BlueStyle)
     return (;
-        always_use_return = true,
+        always_use_return = false,
         short_to_long_function_def = true,
         long_to_short_function_def = false,
         whitespace_ops_in_indices = true,

diff --git a/src/styles/default/pretty.jl b/src/styles/default/pretty.jl
@@ -1520,6 +1520,9 @@ function p_do(
         elseif kind(c) === K"block"
             s.indent += s.opts.indent
             n = pretty(style, c, s, newctx(ctx; ignore_single_line = true), lineage)
+            if s.opts.always_use_return
+                prepend_return!(n, s)
+            end
             add_node!(t, n, s; max_padding = s.opts.indent)
             s.indent -= s.opts.indent
         else

diff --git a/test/options.jl b/test/options.jl
@@ -425,7 +425,7 @@
         str = """
         map(arg1, arg2) do x, y
             expr1
-            expr2
+            return expr2
         end"""
         @test fmt(str_, 4, length(str_) - 1; always_use_return = true) == str