From e2f590af1ef0ac71c25e5ae093693b1d8315b884 Mon Sep 17 00:00:00 2001
From: Koji NAKAMURA <kozy4324@gmail.com>
Date: Mon, 26 Jan 2026 21:00:14 +0900
Subject: [PATCH 1/2] rubocop-ast: format rbs files

---
 gems/rubocop-ast/1.30/rubocop-ast.rbs |  96 ++++++++++++++++++++----
 gems/rubocop-ast/1.46/rubocop-ast.rbs | 102 ++++++++++++++++++++++----
 2 files changed, 172 insertions(+), 26 deletions(-)

diff --git a/gems/rubocop-ast/1.30/rubocop-ast.rbs b/gems/rubocop-ast/1.30/rubocop-ast.rbs
index 36ec7f45..d650a4d1 100644
--- a/gems/rubocop-ast/1.30/rubocop-ast.rbs
+++ b/gems/rubocop-ast/1.30/rubocop-ast.rbs
@@ -5,12 +5,13 @@ module RuboCop
       def raw_source: () -> String
       def buffer: () -> Parser::Source::Buffer
       def comments: () -> Array[Parser::Source::Comment]
-      attr_reader ast: (Node | nil)
+      attr_reader ast: Node | nil
     end
 
     class NodePattern
       module Macros
         def def_node_matcher: (Symbol, String) -> void
+
         def def_node_search: (Symbol, String) -> void
       end
 
@@ -31,7 +32,9 @@ module RuboCop
 
     module BinaryOperatorNode
       def lhs: () -> Node
+
       def rhs: () -> Node
+
       def conditions: () -> Array[Node]
     end
 
@@ -40,81 +43,138 @@ module RuboCop
 
     module ConditionalNode
       def single_line_condition?: () -> bool
+
       def multiline_condition?: () -> bool
+
       def condition: () -> Node?
+
       def body: () -> Node?
     end
 
     module Descendence
       def each_child_node: (*Symbol types) { (Node) -> void } -> self
                          | (*Symbol types) -> ::Enumerator[Node, self]
+
       def child_nodes: () -> Array[Node]
+
       def each_descendant: (*Symbol types) { (Node) -> void } -> self
                          | (*Symbol types) -> ::Enumerator[Node, self]
+
       def descendants: () -> Array[Node]
+
       def each_node: (*Symbol types) { (Node) -> void } -> self
                    | (*Symbol types) -> ::Enumerator[Node, self]
     end
 
     module HashElementNode
       def key: () -> Node
+
       def value: () -> Node
+
       def same_line?: (Node other) -> bool
+
       def key_delta: (Node other, ?Symbol alignment) -> Integer
+
       def value_delta: (Node other) -> Integer
+
       def delimiter_delta: (Node other) -> Integer
     end
 
     module MethodDispatchNode
       include MethodIdentifierPredicates
+
       def receiver: () -> Node?
+
       def method_name: () -> Symbol
+
       def selector: () -> Parser::Source::Range
+
       def block_node: () -> BlockNode?
+
       def macro?: () -> bool
+
       def access_modifier?: () -> bool
+
       def bare_access_modifier?: () -> bool
+
       def non_bare_access_modifier?: () -> bool
+
       def special_modifier?: () -> bool
+
       def command?: (Symbol name) -> bool
+
       def setter_method?: () -> bool
+
       alias assignment? setter_method?
+
       def dot?: () -> bool
+
       def double_colon?: () -> bool
+
       def safe_navigation?: () -> bool
+
       def self_receiver?: () -> bool
+
       def const_receiver?: () -> bool
+
       def implicit_call?: () -> bool
+
       def block_literal?: () -> bool
+
       def arithmetic_operation?: () -> bool
+
       def def_modifier?: (?Node node) -> bool
+
       def def_modifier: (?Node node) -> Node?
+
       def lambda?: () -> bool
+
       def lambda_literal?: () -> bool
+
       def unary_operation?: () -> bool
+
       def binary_operation?: () -> bool
     end
 
     module MethodIdentifierPredicates
-      def method?: ((Symbol | String) name) -> bool
+      def method?: (Symbol | String name) -> bool
+
       def operator_method?: () -> bool
+
       def nonmutating_binary_operator_method?: () -> bool
+
       def nonmutating_unary_operator_method?: () -> bool
+
       def nonmutating_operator_method?: () -> bool
+
       def nonmutating_array_method?: () -> bool
+
       def nonmutating_hash_method?: () -> bool
+
       def nonmutating_string_method?: () -> bool
+
       def comparison_method?: () -> bool
+
       def assignment_method?: () -> bool
+
       def enumerator_method?: () -> bool
+
       def enumerable_method?: () -> bool
+
       def predicate_method?: () -> bool
+
       def bang_method?: () -> bool
+
       def camel_case_method?: () -> boolish
+
       def self_receiver?: () -> boolish
+
       def const_receiver?: () -> boolish
+
       def negation_method?: () -> boolish
+
       def prefix_not?: () -> boolish
+
       def prefix_bang?: () -> boolish
     end
 
@@ -128,27 +188,37 @@ module RuboCop
 
     module ParameterizedNode
       def parenthesized?: () -> bool
+
       def first_argument: () -> Node?
+
       def last_argument: () -> Node?
+
       def arguments?: () -> bool
+
       def splat_argument?: () -> bool
+
       alias rest_argument? splat_argument?
+
       def block_argument?: () -> bool
 
       module WrappedArguments
         include ParameterizedNode
+
         def arguments: () -> Array[Node]
       end
 
       module RestArguments
         include ParameterizedNode
+
         def arguments: () -> Array[Node]
       end
     end
 
     module PredicateOperatorNode
       def operator: () -> String
+
       def logical_operator?: () -> bool
+
       def semantic_operator?: () -> bool
     end
 
@@ -369,7 +439,7 @@ module RuboCop
     end
 
     class AndAsgnNode < OpAsgnNode
-      def operator: () -> :'&&'
+      def operator: () -> :"&&"
     end
 
     class AndNode < Node
@@ -436,7 +506,7 @@ module RuboCop
 
     class CaseMatchNode < Node
       include ConditionalNode
-      def keyword: () -> 'case'
+      def keyword: () -> "case"
       def in_pattern_branches: () -> Array[InPatternNode]
       def branches: () -> Array[Node | nil]
       def else_branch: () -> Node?
@@ -445,7 +515,7 @@ module RuboCop
 
     class CaseNode < Node
       include ConditionalNode
-      def keyword: () -> 'case'
+      def keyword: () -> "case"
       def when_branches: () -> Array[WhenNode]
       def branches: () -> Array[Node | nil]
       def else_branch: () -> Node?
@@ -515,7 +585,7 @@ module RuboCop
     end
 
     class ForNode < Node
-      def keyword: () -> 'for'
+      def keyword: () -> "for"
       def do?: () -> bool
       def void_context?: () -> true
       def variable: () -> Node
@@ -525,7 +595,7 @@ module RuboCop
 
     class ForwardArgsNode < Node
       include CollectionNode
-      def to_a: () -> [self]
+      def to_a: () -> [ self ]
     end
 
     class HashNode < Node
@@ -600,7 +670,7 @@ module RuboCop
       def hash_rocket?: () -> false
       def colon?: () -> false
       def operator: () -> String
-      def node_parts: () -> [self, self]
+      def node_parts: () -> [ self, self ]
       def kwsplat_type?: () -> true
     end
 
@@ -632,7 +702,7 @@ module RuboCop
     end
 
     class OrAsgnNode < OpAsgnNode
-      def operator: () -> :'||'
+      def operator: () -> :"||"
     end
 
     class OrNode < Node
@@ -741,8 +811,8 @@ module RuboCop
     class UntilNode < Node
       include ConditionalNode
       include ModifierNode
-      def keyword: () -> 'until'
-      def inverse_keyword: () -> 'while'
+      def keyword: () -> "until"
+      def inverse_keyword: () -> "while"
       def do?: () -> bool
     end
 
@@ -756,8 +826,8 @@ module RuboCop
     class WhileNode < Node
       include ConditionalNode
       include ModifierNode
-      def keyword: () -> 'while'
-      def inverse_keyword: () -> 'until'
+      def keyword: () -> "while"
+      def inverse_keyword: () -> "until"
       def do?: () -> bool
     end
 
diff --git a/gems/rubocop-ast/1.46/rubocop-ast.rbs b/gems/rubocop-ast/1.46/rubocop-ast.rbs
index a377ca33..c8458627 100644
--- a/gems/rubocop-ast/1.46/rubocop-ast.rbs
+++ b/gems/rubocop-ast/1.46/rubocop-ast.rbs
@@ -5,12 +5,13 @@ module RuboCop
       def raw_source: () -> String
       def buffer: () -> Parser::Source::Buffer
       def comments: () -> Array[Parser::Source::Comment]
-      attr_reader ast: (Node | nil)
+      attr_reader ast: Node | nil
     end
 
     class NodePattern
       module Macros
         def def_node_matcher: (Symbol, String) -> void
+
         def def_node_search: (Symbol, String) -> void
       end
 
@@ -31,7 +32,9 @@ module RuboCop
 
     module BinaryOperatorNode
       def lhs: () -> Node
+
       def rhs: () -> Node
+
       def conditions: () -> Array[Node]
     end
 
@@ -40,18 +43,27 @@ module RuboCop
 
     module ConditionalNode
       def single_line_condition?: () -> bool
+
       def multiline_condition?: () -> bool
+
       def condition: () -> Node?
+
       def body: () -> Node?
     end
 
     module ConstantNode
       def namespace: () -> Node?
+
       def short_name: () -> Symbol
+
       def module_name?: () -> bool
+
       alias class_name? module_name?
+
       def absolute?: () -> bool
+
       def relative?: () -> bool
+
       def each_path: () { (Node) -> void } -> self
                    | () -> ::Enumerator[Node, self]
     end
@@ -59,73 +71,127 @@ module RuboCop
     module Descendence
       def each_child_node: (*Symbol types) { (Node) -> void } -> self
                          | (*Symbol types) -> ::Enumerator[Node, self]
+
       def child_nodes: () -> Array[Node]
+
       def each_descendant: (*Symbol types) { (Node) -> void } -> self
                          | (*Symbol types) -> ::Enumerator[Node, self]
+
       def descendants: () -> Array[Node]
+
       def each_node: (*Symbol types) { (Node) -> void } -> self
                    | (*Symbol types) -> ::Enumerator[Node, self]
     end
 
     module HashElementNode
       def key: () -> Node
+
       def value: () -> Node
+
       def same_line?: (Node other) -> bool
+
       def key_delta: (Node other, ?Symbol alignment) -> Integer
+
       def value_delta: (Node other) -> Integer
+
       def delimiter_delta: (Node other) -> Integer
     end
 
     module MethodDispatchNode
       include MethodIdentifierPredicates
+
       def receiver: () -> Node?
+
       def method_name: () -> Symbol
+
       def selector: () -> Parser::Source::Range
+
       def block_node: () -> BlockNode?
+
       def macro?: () -> bool
+
       def access_modifier?: () -> bool
+
       def bare_access_modifier?: () -> bool
+
       def non_bare_access_modifier?: () -> bool
+
       def special_modifier?: () -> bool
+
       def command?: (Symbol name) -> bool
+
       def setter_method?: () -> bool
+
       alias assignment? setter_method?
+
       def dot?: () -> bool
+
       def double_colon?: () -> bool
+
       def safe_navigation?: () -> bool
+
       def self_receiver?: () -> bool
+
       def const_receiver?: () -> bool
+
       def implicit_call?: () -> bool
+
       def block_literal?: () -> bool
+
       def arithmetic_operation?: () -> bool
+
       def def_modifier?: (?Node node) -> bool
+
       def def_modifier: (?Node node) -> Node?
+
       def lambda?: () -> bool
+
       def lambda_literal?: () -> bool
+
       def unary_operation?: () -> bool
+
       def binary_operation?: () -> bool
     end
 
     module MethodIdentifierPredicates
-      def method?: ((Symbol | String) name) -> bool
+      def method?: (Symbol | String name) -> bool
+
       def operator_method?: () -> bool
+
       def nonmutating_binary_operator_method?: () -> bool
+
       def nonmutating_unary_operator_method?: () -> bool
+
       def nonmutating_operator_method?: () -> bool
+
       def nonmutating_array_method?: () -> bool
+
       def nonmutating_hash_method?: () -> bool
+
       def nonmutating_string_method?: () -> bool
+
       def comparison_method?: () -> bool
+
       def assignment_method?: () -> bool
+
       def enumerator_method?: () -> bool
+
       def enumerable_method?: () -> bool
+
       def predicate_method?: () -> bool
+
       def bang_method?: () -> bool
+
       def camel_case_method?: () -> boolish
+
       def self_receiver?: () -> boolish
+
       def const_receiver?: () -> boolish
+
       def negation_method?: () -> boolish
+
       def prefix_not?: () -> boolish
+
       def prefix_bang?: () -> boolish
     end
 
@@ -139,27 +205,37 @@ module RuboCop
 
     module ParameterizedNode
       def parenthesized?: () -> bool
+
       def first_argument: () -> Node?
+
       def last_argument: () -> Node?
+
       def arguments?: () -> bool
+
       def splat_argument?: () -> bool
+
       alias rest_argument? splat_argument?
+
       def block_argument?: () -> bool
 
       module WrappedArguments
         include ParameterizedNode
+
         def arguments: () -> Array[Node]
       end
 
       module RestArguments
         include ParameterizedNode
+
         def arguments: () -> Array[Node]
       end
     end
 
     module PredicateOperatorNode
       def operator: () -> String
+
       def logical_operator?: () -> bool
+
       def semantic_operator?: () -> bool
     end
 
@@ -380,7 +456,7 @@ module RuboCop
     end
 
     class AndAsgnNode < OpAsgnNode
-      def operator: () -> :'&&'
+      def operator: () -> :"&&"
     end
 
     class AndNode < Node
@@ -449,7 +525,7 @@ module RuboCop
 
     class CaseMatchNode < Node
       include ConditionalNode
-      def keyword: () -> 'case'
+      def keyword: () -> "case"
       def in_pattern_branches: () -> Array[InPatternNode]
       def branches: () -> Array[Node | nil]
       def else_branch: () -> Node?
@@ -458,7 +534,7 @@ module RuboCop
 
     class CaseNode < Node
       include ConditionalNode
-      def keyword: () -> 'case'
+      def keyword: () -> "case"
       def when_branches: () -> Array[WhenNode]
       def branches: () -> Array[Node | nil]
       def else_branch: () -> Node?
@@ -532,7 +608,7 @@ module RuboCop
     end
 
     class ForNode < Node
-      def keyword: () -> 'for'
+      def keyword: () -> "for"
       def do?: () -> bool
       def void_context?: () -> true
       def variable: () -> Node
@@ -542,7 +618,7 @@ module RuboCop
 
     class ForwardArgsNode < Node
       include CollectionNode
-      def to_a: () -> [self]
+      def to_a: () -> [ self ]
     end
 
     class HashNode < Node
@@ -624,7 +700,7 @@ module RuboCop
       def hash_rocket?: () -> false
       def colon?: () -> false
       def operator: () -> String
-      def node_parts: () -> [self, self]
+      def node_parts: () -> [ self, self ]
       def kwsplat_type?: () -> true
     end
 
@@ -671,7 +747,7 @@ module RuboCop
     end
 
     class OrAsgnNode < OpAsgnNode
-      def operator: () -> :'||'
+      def operator: () -> :"||"
     end
 
     class OrNode < Node
@@ -788,8 +864,8 @@ module RuboCop
     class UntilNode < Node
       include ConditionalNode
       include ModifierNode
-      def keyword: () -> 'until'
-      def inverse_keyword: () -> 'while'
+      def keyword: () -> "until"
+      def inverse_keyword: () -> "while"
       def do?: () -> bool
     end
 
@@ -807,8 +883,8 @@ module RuboCop
     class WhileNode < Node
       include ConditionalNode
       include ModifierNode
-      def keyword: () -> 'while'
-      def inverse_keyword: () -> 'until'
+      def keyword: () -> "while"
+      def inverse_keyword: () -> "until"
       def do?: () -> bool
     end
 

From b57189cd768f4173da3e08995c960dcd11c67e03 Mon Sep 17 00:00:00 2001
From: Koji NAKAMURA <kozy4324@gmail.com>
Date: Tue, 27 Jan 2026 20:45:53 +0900
Subject: [PATCH 2/2] rubocop-ast: fix type signatures to pass rbs/test

---
 gems/rubocop-ast/1.30/rubocop-ast.rbs | 74 +++++++++++++--------------
 gems/rubocop-ast/1.46/rubocop-ast.rbs | 74 +++++++++++++--------------
 2 files changed, 74 insertions(+), 74 deletions(-)

diff --git a/gems/rubocop-ast/1.30/rubocop-ast.rbs b/gems/rubocop-ast/1.30/rubocop-ast.rbs
index d650a4d1..df87b092 100644
--- a/gems/rubocop-ast/1.30/rubocop-ast.rbs
+++ b/gems/rubocop-ast/1.30/rubocop-ast.rbs
@@ -91,19 +91,19 @@ module RuboCop
 
       def block_node: () -> BlockNode?
 
-      def macro?: () -> bool
+      def macro?: () -> boolish
 
-      def access_modifier?: () -> bool
+      def access_modifier?: () -> boolish
 
-      def bare_access_modifier?: () -> bool
+      def bare_access_modifier?: () -> boolish
 
-      def non_bare_access_modifier?: () -> bool
+      def non_bare_access_modifier?: () -> boolish
 
-      def special_modifier?: () -> bool
+      def special_modifier?: () -> boolish
 
-      def command?: (Symbol name) -> bool
+      def command?: (Symbol name) -> boolish
 
-      def setter_method?: () -> bool
+      def setter_method?: () -> boolish
 
       alias assignment? setter_method?
 
@@ -113,13 +113,13 @@ module RuboCop
 
       def safe_navigation?: () -> bool
 
-      def self_receiver?: () -> bool
+      def self_receiver?: () -> boolish
 
-      def const_receiver?: () -> bool
+      def const_receiver?: () -> boolish
 
       def implicit_call?: () -> bool
 
-      def block_literal?: () -> bool
+      def block_literal?: () -> boolish
 
       def arithmetic_operation?: () -> bool
 
@@ -127,7 +127,7 @@ module RuboCop
 
       def def_modifier: (?Node node) -> Node?
 
-      def lambda?: () -> bool
+      def lambda?: () -> boolish
 
       def lambda_literal?: () -> bool
 
@@ -364,7 +364,7 @@ module RuboCop
       def parent: () -> Node?
       def parent?: () -> bool
       def root?: () -> bool
-      def to_a: () -> Array[Node]
+      def to_a: () -> Array[untyped]
       alias node_parts to_a
       def each_ancestor: (*Symbol types) { (Node) -> void } -> self
                        | (*Symbol types) -> ::Enumerator[Node, self]
@@ -377,7 +377,7 @@ module RuboCop
       def nonempty_line_count: () -> Integer
       def source_length: () -> Integer
       def receiver: () -> Node?
-      def str_content: () -> (String | false)
+      def str_content: () -> (String | false)?
       def const_name: () -> String?
       def defined_module: () -> ConstNode?
       def defined_module_name: () -> String?
@@ -385,7 +385,7 @@ module RuboCop
       def multiline?: () -> bool
       def single_line?: () -> bool
       def empty_source?: () -> bool
-      def assignment_or_similar?: () -> bool
+      def assignment_or_similar?: () -> boolish
       def literal?: () -> bool
       def basic_literal?: () -> bool
       def truthy_literal?: () -> bool
@@ -408,22 +408,22 @@ module RuboCop
       def operator_keyword?: () -> bool
       def parenthesized_call?: () -> bool
       def call_type?: () -> bool
-      def chained?: () -> bool
-      def argument?: () -> bool
+      def chained?: () -> boolish
+      def argument?: () -> boolish
       def argument_type?: () -> bool
       def boolean_type?: () -> bool
       def numeric_type?: () -> bool
       def range_type?: () -> bool
-      def guard_clause?: () -> bool
-      def match_guard_clause?: () -> bool
-      def proc?: () -> bool
+      def guard_clause?: () -> boolish
+      def match_guard_clause?: () -> boolish
+      def proc?: () -> boolish
       def lambda?: () -> bool
-      def lambda_or_proc?: () -> bool
-      def global_const?: (untyped) -> bool
-      def class_constructor?: () -> bool
-      def struct_constructor?: () -> bool
-      def class_definition?: () -> bool
-      def module_definition?: () -> bool
+      def lambda_or_proc?: () -> boolish
+      def global_const?: (untyped, ?untyped) -> boolish
+      def class_constructor?: () -> boolish
+      def struct_constructor?: () -> boolish
+      def class_definition?: () -> boolish
+      def module_definition?: () -> boolish
       def value_used?: () -> bool
       def pure?: () -> bool
       def sibling_index: () -> (Integer | nil)
@@ -466,8 +466,8 @@ module RuboCop
       def each_value: () { (Node) -> void } -> self
                     | () -> ::Enumerator[Node, self]
       def square_brackets?: () -> bool
-      def percent_literal?: (?Symbol type) -> bool
-      def bracketed?: () -> bool
+      def percent_literal?: (?Symbol type) -> boolish
+      def bracketed?: () -> boolish
       def location: () -> Parser::Source::Map::Collection
       alias loc location
     end
@@ -482,7 +482,7 @@ module RuboCop
       def send_node: () -> SendNode
       def first_argument: () -> Node?
       def last_argument: () -> Node?
-      def arguments: () -> Array[Node]
+      def arguments: () -> ArgsNode
       def argument_list: () -> Array[Node]
       def body: () -> Node?
       def method_name: () -> Symbol
@@ -510,7 +510,7 @@ module RuboCop
       def in_pattern_branches: () -> Array[InPatternNode]
       def branches: () -> Array[Node | nil]
       def else_branch: () -> Node?
-      def else?: () -> bool
+      def else?: () -> boolish
     end
 
     class CaseNode < Node
@@ -519,7 +519,7 @@ module RuboCop
       def when_branches: () -> Array[WhenNode]
       def branches: () -> Array[Node | nil]
       def else_branch: () -> Node?
-      def else?: () -> bool
+      def else?: () -> boolish
     end
 
     class CasgnNode < Node
@@ -565,7 +565,7 @@ module RuboCop
     class DefinedNode < Node
       include ParameterizedNode
       include MethodDispatchNode
-      def node_parts: () -> Array[Node | nil]
+      def node_parts: () -> Array[Node | Symbol | nil]
       alias arguments children
     end
 
@@ -605,10 +605,10 @@ module RuboCop
                    | () -> ::Enumerator[PairNode, self]
       def keys: () -> Array[Node]
       def each_key: () { (Node) -> void } -> self
-                  | () -> ::Enumerator[Node, self]
+                  | () -> ::Enumerator[Node, untyped]
       def values: () -> Array[Node]
       def each_value: () { (Node) -> void } -> self
-                    | () -> ::Enumerator[Node, self]
+                    | () -> ::Enumerator[Node, untyped]
       def pairs_on_same_line?: () -> bool
       def mixed_delimiters?: () -> bool
       def braces?: () -> bool
@@ -628,10 +628,10 @@ module RuboCop
       def inverse_keyword: () -> String
       def modifier_form?: () -> bool
       def nested_conditional?: () -> bool
-      def elsif_conditional?: () -> bool
+      def elsif_conditional?: () -> boolish
       def if_branch: () -> Node?
       def else_branch: () -> Node?
-      def node_parts: () -> Array[Node]
+      def node_parts: () -> Array[Node | nil]
       def branches: () -> Array[Node]
       def location: () -> (Parser::Source::Map::Condition | Parser::Source::Map::Keyword | Parser::Source::Map::Ternary)
       alias loc location
@@ -740,7 +740,7 @@ module RuboCop
       def content: () -> String
       def slash_literal?: () -> bool
       def percent_r_literal?: () -> bool
-      def delimiters: () -> String
+      def delimiters: () -> [String, String]
       def delimiter?: (String char) -> bool
       def interpolation?: () -> bool
       def multiline_mode?: () -> bool
@@ -765,7 +765,7 @@ module RuboCop
       def resbody_branches: () -> Array[ResbodyNode]
       def branches: () -> Array[Node | nil]
       def else_branch: () -> Node?
-      def else?: () -> bool
+      def else?: () -> boolish
     end
 
     class ReturnNode < Node
diff --git a/gems/rubocop-ast/1.46/rubocop-ast.rbs b/gems/rubocop-ast/1.46/rubocop-ast.rbs
index c8458627..fc89e736 100644
--- a/gems/rubocop-ast/1.46/rubocop-ast.rbs
+++ b/gems/rubocop-ast/1.46/rubocop-ast.rbs
@@ -108,19 +108,19 @@ module RuboCop
 
       def block_node: () -> BlockNode?
 
-      def macro?: () -> bool
+      def macro?: () -> boolish
 
-      def access_modifier?: () -> bool
+      def access_modifier?: () -> boolish
 
-      def bare_access_modifier?: () -> bool
+      def bare_access_modifier?: () -> boolish
 
-      def non_bare_access_modifier?: () -> bool
+      def non_bare_access_modifier?: () -> boolish
 
-      def special_modifier?: () -> bool
+      def special_modifier?: () -> boolish
 
-      def command?: (Symbol name) -> bool
+      def command?: (Symbol name) -> boolish
 
-      def setter_method?: () -> bool
+      def setter_method?: () -> boolish
 
       alias assignment? setter_method?
 
@@ -130,13 +130,13 @@ module RuboCop
 
       def safe_navigation?: () -> bool
 
-      def self_receiver?: () -> bool
+      def self_receiver?: () -> boolish
 
-      def const_receiver?: () -> bool
+      def const_receiver?: () -> boolish
 
       def implicit_call?: () -> bool
 
-      def block_literal?: () -> bool
+      def block_literal?: () -> boolish
 
       def arithmetic_operation?: () -> bool
 
@@ -144,7 +144,7 @@ module RuboCop
 
       def def_modifier: (?Node node) -> Node?
 
-      def lambda?: () -> bool
+      def lambda?: () -> boolish
 
       def lambda_literal?: () -> bool
 
@@ -381,7 +381,7 @@ module RuboCop
       def parent: () -> Node?
       def parent?: () -> bool
       def root?: () -> bool
-      def to_a: () -> Array[Node]
+      def to_a: () -> Array[untyped]
       alias node_parts to_a
       def each_ancestor: (*Symbol types) { (Node) -> void } -> self
                        | (*Symbol types) -> ::Enumerator[Node, self]
@@ -394,7 +394,7 @@ module RuboCop
       def nonempty_line_count: () -> Integer
       def source_length: () -> Integer
       def receiver: () -> Node?
-      def str_content: () -> (String | false)
+      def str_content: () -> (String | false)?
       def const_name: () -> String?
       def defined_module: () -> ConstNode?
       def defined_module_name: () -> String?
@@ -402,7 +402,7 @@ module RuboCop
       def multiline?: () -> bool
       def single_line?: () -> bool
       def empty_source?: () -> bool
-      def assignment_or_similar?: () -> bool
+      def assignment_or_similar?: () -> boolish
       def literal?: () -> bool
       def basic_literal?: () -> bool
       def truthy_literal?: () -> bool
@@ -425,22 +425,22 @@ module RuboCop
       def operator_keyword?: () -> bool
       def parenthesized_call?: () -> bool
       def call_type?: () -> bool
-      def chained?: () -> bool
-      def argument?: () -> bool
+      def chained?: () -> boolish
+      def argument?: () -> boolish
       def argument_type?: () -> bool
       def boolean_type?: () -> bool
       def numeric_type?: () -> bool
       def range_type?: () -> bool
-      def guard_clause?: () -> bool
-      def match_guard_clause?: () -> bool
-      def proc?: () -> bool
+      def guard_clause?: () -> boolish
+      def match_guard_clause?: () -> boolish
+      def proc?: () -> boolish
       def lambda?: () -> bool
-      def lambda_or_proc?: () -> bool
-      def global_const?: (untyped) -> bool
-      def class_constructor?: () -> bool
-      def struct_constructor?: () -> bool
-      def class_definition?: () -> bool
-      def module_definition?: () -> bool
+      def lambda_or_proc?: () -> boolish
+      def global_const?: (untyped, ?untyped) -> boolish
+      def class_constructor?: () -> boolish
+      def struct_constructor?: () -> boolish
+      def class_definition?: () -> boolish
+      def module_definition?: () -> boolish
       def value_used?: () -> bool
       def pure?: () -> bool
       def sibling_index: () -> (Integer | nil)
@@ -483,8 +483,8 @@ module RuboCop
       def each_value: () { (Node) -> void } -> self
                     | () -> ::Enumerator[Node, self]
       def square_brackets?: () -> bool
-      def percent_literal?: (?Symbol type) -> bool
-      def bracketed?: () -> bool
+      def percent_literal?: (?Symbol type) -> boolish
+      def bracketed?: () -> boolish
       def location: () -> Parser::Source::Map::Collection
       alias loc location
     end
@@ -501,7 +501,7 @@ module RuboCop
       def send_node: () -> SendNode
       def first_argument: () -> Node?
       def last_argument: () -> Node?
-      def arguments: () -> Array[Node]
+      def arguments: () -> ArgsNode
       def argument_list: () -> Array[Node]
       def body: () -> Node?
       def method_name: () -> Symbol
@@ -529,7 +529,7 @@ module RuboCop
       def in_pattern_branches: () -> Array[InPatternNode]
       def branches: () -> Array[Node | nil]
       def else_branch: () -> Node?
-      def else?: () -> bool
+      def else?: () -> boolish
     end
 
     class CaseNode < Node
@@ -538,7 +538,7 @@ module RuboCop
       def when_branches: () -> Array[WhenNode]
       def branches: () -> Array[Node | nil]
       def else_branch: () -> Node?
-      def else?: () -> bool
+      def else?: () -> boolish
     end
 
     class CasgnNode < Node
@@ -585,7 +585,7 @@ module RuboCop
     class DefinedNode < Node
       include ParameterizedNode
       include MethodDispatchNode
-      def node_parts: () -> Array[Node | nil]
+      def node_parts: () -> Array[Node | Symbol | nil]
       alias arguments children
     end
 
@@ -628,10 +628,10 @@ module RuboCop
                    | () -> ::Enumerator[PairNode, self]
       def keys: () -> Array[Node]
       def each_key: () { (Node) -> void } -> self
-                  | () -> ::Enumerator[Node, self]
+                  | () -> ::Enumerator[Node, untyped]
       def values: () -> Array[Node]
       def each_value: () { (Node) -> void } -> self
-                    | () -> ::Enumerator[Node, self]
+                    | () -> ::Enumerator[Node, untyped]
       def pairs_on_same_line?: () -> bool
       def mixed_delimiters?: () -> bool
       def braces?: () -> bool
@@ -652,10 +652,10 @@ module RuboCop
       def inverse_keyword: () -> String
       def modifier_form?: () -> bool
       def nested_conditional?: () -> bool
-      def elsif_conditional?: () -> bool
+      def elsif_conditional?: () -> boolish
       def if_branch: () -> Node?
       def else_branch: () -> Node?
-      def node_parts: () -> Array[Node]
+      def node_parts: () -> Array[Node | nil]
       def branches: () -> Array[Node]
       def location: () -> (Parser::Source::Map::Condition | Parser::Source::Map::Keyword | Parser::Source::Map::Ternary)
       alias loc location
@@ -790,7 +790,7 @@ module RuboCop
       def content: () -> String
       def slash_literal?: () -> bool
       def percent_r_literal?: () -> bool
-      def delimiters: () -> String
+      def delimiters: () -> [String, String]
       def delimiter?: (String char) -> bool
       def interpolation?: () -> bool
       def multiline_mode?: () -> bool
@@ -815,7 +815,7 @@ module RuboCop
       def resbody_branches: () -> Array[ResbodyNode]
       def branches: () -> Array[Node | nil]
       def else_branch: () -> Node?
-      def else?: () -> bool
+      def else?: () -> boolish
     end
 
     class ReturnNode < Node