Merge pull request #1432 from dvandersluis/use-node-groups

koic · web-flow · commit 166227c08030 · 2025-01-29T00:43:52.000+09:00
Use node groups in node patterns to replace unions of types
diff --git a/lib/rubocop/cop/rails/belongs_to.rb b/lib/rubocop/cop/rails/belongs_to.rb
@@ -66,7 +66,7 @@ class BelongsTo < Base
 
         def_node_matcher :match_belongs_to_with_options, <<~PATTERN
           (send _ :belongs_to ...
-            (hash <$(pair (sym :required) ${true false}) ...>)
+            (hash <$(pair (sym :required) $boolean) ...>)
           )
         PATTERN
 
diff --git a/lib/rubocop/cop/rails/skips_model_validations.rb b/lib/rubocop/cop/rails/skips_model_validations.rb
@@ -61,7 +61,7 @@ class SkipsModelValidations < Base
         def_node_matcher :good_touch?, <<~PATTERN
           {
             (send (const {nil? cbase} :FileUtils) :touch ...)
-            (send _ :touch {true false})
+            (send _ :touch boolean)
           }
         PATTERN
 

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ class BelongsTo < Base`
`66`	`66`
`67`	`67`	`def_node_matcher :match_belongs_to_with_options, <<~PATTERN`
`68`	`68`	`(send _ :belongs_to ...`
`69`		`- (hash <$(pair (sym :required) ${true false}) ...>)`
	`69`	`+ (hash <$(pair (sym :required) $boolean) ...>)`
`70`	`70`	`)`
`71`	`71`	`PATTERN`
`72`	`72`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ class SkipsModelValidations < Base`
`61`	`61`	`def_node_matcher :good_touch?, <<~PATTERN`
`62`	`62`	`{`
`63`	`63`	`(send (const {nil? cbase} :FileUtils) :touch ...)`
`64`		`- (send _ :touch {true false})`
	`64`	`+ (send _ :touch boolean)`
`65`	`65`	`}`
`66`	`66`	`PATTERN`
`67`	`67`