Merge pull request #7794 from koic/fix_a_false_positive_for_end_keywo…

…rd_alignment

[Fix #7778] Fix a false positive for `Layout/EndAlignment`

CHANGELOG.md

@@ -15,6 +15,7 @@
 * [#7733](https://github.com/rubocop-hq/rubocop/issues/7733): Fix rubocop-junit-formatter imcompatibility XML for JUnit formatter. ([@koic][])
 * [#7767](https://github.com/rubocop-hq/rubocop/issues/7767): Skip array literals in `Style/HashTransformValues` and `Style/HashTransformKeys`. ([@tejasbubane][])
 * [#7791](https://github.com/rubocop-hq/rubocop/issues/7791): Fix an error on auto-correction for `Layout/BlockEndNewline` when `}` of multiline block without processing is not on its own line. ([@koic][])
+* [#7778](https://github.com/rubocop-hq/rubocop/issues/7778): Fix a false positive for `Layout/EndAlignment` when a non-whitespace is used before the `end` keyword. ([@koic][])
 
 ### Changes
 

lib/rubocop/cop/mixin/end_keyword_alignment.rb

@@ -20,7 +20,7 @@ def check_end_kw_alignment(node, align_ranges)
         return if ignored_node?(node)
 
         end_loc = node.loc.end
-        return unless end_loc # Discard modifier forms of if/while/until.
+        return if accept_end_kw_alignment?(end_loc)
 
         matching = matching_ranges(end_loc, align_ranges)
 
@@ -49,6 +49,11 @@ def add_offense_for_misalignment(node, align_with)
         add_offense(node, location: end_loc, message: msg)
       end
 
+      def accept_end_kw_alignment?(end_loc)
+        end_loc.nil? || # Discard modifier forms of if/while/until.
+          processed_source.lines[end_loc.line - 1] !~ /\A[ \t]*end/
+      end
+
       def style_parameter_name
         'EnforcedStyleAlignWith'
       end

spec/rubocop/cop/layout/end_alignment_spec.rb

@@ -277,14 +277,8 @@ module Test
   end
 
   context 'when end is preceded by something else than whitespace' do
-    it 'registers an offense and does not correct' do
-      expect_offense(<<~RUBY)
-        module A
-        puts a end
-               ^^^ `end` at 2, 7 is not aligned with `module` at 1, 0.
-      RUBY
-
-      expect_correction(<<~RUBY)
+    it 'does not register an offense' do
+      expect_no_offenses(<<~RUBY)
         module A
         puts a end
       RUBY