Merge pull request #9917 from jonas054/9848_fix_ClassStructure

[Fix #9848] Handle EOL comments in ClassStructure auto-correct

changelog/fix_class_structure_eol_comment_bug.md

@@ -0,0 +1 @@
+* [#9848](https://github.com/rubocop/rubocop/issues/9848): Fix handling of comments in `Layout/ClassStructure` auto-correct. ([@jonas054][])

lib/rubocop/cop/layout/class_structure.rb

@@ -289,12 +289,16 @@ def begin_pos_with_comment(node)
           (node.first_line - 1).downto(1) do |annotation_line|
             break unless (comment = processed_source.comment_at_line(annotation_line))
 
-            first_comment = comment
+            first_comment = comment if whole_line_comment_at_line?(annotation_line)
           end
 
           start_line_position(first_comment || node)
         end
 
+        def whole_line_comment_at_line?(line)
+          /\A\s*#/.match?(processed_source.lines[line - 1])
+        end
+
         def start_line_position(node)
           buffer.line_range(node.loc.line).begin_pos - 1
         end

spec/rubocop/cop/layout/class_structure_spec.rb

@@ -39,6 +39,25 @@
     )
   end
 
+  context 'when the first line ends with a comment' do
+    it 'reports an offense and swaps the lines' do
+      expect_offense <<-RUBY
+        class GridTask
+          DESC = 'Grid Task' # grid task name OID, subclasses should set this
+          extend Helpers::MakeFromFile
+          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `module_inclusion` is supposed to appear before `constants`.
+        end
+      RUBY
+
+      expect_correction <<-RUBY
+        class GridTask
+          extend Helpers::MakeFromFile
+          DESC = 'Grid Task' # grid task name OID, subclasses should set this
+        end
+      RUBY
+    end
+  end
+
   context 'with a complete ordered example' do
     it 'does not create offense' do
       expect_no_offenses <<-RUBY