Skip to content

Commit 955de82

Browse files
viralpraxismbj
authored andcommitted
Use Util.one helper where applicable
Follow-up to #395 (comment)
1 parent 954aafb commit 955de82

File tree

7 files changed

+7
-13
lines changed

7 files changed

+7
-13
lines changed

lib/unparser/emitter/dsym.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ def emit_str_child(value)
3333

3434
def emit_begin_child(component)
3535
write('#{')
36-
visit(unwrap_single_begin(component)) if component.children.any?
36+
visit(Util.one(component.children)) if component.children.any?
3737
write('}')
3838
end
3939
end # DSym

lib/unparser/emitter/flow_modifier.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ def dispatch
2121

2222
if children.one? && n_if?(children.first)
2323
ws
24-
emitter(children.first).emit_ternary
24+
emitter(Util.one(children)).emit_ternary
2525
else
2626
emit_arguments unless children.empty?
2727
end

lib/unparser/emitter/kwbegin.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ def dispatch
1212
write('begin')
1313

1414
if children.one?
15-
emit_body_ensure_rescue(children.first)
15+
emit_body_ensure_rescue(Util.one(children))
1616
else
1717
indented do
1818
emit_multiple_body

lib/unparser/emitter/xstr.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ def escape_xstr(input)
6464

6565
def emit_begin(component)
6666
write('#{')
67-
visit(unwrap_single_begin(component))
67+
visit(Util.one(component.children)) if component.children.any?
6868
write('}')
6969
end
7070
end # XStr

lib/unparser/node_helpers.rb

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -84,13 +84,5 @@ def n_range?(node)
8484
end
8585
private(name)
8686
end
87-
88-
def unwrap_single_begin(node)
89-
if n_begin?(node) && node.children.one?
90-
node.children.first
91-
else
92-
node
93-
end
94-
end
9587
end # NodeHelpers
9688
end # Unparser

lib/unparser/writer/array.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ def emit_compact # rubocop:disable Metrics/AbcSize
2424
write(Util.one(child.children).to_s)
2525
else
2626
write('#{')
27-
emitter(unwrap_single_begin(Util.one(child.children))).write_to_buffer
27+
emitter(Util.one(Util.one(child.children).children)).write_to_buffer
2828
write('}')
2929
end
3030
end

test/corpus/literal/literal.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,3 +72,5 @@
7272
` x
7373
#{foo}
7474
#`
75+
`#{}`
76+
`#G`

0 commit comments

Comments
 (0)