[Fix #11237] Fix Layout/CommentIndentation comment aligned with acc…

changelog/fix_layout_comment_indentation_comment_aligned_with_access_modifier.md

@@ -0,0 +1 @@
+* [#11237](https://github.com/rubocop/rubocop/issues/11237): Fix `Layout/CommentIndentation` comment aligned with access modifier indentation when EnforcedStyle is outdent. ([@soroktree][])

lib/rubocop/cop/layout/comment_indentation.rb

@@ -154,7 +154,9 @@ def correct_indentation(next_line)
         end
 
         def less_indented?(line)
-          /^\s*(end\b|[)}\]])/.match?(line)
+          rule = config.for_cop('Layout/AccessModifierIndentation')['EnforcedStyle'] == 'outdent'
+          access_modifier = 'private|protected|public'
+          /\A\s*(end\b|[)}\]])/.match?(line) || (rule && /\A\s*(#{access_modifier})\b/.match?(line))
         end
 
         def two_alternatives?(line)

spec/rubocop/cop/layout/comment_indentation_spec.rb

@@ -292,4 +292,55 @@ def compile_sequence(seq, seq_var)
       RUBY
     end
   end
+
+  context 'when `Layout/AccessModifierIndentation EnforcedStyle: outdent`' do
+    let(:allow_for_alignment) { true }
+    let(:indentation_width) { 2 }
+    let(:config) do
+      RuboCop::Config.new(
+        'Layout/AccessModifierIndentation' => {
+          'Enabled' => true,
+          'EnforcedStyle' => 'outdent'
+        },
+        'Layout/CommentIndentation' => {
+          'Enabled' => true
+        },
+        'Layout/IndentationWidth' => {
+          'Width' => indentation_width
+        }
+      )
+    end
+
+    it 'does not register an offense with indentation if aligned with code on previous line' do
+      expect_no_offenses(<<~RUBY)
+        class A
+          # rubocop:disable
+          def foo
+          end
+          # rubocop:enable
+
+        private
+
+          def bar
+          end
+        end
+      RUBY
+    end
+
+    it 'registers an offense with indentation if aligned with access modifier on next line' do
+      expect_offense(<<~RUBY)
+        class A
+          # rubocop:disable
+          def foo
+          end
+        # rubocop:enable
+        ^^^^^^^^^^^^^^^^ Incorrect indentation detected (column 0 instead of 2).
+        private
+
+          def bar
+          end
+        end
+      RUBY
+    end
+  end
 end