admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Don't pass cask_node into Stanza, stanza_node.parent is enough

Browse Source
This commit is contained in:
Issy Long 2023-04-12 19:48:40 +01:00
parent 519c1b46d8
commit 10bdb9f653
No known key found for this signature in database
GPG Key ID: 8247C390DADC67D4
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Library/Homebrew/rubocops/cask/ast/cask_block.rb
View File

@ -32,7 +32,7 @@ module RuboCop
@stanzas ||= cask_body.each_node @stanzas ||= cask_body.each_node
.select(&:stanza?) .select(&:stanza?)
.map { |node| Stanza.new(node, cask_node) } .map { |node| Stanza.new(node) }
end end
def toplevel_stanzas def toplevel_stanzas

10
Library/Homebrew/rubocops/cask/ast/stanza.rb
View File

@ -12,12 +12,11 @@ module RuboCop
class Stanza class Stanza
extend Forwardable extend Forwardable
def initialize(method_node, cask_node) def initialize(method_node)
@method_node = method_node @method_node = method_node
@cask_node = cask_node
end end
attr_reader :method_node, :cask_node attr_reader :method_node
alias stanza_node method_node alias stanza_node method_node
@ -59,7 +58,10 @@ module RuboCop
end end
def comments_hash def comments_hash
@comments_hash ||= Parser::Source::Comment.associate_locations(cask_node, stanza_comments(stanza_node)) @comments_hash ||= Parser::Source::Comment.associate_locations(
stanza_node.parent,
stanza_comments(stanza_node),
)
end end
def ==(other) def ==(other)

2
Library/Homebrew/rubocops/cask/stanza_grouping.rb
View File

@ -32,7 +32,7 @@ module RuboCop
block_contents = on_block.child_nodes.select(&:begin_type?) block_contents = on_block.child_nodes.select(&:begin_type?)
inner_nodes = block_contents.map(&:child_nodes).flatten.select(&:send_type?) inner_nodes = block_contents.map(&:child_nodes).flatten.select(&:send_type?)
inner_stanzas = inner_nodes.map { |node| RuboCop::Cask::AST::Stanza.new(node, cask_node) } inner_stanzas = inner_nodes.map { |node| RuboCop::Cask::AST::Stanza.new(node) }
add_offenses(inner_stanzas) add_offenses(inner_stanzas)
end end