From 10bdb9f6534a131b75035a59ef2887098aed2b23 Mon Sep 17 00:00:00 2001 From: Issy Long Date: Wed, 12 Apr 2023 19:48:40 +0100 Subject: [PATCH] Don't pass `cask_node` into `Stanza`, `stanza_node.parent` is enough --- Library/Homebrew/rubocops/cask/ast/cask_block.rb | 2 +- Library/Homebrew/rubocops/cask/ast/stanza.rb | 10 ++++++---- Library/Homebrew/rubocops/cask/stanza_grouping.rb | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Library/Homebrew/rubocops/cask/ast/cask_block.rb b/Library/Homebrew/rubocops/cask/ast/cask_block.rb index 0d4bb1bbc0..8b8d1eca8e 100644 --- a/Library/Homebrew/rubocops/cask/ast/cask_block.rb +++ b/Library/Homebrew/rubocops/cask/ast/cask_block.rb @@ -32,7 +32,7 @@ module RuboCop @stanzas ||= cask_body.each_node .select(&:stanza?) - .map { |node| Stanza.new(node, cask_node) } + .map { |node| Stanza.new(node) } end def toplevel_stanzas diff --git a/Library/Homebrew/rubocops/cask/ast/stanza.rb b/Library/Homebrew/rubocops/cask/ast/stanza.rb index bc82f9b0f8..b5e16eed64 100644 --- a/Library/Homebrew/rubocops/cask/ast/stanza.rb +++ b/Library/Homebrew/rubocops/cask/ast/stanza.rb @@ -12,12 +12,11 @@ module RuboCop class Stanza extend Forwardable - def initialize(method_node, cask_node) + def initialize(method_node) @method_node = method_node - @cask_node = cask_node end - attr_reader :method_node, :cask_node + attr_reader :method_node alias stanza_node method_node @@ -59,7 +58,10 @@ module RuboCop end 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 def ==(other) diff --git a/Library/Homebrew/rubocops/cask/stanza_grouping.rb b/Library/Homebrew/rubocops/cask/stanza_grouping.rb index 116cd4a522..6338e0fa6b 100644 --- a/Library/Homebrew/rubocops/cask/stanza_grouping.rb +++ b/Library/Homebrew/rubocops/cask/stanza_grouping.rb @@ -32,7 +32,7 @@ module RuboCop block_contents = on_block.child_nodes.select(&:begin_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) end