src/options.jl

-Original file line number
+Diff line change
@@ Expand Up / @@ -36,6 +36,7 @@ Base.@kwdef struct Options @@
         yas_style_nesting::Bool = false
         short_circuit_to_if::Bool = false
         disallow_single_arg_nesting::Bool = false
+        preserve_single_line_if::Bool = false
         function Options(args...)
             opts = new(args...)
@@ Expand Down @@

src/styles/default/pretty.jl

-Original file line number
+Diff line change
@@ Expand Up / @@ -1622,9 +1622,14 @@ function p_if( @@
                 add_node!(t, pretty(style, c, s, ctx, lineage), s)
             elseif kind(c) === K"block"
                 s.indent += s.opts.indent
+                block_ctx = if s.opts.preserve_single_line_if
+                    ctx
+                else
+                    newctx(ctx; ignore_single_line = true)
+                end
                 add_node!(
                     t,
-                    pretty(style, c, s, newctx(ctx; ignore_single_line = true), lineage),
+                    pretty(style, c, s, block_ctx, lineage),
                     s;
                     max_padding = s.opts.indent,
                 )
@@ Expand Down @@

Add support for `preserve_single_line_if::Bool` #937

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open

alexandergunnarson wants to merge 3 commits into domluna:master from alexandergunnarson:patch-1

+7 −1

-Original file line number
+Diff line change
@@ Expand Up / @@ -36,6 +36,7 @@ Base.@kwdef struct Options @@
         yas_style_nesting::Bool = false
         short_circuit_to_if::Bool = false
         disallow_single_arg_nesting::Bool = false
+        preserve_single_line_if::Bool = false
         function Options(args...)
             opts = new(args...)
@@ Expand Down @@

-Original file line number
+Diff line change
@@ Expand Up / @@ -1622,9 +1622,14 @@ function p_if( @@
                 add_node!(t, pretty(style, c, s, ctx, lineage), s)
             elseif kind(c) === K"block"
                 s.indent += s.opts.indent
+                block_ctx = if s.opts.preserve_single_line_if
+                    ctx
+                else
+                    newctx(ctx; ignore_single_line = true)
+                end
                 add_node!(
                     t,
-                    pretty(style, c, s, newctx(ctx; ignore_single_line = true), lineage),
+                    pretty(style, c, s, block_ctx, lineage),
                     s;
                     max_padding = s.opts.indent,
                 )
@@ Expand Down @@

Provide feedback