Merge pull request #1479 from Earlopain/schema-comment-local-var

koic · web-flow · commit 2a4474642782 · 2025-05-09T01:07:10.000+09:00
[Fix #1477] Fix an error for `Rails/SchemaComment` when the comment is passed as a local variable
diff --git a/changelog/fix_schema_comment_local_var.md b/changelog/fix_schema_comment_local_var.md
@@ -0,0 +1 @@
+* [#1477](https://github.com/rubocop/rubocop-rails/issues/1477): Fix an error for `Rails/SchemaComment` when the comment is passed as a local variable. ([@earlopain][])
diff --git a/lib/rubocop/cop/rails/schema_comment.rb b/lib/rubocop/cop/rails/schema_comment.rb
@@ -39,7 +39,7 @@ class SchemaComment < Base
 
         # @!method comment_present?(node)
         def_node_matcher :comment_present?, <<~PATTERN
-          (hash <(pair {(sym :comment) (str "comment")} (_ !blank?)) ...>)
+          (hash <(pair {(sym :comment) (str "comment")} !{nil (str blank?)}) ...>)
         PATTERN
 
         # @!method add_column?(node)
diff --git a/spec/rubocop/cop/rails/schema_comment_spec.rb b/spec/rubocop/cop/rails/schema_comment_spec.rb
@@ -142,5 +142,14 @@
         end
       RUBY
     end
+
+    it 'does not register an offense when the comment is a local variable' do
+      expect_no_offenses(<<~RUBY)
+        create_table :users, comment: 'Table' do |t|
+          i_am_a_comment = 'I am a column'
+          t.integer :column, comment: i_am_a_comment
+        end
+      RUBY
+    end
   end
 end

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+* [#1477](https://github.com/rubocop/rubocop-rails/issues/1477): Fix an error for `Rails/SchemaComment` when the comment is passed as a local variable. ([@earlopain][])