From 06441f1337c83773525cf7883532771b0565d077 Mon Sep 17 00:00:00 2001 From: Issy Long Date: Sat, 25 Jan 2025 21:07:44 +0000 Subject: [PATCH] Generic `RuboCop::AST::Node` for stanza method nodes - These can be either BlockNode, SendNode or AsgnNode, which are all a type of Node. - This causes errors in other places because we call BlockNode or SendNode methods on a Node now. Still TODO. --- Library/Homebrew/rubocops/cask/ast/stanza.rb | 6 +++--- Library/Homebrew/rubocops/cask/discontinued.rbi | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Library/Homebrew/rubocops/cask/ast/stanza.rb b/Library/Homebrew/rubocops/cask/ast/stanza.rb index 9307a02e91..e6aaaed48b 100644 --- a/Library/Homebrew/rubocops/cask/ast/stanza.rb +++ b/Library/Homebrew/rubocops/cask/ast/stanza.rb @@ -14,16 +14,16 @@ module RuboCop sig { params( - method_node: T.any(RuboCop::AST::SendNode, RuboCop::AST::BlockNode), + method_node: RuboCop::AST::Node, all_comments: T::Array[T.any(String, Parser::Source::Comment)], ).void } def initialize(method_node, all_comments) - @method_node = T.let(method_node, T.any(RuboCop::AST::SendNode, RuboCop::AST::BlockNode)) + @method_node = T.let(method_node, RuboCop::AST::Node) @all_comments = T.let(all_comments, T::Array[T.any(String, Parser::Source::Comment)]) end - sig { returns(T.any(RuboCop::AST::SendNode, RuboCop::AST::BlockNode)) } + sig { returns(RuboCop::AST::Node) } attr_reader :method_node alias stanza_node method_node diff --git a/Library/Homebrew/rubocops/cask/discontinued.rbi b/Library/Homebrew/rubocops/cask/discontinued.rbi index 3d3e555dde..a34321b055 100644 --- a/Library/Homebrew/rubocops/cask/discontinued.rbi +++ b/Library/Homebrew/rubocops/cask/discontinued.rbi @@ -6,7 +6,7 @@ module RuboCop class Discontinued < Base sig { params( - base_node: T.any(RuboCop::AST::BlockNode, RuboCop::AST::SendNode), + base_node: RuboCop::AST::Node, block: T.nilable(T.proc.params(node: RuboCop::AST::SendNode).void), ).returns(T::Boolean) } @@ -14,7 +14,7 @@ module RuboCop sig { params( - base_node: T.any(RuboCop::AST::BlockNode, RuboCop::AST::SendNode), + base_node: RuboCop::AST::Node, block: T.proc.params(node: RuboCop::AST::SendNode).void, ).void }